From 860f43ff979c2c3f1ffcfe8732c70215dc4d8518 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 16 Sep 2020 22:29:20 -0700 Subject: [PATCH 01/41] Galician translation updates From Miguel Bouzada. --- docs/CHANGES.txt | 2 +- src/po/gl.po | 44 +++++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index a5f17acf7..a5c6cd615 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.August.29 (0.9.25) +2020.September.16 (0.9.25) * New Features ------------ * Export drawings: diff --git a/src/po/gl.po b/src/po/gl.po index c876c9d01..560de1788 100644 --- a/src/po/gl.po +++ b/src/po/gl.po @@ -1,16 +1,18 @@ # Galician translation Tux Paint. # Copyright (C) 2015 Tux Paint. # This file is distributed under the same license as the Tux Paint package. +# # Translators: # Leandro Regueiro , 2005-2006 # Miguel Anxo Bouzada , 2015 -# Miguel A. Bouzada , 2017. +# Miguel Anxo Bouzada , 2017 +# Miguel Anxo Bouzada , 2020. msgid "" msgstr "" "Project-Id-Version: Tux Paint\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-08-15 16:42-0700\n" -"PO-Revision-Date: 2020-08-16 09:19+0200\n" +"PO-Revision-Date: 2020-09-03 18:31+0200\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Proxecto Trasno \n" "Language: gl\n" @@ -18,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" #. Response to Black (0, 0, 0) color selected #: ../colors.h:86 @@ -533,7 +535,7 @@ msgstr "Escolle unha cor ou unha imaxe coa que iniciar un novo debuxo." #. Response to 'open' action (while file dialog is being constructed) #: ../tools.h:154 msgid "Open…" -msgstr "Abrir..." +msgstr "Abrir…" #. Response to 'save' action #: ../tools.h:157 @@ -543,7 +545,7 @@ msgstr "Gardouse a túa imaxe!" #. Response to 'print' action (while printing, or print dialog is being used) #: ../tools.h:160 msgid "Printing…" -msgstr "Imprimindo..." +msgstr "Imprimindo…" #. Response to 'quit' (exit) action #: ../tools.h:163 @@ -697,7 +699,7 @@ msgstr "Son sen silenciar." #. Wait while Text tool finishes loading fonts #: ../tuxpaint.c:3167 msgid "Please wait…" -msgstr "Agarda un chisco..." +msgstr "Agarda un chisco…" #. Open dialog: 'Erase' button, to erase/deleted the selected picture #: ../tuxpaint.c:7923 @@ -822,7 +824,7 @@ msgid "" "perpendicularly to open or close the blinds." msgstr "" "Preme preto do bordo do debuxo para poñer unha persiana sobre el. Move o " -"rato perpendicularmente para abrir ou pechas as persianas. " +"rato perpendicularmente para abrir ou pechas as persianas." #: ../../magic/src/blocks_chalk_drip.c:129 msgid "Blocks" @@ -900,7 +902,7 @@ msgstr "Confeti" #: ../../magic/src/confetti.c:88 msgid "Click to throw confetti!" -msgstr "Preme para lanzar confeti" +msgstr "Preme para lanzar confeti." #: ../../magic/src/distortion.c:134 msgid "Distortion" @@ -932,7 +934,7 @@ msgstr "Preme e arrastra o rato para clarexar algunhas partes do debuxo." #: ../../magic/src/fade_darken.c:129 msgid "Click to lighten your entire picture." -msgstr "Preme para clarexar todo o debuxo" +msgstr "Preme para clarexar todo o debuxo." #: ../../magic/src/fade_darken.c:134 msgid "Click and drag the mouse to darken parts of your picture." @@ -1042,7 +1044,7 @@ msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the left and right of your picture." msgstr "" -"Preme e arrastra o rato para debuxar con dous pinceis simétricos da dereita " +"Preme e arrastra o rato para debuxar con dous pinceis simétricos á dereita e " "á esquerda do debuxo." #: ../../magic/src/kalidescope.c:152 @@ -1050,7 +1052,7 @@ msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the top and bottom of your picture." msgstr "" -"Preme e arrastra o rato para debuxar con dous pinceis simétricos de arriba a " +"Preme e arrastra o rato para debuxar con dous pinceis simétricos arriba e " "abaixo do debuxo." #: ../../magic/src/kalidescope.c:156 @@ -1089,7 +1091,7 @@ msgstr "Preme e arrastra o rato para pintar cunha cor metalizada." #: ../../magic/src/mirror_flip.c:110 msgid "Mirror" -msgstr "Reflectir" +msgstr "Espello" #: ../../magic/src/mirror_flip.c:112 msgid "Flip" @@ -1179,7 +1181,7 @@ msgstr "Preme para converter a negativo o debuxo." #: ../../magic/src/noise.c:66 msgid "Noise" -msgstr "Noise" +msgstr "Ruído" #: ../../magic/src/noise.c:70 msgid "Click and drag the mouse to add noise to parts of your picture." @@ -1188,7 +1190,7 @@ msgstr "" #: ../../magic/src/noise.c:71 msgid "Click to add noise to your entire picture." -msgstr "Preme para engadirlle ruído a todo o debuxo" +msgstr "Preme para engadirlle ruído a todo o debuxo." #: ../../magic/src/perspective.c:147 msgid "Perspective" @@ -1266,11 +1268,11 @@ msgstr "" #: ../../magic/src/ripples.c:102 msgid "Ripples" -msgstr "Ondulacións" +msgstr "Rizos" #: ../../magic/src/ripples.c:108 msgid "Click to make ripples appear over your picture." -msgstr "Preme para facer que aparezan unhas ondas no debuxo." +msgstr "Preme para facer que aparezan unhas ondas rizadas no debuxo." #: ../../magic/src/rosette.c:115 msgid "Rosette" @@ -1354,7 +1356,7 @@ msgstr "" #: ../../magic/src/snow.c:71 msgid "Snow Ball" -msgstr "Cerellos" +msgstr "Bolas de neve" #: ../../magic/src/snow.c:72 msgid "Snow Flake" @@ -1362,11 +1364,11 @@ msgstr "Folerpas" #: ../../magic/src/snow.c:76 msgid "Click to add snow balls to your picture." -msgstr "Preme para engadirlle cerellos ao debuxo" +msgstr "Preme para engadirlle cerellos ao debuxo." #: ../../magic/src/snow.c:77 msgid "Click to add snow flakes to your picture." -msgstr "Preme para engadirlle folerpas ao debuxo" +msgstr "Preme para engadirlle folerpas ao debuxo." #: ../../magic/src/string.c:129 msgid "String edges" @@ -1395,7 +1397,7 @@ msgstr "Preme e arrastra o rato para debuxar frechas feitas con cadenetas." #: ../../magic/src/string.c:153 msgid "Draw string art arrows with free angles." -msgstr "Debuxa cadenetas con forma de frecha de varios ángulos. " +msgstr "Debuxa cadenetas con forma de frecha de varios ángulos." #: ../../magic/src/tint.c:74 msgid "Tint" @@ -1496,7 +1498,7 @@ msgstr "Preme e arrastra o rato para obter un efecto excluínte (XOR)" #: ../../magic/src/xor.c:101 msgid "Click to draw a XOR effect on the whole picture" -msgstr "Preme para obter un efecto excluínte (XOR) en todo o debuxo." +msgstr "Preme para obter un efecto excluínte (XOR) en todo o debuxo" #~ msgid "`\\%_@$~#{<(^&*" #~ msgstr "`\\%_@$~#{<(^&*" From 8d8405daaba6d787e648713f74ebe4187bcfef5d Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Wed, 14 Oct 2020 21:03:20 +0900 Subject: [PATCH 02/41] For new build environment including 64bit version. --- Makefile | 138 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index 13841f57c..039dfbb47 100644 --- a/Makefile +++ b/Makefile @@ -23,25 +23,34 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf + LIBGCC_S_DLL:=libgcc_s_dw2-1.dll + MINGW_DIR:=/mingw32 else - ifeq ($(SYSNAME),Darwin) - OS:=osx + ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) + OS:=windows GPERF:=/usr/bin/gperf + LIBGCC_S_DLL:=libgcc_s_seh-1.dll + MINGW_DIR:=/mingw64 else - ifeq ($(SYSNAME),BeOS) - OS:=beos - GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf + ifeq ($(SYSNAME),Darwin) + OS:=osx + GPERF:=/usr/bin/gperf else - ifeq ($(SYSNAME),Haiku) + ifeq ($(SYSNAME),BeOS) OS:=beos - GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf - STDC_LIB:=-lstdc++ - ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) - STDC_LIB:=-lstdc++.r4 - endif + GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf else - OS:=linux - GPERF:=/usr/bin/gperf + ifeq ($(SYSNAME),Haiku) + OS:=beos + GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf + STDC_LIB:=-lstdc++ + ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) + STDC_LIB:=-lstdc++.r4 + endif + else + OS:=linux + GPERF:=/usr/bin/gperf + endif endif endif endif @@ -115,7 +124,7 @@ PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi) FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi) -windows_ARCH_LINKS:=-lintl $(PNG) -lzdll -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant +windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant osx_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 @@ -870,62 +879,63 @@ install-dlls: @echo @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) - @cp `which tuxpaint-config.exe` $(BIN_PREFIX) - @cp `which libintl-8.dll` $(BIN_PREFIX) + @cp `which tuxpaint-config` $(BIN_PREFIX) + @cp `which imagequant.dll` $(BIN_PREFIX) + @cp `which libbrotlicommon.dll` $(BIN_PREFIX) + @cp `which libbrotlidec.dll` $(BIN_PREFIX) + @cp `which libbz2-1.dll` $(BIN_PREFIX) + @cp `which libcairo-2.dll` $(BIN_PREFIX) + @cp `which libcairo-gobject-2.dll` $(BIN_PREFIX) + @cp `which libdatrie-1.dll` $(BIN_PREFIX) + @cp `which libexpat-1.dll` $(BIN_PREFIX) + @cp `which libffi-7.dll` $(BIN_PREFIX) + @cp `which libfontconfig-1.dll` $(BIN_PREFIX) + @cp `which libfreetype-6.dll` $(BIN_PREFIX) + @cp `which libfribidi-0.dll` $(BIN_PREFIX) + @cp `which $(LIBGCC_S_DLL)` $(BIN_PREFIX) + @cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgio-2.0-0.dll` $(BIN_PREFIX) + @cp `which libglib-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgobject-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgraphite2.dll` $(BIN_PREFIX) + @cp `which libharfbuzz-0.dll` $(BIN_PREFIX) @cp `which libiconv-2.dll` $(BIN_PREFIX) - @cp `which libpng12.dll` $(BIN_PREFIX) + @cp `which libintl-8.dll` $(BIN_PREFIX) + @cp `which libjpeg-8.dll` $(BIN_PREFIX) + @cp `which liblzma-5.dll` $(BIN_PREFIX) + @cp `which libmad-0.dll` $(BIN_PREFIX) + @cp `which libpango-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpcre-1.dll` $(BIN_PREFIX) + @cp `which libpixman-1-0.dll` $(BIN_PREFIX) + @cp `which libpng16-16.dll` $(BIN_PREFIX) + @cp `which librsvg-2-2.dll` $(BIN_PREFIX) + @cp `which libSDL_mixer-1-2-0.dll` $(BIN_PREFIX) + @cp `which libSDL_Pango-1.dll` $(BIN_PREFIX) + @cp `which libstdc++-6.dll` $(BIN_PREFIX) + @cp `which libthai-0.dll` $(BIN_PREFIX) + @cp `which libtiff-5.dll` $(BIN_PREFIX) + @cp `which libwebp-7.dll` $(BIN_PREFIX) + @cp `which libwinpthread-1.dll` $(BIN_PREFIX) + @cp `which libxml2-2.dll` $(BIN_PREFIX) + @cp `which libzstd.dll` $(BIN_PREFIX) + @cp `which mgwfltknox-1.3.dll` $(BIN_PREFIX) @cp `which SDL.dll` $(BIN_PREFIX) @cp `which SDL_image.dll` $(BIN_PREFIX) - @cp `which SDL_mixer.dll` $(BIN_PREFIX) @cp `which SDL_ttf.dll` $(BIN_PREFIX) - @cp `which libfreetype-6.dll` $(BIN_PREFIX) @cp `which zlib1.dll` $(BIN_PREFIX) - @cp `which libogg-0.dll` $(BIN_PREFIX) - @cp `which libvorbis-0.dll` $(BIN_PREFIX) - @cp `which libvorbisfile-3.dll` $(BIN_PREFIX) - @cp `which libjpeg-8.dll` $(BIN_PREFIX) - @cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX) - @cp `which libstdc++-6.dll` $(BIN_PREFIX) - @cp `which libfribidi-0.dll` $(BIN_PREFIX) - @cp `which libpthread-2.dll` $(BIN_PREFIX) - @if [ "x$(BDIST_WIN9X)" = "x" ]; then \ - cp `which libxml2-2.dll` $(BIN_PREFIX); \ - cp `which libcairo-2.dll` $(BIN_PREFIX); \ - cp `which libfontconfig-1.dll` $(BIN_PREFIX); \ - cp `which libSDL_Pango-1.dll` $(BIN_PREFIX); \ - cp `which libgobject-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libgthread-2.0-0.dll` $(BIN_PREFIX); \ - cp `which librsvg-2-2.dll` $(BIN_PREFIX); \ - cp `which libcroco-0.6-3.dll` $(BIN_PREFIX); \ - cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libglib-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libgsf-1-114.dll` $(BIN_PREFIX); \ - cp `which libpango-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpixman-1-0.dll` $(BIN_PREFIX); \ - cp `which libgio-2.0-0.dll` $(BIN_PREFIX); \ - cp `which bz2-1.dll` $(BIN_PREFIX); \ - fi @strip -s $(BIN_PREFIX)/*.dll - @if [ "x$(BDIST_WIN9X)" = "x" ]; then \ - echo; \ - echo "...Installing Configuration Files..."; \ - cp -R win32/etc/ $(BIN_PREFIX); \ - echo; \ - echo "...Installing Library Modules..."; \ - mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gtk-2.0/loaders/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \ - fi + @echo + @echo "...Installing Configuration Files..." + @cp -R win32/etc/ $(BIN_PREFIX) + @echo + @echo "...Installing Library Modules..." + @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll # Install symlink: .PHONY: install-haiku From 18912ee8ea11f4a7cd75ca741c45e15fde959d7e Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Thu, 15 Oct 2020 10:53:59 +0900 Subject: [PATCH 03/41] Find required dlls from .exe files. --- Makefile | 52 +++------------------------------------------ src/install-dlls.sh | 6 ++++++ 2 files changed, 9 insertions(+), 49 deletions(-) create mode 100644 src/install-dlls.sh diff --git a/Makefile b/Makefile index 039dfbb47..ec9d76ae2 100644 --- a/Makefile +++ b/Makefile @@ -873,60 +873,14 @@ install-bin: @cp tuxpaint$(EXE_EXT) $(BIN_PREFIX) @chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint$(EXE_EXT) -# Install the required Windows DLLs into the 'bdist' directory +# Install tuxpaint-config and required Windows DLLs into the 'bdist' directory .PHONY: install-dlls install-dlls: @echo @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) - @cp `which tuxpaint-config` $(BIN_PREFIX) - @cp `which imagequant.dll` $(BIN_PREFIX) - @cp `which libbrotlicommon.dll` $(BIN_PREFIX) - @cp `which libbrotlidec.dll` $(BIN_PREFIX) - @cp `which libbz2-1.dll` $(BIN_PREFIX) - @cp `which libcairo-2.dll` $(BIN_PREFIX) - @cp `which libcairo-gobject-2.dll` $(BIN_PREFIX) - @cp `which libdatrie-1.dll` $(BIN_PREFIX) - @cp `which libexpat-1.dll` $(BIN_PREFIX) - @cp `which libffi-7.dll` $(BIN_PREFIX) - @cp `which libfontconfig-1.dll` $(BIN_PREFIX) - @cp `which libfreetype-6.dll` $(BIN_PREFIX) - @cp `which libfribidi-0.dll` $(BIN_PREFIX) - @cp `which $(LIBGCC_S_DLL)` $(BIN_PREFIX) - @cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX) - @cp `which libgio-2.0-0.dll` $(BIN_PREFIX) - @cp `which libglib-2.0-0.dll` $(BIN_PREFIX) - @cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX) - @cp `which libgobject-2.0-0.dll` $(BIN_PREFIX) - @cp `which libgraphite2.dll` $(BIN_PREFIX) - @cp `which libharfbuzz-0.dll` $(BIN_PREFIX) - @cp `which libiconv-2.dll` $(BIN_PREFIX) - @cp `which libintl-8.dll` $(BIN_PREFIX) - @cp `which libjpeg-8.dll` $(BIN_PREFIX) - @cp `which liblzma-5.dll` $(BIN_PREFIX) - @cp `which libmad-0.dll` $(BIN_PREFIX) - @cp `which libpango-1.0-0.dll` $(BIN_PREFIX) - @cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX) - @cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX) - @cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX) - @cp `which libpcre-1.dll` $(BIN_PREFIX) - @cp `which libpixman-1-0.dll` $(BIN_PREFIX) - @cp `which libpng16-16.dll` $(BIN_PREFIX) - @cp `which librsvg-2-2.dll` $(BIN_PREFIX) - @cp `which libSDL_mixer-1-2-0.dll` $(BIN_PREFIX) - @cp `which libSDL_Pango-1.dll` $(BIN_PREFIX) - @cp `which libstdc++-6.dll` $(BIN_PREFIX) - @cp `which libthai-0.dll` $(BIN_PREFIX) - @cp `which libtiff-5.dll` $(BIN_PREFIX) - @cp `which libwebp-7.dll` $(BIN_PREFIX) - @cp `which libwinpthread-1.dll` $(BIN_PREFIX) - @cp `which libxml2-2.dll` $(BIN_PREFIX) - @cp `which libzstd.dll` $(BIN_PREFIX) - @cp `which mgwfltknox-1.3.dll` $(BIN_PREFIX) - @cp `which SDL.dll` $(BIN_PREFIX) - @cp `which SDL_image.dll` $(BIN_PREFIX) - @cp `which SDL_ttf.dll` $(BIN_PREFIX) - @cp `which zlib1.dll` $(BIN_PREFIX) + @cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) + @src/install-dlls.sh $(TPCONF_PATH) $(BIN_PREFIX) @strip -s $(BIN_PREFIX)/*.dll @echo @echo "...Installing Configuration Files..." diff --git a/src/install-dlls.sh b/src/install-dlls.sh new file mode 100644 index 000000000..c664432a0 --- /dev/null +++ b/src/install-dlls.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +for dll in `ldd tuxpaint.exe $1/tuxpaint-config.exe 2>&1 | grep /mingw | awk '{print $3}' | sort | uniq` +do + cp $dll $2 +done From d3212c66320ddf06dd9caf2611b50a4b0047f5ce Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 14 Oct 2020 23:27:57 -0700 Subject: [PATCH 04/41] Doc'ing Shin-Ichi's Mingw64 and install-dlls.sh Doc'ing Shin-Ichi TOYAMA's recent commits. --- Makefile | 2 +- docs/CHANGES.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ec9d76ae2..d1efbea8c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - July 24, 2020 +# June 14, 2002 - October 14, 2020 # The version number, for release: diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index a5c6cd615..646d5603a 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.September.16 (0.9.25) +2020.October.14 (0.9.25) * New Features ------------ * Export drawings: @@ -66,6 +66,10 @@ $Id$ * Windows build changes * Enabling PowerTools repositry to install additional SDL* packages * Corrected README launcher for English, after install completes + * Support for Mingw64 for 64-bit builds + * Ability to find Mingw DLLs by examining EXEs + (new shell script replaces hard-coded list in Makefile) + TOYAMA Shin-ichi * New Brushes ----------- From 9781a4723cbe5bd4d6bd7b5048d830821dda23ef Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 14 Oct 2020 23:44:14 -0700 Subject: [PATCH 05/41] Ignore & clean up failed SVG thumbnails When building Tux Paint, ImageMagick's `convert` might fail to generate thumbnail PNGs for some Starter SVG images (e.g., "manatee.svg"), with a "too many bezier coordinates" error. This did not happen before, and does not happen with newer versions of ImageMagick; there was a regression fixed in 2018: https://github.com/ImageMagick/ImageMagick/issues/1069 However, it's occurring in Ubuntu 20.04 'focal' (I've got version "6.9.10-23 Q16 x86_64 20190101"). Therefore, as a quick-fix, simply ignoring errors from `convert`, and removing the (bogus) PNG thumbmail image, and allowing the `make` process to proceed. Tux Paint will simply open the SVG and generate a thumbnail to display on the screen when the "New" dialog is brought up. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d1efbea8c..be2d3c7cb 100644 --- a/Makefile +++ b/Makefile @@ -720,7 +720,7 @@ $(THUMB_STARTERS): convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ - convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \ + convert $(CONVERT_OPTS) $(STARTER_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ fi $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % @@ -775,7 +775,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv $(THUMB_TEMPLATES): @echo -n "." @mkdir -p templates/.thumbs - @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ ; \ + convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % @install -D -m 644 $< $@ From 2bde61ae4690ad122f545e6ba9d2e3b63ee75145 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Thu, 15 Oct 2020 22:31:46 +0900 Subject: [PATCH 06/41] No need to distinguish libgcc_s dll for 64/32bit. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index be2d3c7cb..a0a39479e 100644 --- a/Makefile +++ b/Makefile @@ -23,13 +23,11 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf - LIBGCC_S_DLL:=libgcc_s_dw2-1.dll MINGW_DIR:=/mingw32 else ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) OS:=windows GPERF:=/usr/bin/gperf - LIBGCC_S_DLL:=libgcc_s_seh-1.dll MINGW_DIR:=/mingw64 else ifeq ($(SYSNAME),Darwin) From f024a95a969b306336f2c6772978b0b978eebd5e Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Thu, 15 Oct 2020 22:33:03 -0700 Subject: [PATCH 07/41] Avoid bogusly trying to mkdir sysdir in savedir While we weren't attempting to save thumbnail PNG files of the starter and templates that are scanned in the system-wide Tux Paint directory, we WERE trying to incorrectly `mkdir` such directories within the user's personal directory. (e.g., "/home/kendrick/.tuxpaint//usr/local/share/tuxpaint/templates") Mended. --- src/tuxpaint.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 7f7de9f94..c08b32d76 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - August 30, 2020 + June 14, 2002 - October 15, 2020 */ @@ -12042,7 +12042,7 @@ static void save_current(void) char *fname; FILE *fi; - if (!make_directory(DIR_SAVE, "", "Can't create user data directory")) + if (!make_directory(DIR_SAVE, "", "Can't create user data directory (E001)")) { draw_tux_text(TUX_OOPS, strerror(errno), 0); return; @@ -13376,7 +13376,7 @@ static int do_save(int tool, int dont_show_success_results) show_progress_bar(screen); do_setcursor(cursor_watch); - if (!make_directory(DIR_SAVE, "", "Can't create user data directory")) + if (!make_directory(DIR_SAVE, "", "Can't create user data directory (E002)")) { fprintf(stderr, "Cannot save the any pictures! SORRY!\n\n"); draw_tux_text(TUX_OOPS, strerror(errno), 0); @@ -13388,7 +13388,7 @@ static int do_save(int tool, int dont_show_success_results) /* Make sure we have a ~/.tuxpaint/saved directory: */ - if (!make_directory(DIR_SAVE, "saved", "Can't create user data directory")) + if (!make_directory(DIR_SAVE, "saved", "Can't create user data directory (for saved drawings) (E003)")) { fprintf(stderr, "Cannot save any pictures! SORRY!\n\n"); draw_tux_text(TUX_OOPS, strerror(errno), 0); @@ -13400,7 +13400,7 @@ static int do_save(int tool, int dont_show_success_results) /* Make sure we have a ~/.tuxpaint/saved/.thumbs/ directory: */ - if (!make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory")) + if (!make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory (for saved drawings' thumbnails) (E004)")) { fprintf(stderr, "Cannot save any pictures! SORRY!\n\n"); draw_tux_text(TUX_OOPS, strerror(errno), 0); @@ -13411,7 +13411,7 @@ static int do_save(int tool, int dont_show_success_results) /* Make sure we have a ~/.tuxpaint/saved/.label/ directory: */ - if (!make_directory(DIR_SAVE, "saved/.label", "Can't create label information directory")) + if (!make_directory(DIR_SAVE, "saved/.label", "Can't create label information directory (E005)")) { fprintf(stderr, "Cannot save label information! SORRY!\n\n"); draw_tux_text(TUX_OOPS, strerror(errno), 0); @@ -14454,10 +14454,10 @@ static int do_open(void) /* No thumbnail - load original: */ /* Make sure we have a ~/.tuxpaint/saved directory: */ - if (make_directory(DIR_SAVE, "saved", "Can't create user data directory")) + if (make_directory(DIR_SAVE, "saved", "Can't create user data directory (for saved drawings) (E006)")) { /* (Make sure we have a .../saved/.thumbs/ directory:) */ - make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory"); + make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory (for saved drawings' thumbnails) (E007)"); } @@ -15522,10 +15522,10 @@ static int do_slideshow(void) /* No thumbnail - load original: */ /* Make sure we have a ~/.tuxpaint/saved directory: */ - if (make_directory(DIR_SAVE, "saved", "Can't create user data directory")) + if (make_directory(DIR_SAVE, "saved", "Can't create user data directory (for saved drawings) (E008)")) { /* (Make sure we have a .../saved/.thumbs/ directory:) */ - make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory"); + make_directory(DIR_SAVE, "saved/.thumbs", "Can't create user data thumbnail directory (for saved drawings' thumbnails) (E009)"); } safe_snprintf(fname, sizeof(fname), "%s/%s", dirname, f->d_name); @@ -19348,12 +19348,16 @@ static int do_new_dialog(void) { /* No thumbnail - load original: */ - /* Make sure we have a ~/.tuxpaint/[starters|templates] directory: */ - if (make_directory(DIR_SAVE, dirname[d_places[num_files]], "Can't create user data directory")) + if (d_places[num_files] == PLACE_PERSONAL_TEMPLATES_DIR || + d_places[num_files] == PLACE_PERSONAL_STARTERS_DIR) { - /* (Make sure we have a .../[starters|templates]/.thumbs/ directory:) */ - safe_snprintf(fname, sizeof(fname), "%s/.thumbs", dirname[d_places[num_files]]); - make_directory(DIR_SAVE, fname, "Can't create user data thumbnail directory"); + /* Make sure we have a ~/.tuxpaint/[starters|templates] directory: */ + if (make_directory(DIR_SAVE, dirname[d_places[num_files]], "Can't create user data directory (for starters/templates) (E010)")) + { + /* (Make sure we have a .../[starters|templates]/.thumbs/ directory:) */ + safe_snprintf(fname, sizeof(fname), "%s/.thumbs", dirname[d_places[num_files]]); + make_directory(DIR_SAVE, fname, "Can't create user data thumbnail directory (for starters/templates) (E011)"); + } } img = NULL; @@ -19454,10 +19458,10 @@ static int do_new_dialog(void) safe_snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png", dirname[d_places[num_files]], d_names[num_files]); - if (!make_directory(DIR_SAVE, "starters", "Can't create user data directory") || - !make_directory(DIR_SAVE, "templates", "Can't create user data directory") || - !make_directory(DIR_SAVE, "starters/.thumbs", "Can't create user data directory") || - !make_directory(DIR_SAVE, "templates/.thumbs", "Can't create user data directory")) + if (!make_directory(DIR_SAVE, "starters", "Can't create user data directory (for starters) (E012)") || + !make_directory(DIR_SAVE, "templates", "Can't create user data directory (for templates) (E013)") || + !make_directory(DIR_SAVE, "starters/.thumbs", "Can't create user data directory (for starters) (E014)") || + !make_directory(DIR_SAVE, "templates/.thumbs", "Can't create user data directory (for templates) (E015)")) fprintf(stderr, "Cannot save any pictures! SORRY!\n\n"); else { @@ -25946,7 +25950,7 @@ static char * get_export_filepath(const char * ext) { /* Make sure the export dir exists */ - if (!make_directory(DIR_EXPORT, "", "Can't create export directory")) + if (!make_directory(DIR_EXPORT, "", "Can't create export directory (E016)")) { return NULL; } From b936bbc4ba1de6c735c0250a94a53edf45b35f6d Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Thu, 15 Oct 2020 22:41:17 -0700 Subject: [PATCH 08/41] `make install` robust to missing thumbnails Sometimes thumbnails of starters or templates fail to generate (ImageMagick bug; see https://sourceforge.net/p/tuxpaint/tuxpaint/ci/9781a4723cbe5bd4d6bd7b5048d830821dda23ef/) Avoid failing "make install" step when they are missing. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a0a39479e..b4d1334b5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - October 14, 2020 +# June 14, 2002 - October 15, 2020 # The version number, for release: @@ -715,14 +715,14 @@ $(THUMB_STARTERS): @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ then \ composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ - convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ + convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ - convert $(CONVERT_OPTS) $(STARTER_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ + convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ fi $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ + @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) .PHONY: echo-thumb-starters echo-thumb-starters: @@ -773,10 +773,10 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv $(THUMB_TEMPLATES): @echo -n "." @mkdir -p templates/.thumbs - convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ + @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ + @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) .PHONY: echo-thumb-templates echo-thumb-templates: From 68bd1f6861452d57dc4b9ae9df5b79c2aac61ad0 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 18 Oct 2020 16:59:38 +0900 Subject: [PATCH 09/41] Reverting hard conded dll install because ldd does not solve dependencies on 32bit environment. --- Makefile | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4d1334b5..0ba1ffe47 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,13 @@ ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf MINGW_DIR:=/mingw32 + LIBGCC_S_DLL=libgcc_s_dw2-1.dll else ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) OS:=windows GPERF:=/usr/bin/gperf MINGW_DIR:=/mingw64 + LIBGCC_S_DLL=libgcc_s_seh-1.dll else ifeq ($(SYSNAME),Darwin) OS:=osx @@ -878,7 +880,53 @@ install-dlls: @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) @cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) - @src/install-dlls.sh $(TPCONF_PATH) $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/imagequant.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libbrotlicommon.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libbrotlidec.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libbz2-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libcairo-2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libcairo-gobject-2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libdatrie-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libexpat-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libffi-7.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libfontconfig-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libfreetype-6.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libfribidi-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/$(LIBGCC_S_DLL) $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libgdk_pixbuf-2.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libgio-2.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libglib-2.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libgmodule-2.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libgobject-2.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libgraphite2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libharfbuzz-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libiconv-2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libintl-8.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libjpeg-8.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/liblzma-5.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libmad-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpango-1.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpangocairo-1.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpangoft2-1.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpangowin32-1.0-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpcre-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpixman-1-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libpng16-16.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/librsvg-2-2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libSDL_mixer-1-2-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libSDL_Pango-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libstdc++-6.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libthai-0.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libtiff-5.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libwebp-7.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libwinpthread-1.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libxml2-2.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/libzstd.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/mgwfltknox-1.3.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/SDL.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/SDL_image.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/SDL_ttf.dll $(BIN_PREFIX) + @cp $(MINGW_DIR)/bin/zlib1.dll $(BIN_PREFIX) @strip -s $(BIN_PREFIX)/*.dll @echo @echo "...Installing Configuration Files..." From e2604562702f31e08a1dec469d9f45b2bbc8e1b6 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 18 Oct 2020 21:22:52 +0900 Subject: [PATCH 10/41] Re-enabled scripted dll install --- Makefile | 104 ++++++++++---------------------------------- src/install-dlls.sh | 12 ++--- 2 files changed, 30 insertions(+), 86 deletions(-) diff --git a/Makefile b/Makefile index 0ba1ffe47..217dc6f27 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # Tux Paint - A simple drawing program for children. -# Copyright (c) 2002-2020 +# Copyright (c) 2002-2019 # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - October 15, 2020 +# June 14, 2002 - October 29, 2019 # The version number, for release: -VER_VERSION:=0.9.25 +VER_VERSION:=0.9.24 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") else @@ -23,14 +23,12 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf - MINGW_DIR:=/mingw32 - LIBGCC_S_DLL=libgcc_s_dw2-1.dll + MINGW_DIR=/mingw32 else ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) OS:=windows GPERF:=/usr/bin/gperf - MINGW_DIR:=/mingw64 - LIBGCC_S_DLL=libgcc_s_seh-1.dll + MINGW_DIR=/mingw64 else ifeq ($(SYSNAME),Darwin) OS:=osx @@ -124,10 +122,10 @@ PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) 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 -beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) -limagequant -linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -limagequant +windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv +osx_ARCH_LINKS:=$(FRIBIDI_LIB) +beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) +linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) ARCH_LINKS:=$($(OS)_ARCH_LINKS) windows_ARCH_HEADERS:=src/win32_print.h @@ -717,14 +715,14 @@ $(THUMB_STARTERS): @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ then \ composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ - convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ + convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ - convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ + convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \ fi $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) + @install -D -m 644 $< $@ .PHONY: echo-thumb-starters echo-thumb-starters: @@ -775,10 +773,10 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv $(THUMB_TEMPLATES): @echo -n "." @mkdir -p templates/.thumbs - @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ + @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ ; \ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) + @install -D -m 644 $< $@ .PHONY: echo-thumb-templates echo-thumb-templates: @@ -873,69 +871,23 @@ install-bin: @cp tuxpaint$(EXE_EXT) $(BIN_PREFIX) @chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint$(EXE_EXT) -# Install tuxpaint-config and required Windows DLLs into the 'bdist' directory +# Install the required Windows DLLs into the 'bdist' directory .PHONY: install-dlls install-dlls: @echo @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) @cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/imagequant.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libbrotlicommon.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libbrotlidec.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libbz2-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libcairo-2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libcairo-gobject-2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libdatrie-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libexpat-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libffi-7.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libfontconfig-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libfreetype-6.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libfribidi-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/$(LIBGCC_S_DLL) $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libgdk_pixbuf-2.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libgio-2.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libglib-2.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libgmodule-2.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libgobject-2.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libgraphite2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libharfbuzz-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libiconv-2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libintl-8.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libjpeg-8.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/liblzma-5.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libmad-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpango-1.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpangocairo-1.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpangoft2-1.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpangowin32-1.0-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpcre-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpixman-1-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libpng16-16.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/librsvg-2-2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libSDL_mixer-1-2-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libSDL_Pango-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libstdc++-6.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libthai-0.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libtiff-5.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libwebp-7.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libwinpthread-1.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libxml2-2.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/libzstd.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/mgwfltknox-1.3.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/SDL.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/SDL_image.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/SDL_ttf.dll $(BIN_PREFIX) - @cp $(MINGW_DIR)/bin/zlib1.dll $(BIN_PREFIX) + @src/install-dlls.sh $(TPCONF_PATH) $(BIN_PREFIX) @strip -s $(BIN_PREFIX)/*.dll - @echo - @echo "...Installing Configuration Files..." - @cp -R win32/etc/ $(BIN_PREFIX) - @echo - @echo "...Installing Library Modules..." - @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders - @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders - @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll + echo; \ + echo "...Installing Configuration Files..."; \ + cp -R win32/etc/ $(BIN_PREFIX); \ + echo; \ + echo "...Installing Library Modules..."; \ + mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ + cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ + strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ # Install symlink: .PHONY: install-haiku @@ -1045,7 +997,6 @@ TuxPaint.dmg: tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \ obj/rgblinear.o obj/playsound.o obj/fonts.o obj/parse.o obj/fill.o \ obj/progressbar.o obj/dirwalk.o obj/get_fname.o obj/onscreen_keyboard.o \ - obj/gifenc.o \ $(ARCH_LIBS) @echo @echo "...Linking Tux Paint..." @@ -1066,7 +1017,6 @@ obj/tuxpaint.o: src/tuxpaint.c \ src/tools.h src/titles.h src/colors.h src/shapes.h \ src/sounds.h src/tip_tux.h src/great.h \ src/tp_magic_api.h src/parse.h src/onscreen_keyboard.h \ - src/gifenc.h \ src/$(MOUSEDIR)/arrow.xbm src/$(MOUSEDIR)/arrow-mask.xbm \ src/$(MOUSEDIR)/hand.xbm src/$(MOUSEDIR)/hand-mask.xbm \ src/$(MOUSEDIR)/insertion.xbm \ @@ -1152,12 +1102,6 @@ obj/pixels.o: src/pixels.c src/pixels.h src/compiler.h src/debug.h @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \ -c src/pixels.c -o obj/pixels.o -obj/gifenc.o: src/gifenc.c src/gifenc.h - @echo - @echo "...Compiling animated GIF export libary..." - @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(DEFS) \ - -c src/gifenc.c -o obj/gifenc.o - obj/playsound.o: src/playsound.c src/playsound.h \ src/compiler.h src/debug.h @echo diff --git a/src/install-dlls.sh b/src/install-dlls.sh index c664432a0..7481a3f73 100644 --- a/src/install-dlls.sh +++ b/src/install-dlls.sh @@ -1,6 +1,6 @@ -#!/bin/sh - -for dll in `ldd tuxpaint.exe $1/tuxpaint-config.exe 2>&1 | grep /mingw | awk '{print $3}' | sort | uniq` -do - cp $dll $2 -done +#!/bin/sh + +for dll in `ldd tuxpaint.exe $1/tuxpaint-config.exe 2>&1 | grep /mingw | awk '{print $3}' | sort | uniq` +do + cp $dll $2 +done From b7c312ed5e45ed50ed14faf1cde4d36f83b6d814 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 18 Oct 2020 21:50:20 +0900 Subject: [PATCH 11/41] Re-enable scripted dll install (Sorry, pushed wrong file before) --- Makefile | 56 ++++++++++++++++++++++++++------------------- src/install-dlls.sh | 22 ++++++++++++++---- 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 217dc6f27..7fb2e6fe6 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # Tux Paint - A simple drawing program for children. -# Copyright (c) 2002-2019 +# Copyright (c) 2002-2020 # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - October 29, 2019 +# June 14, 2002 - October 15, 2020 # The version number, for release: -VER_VERSION:=0.9.24 +VER_VERSION:=0.9.25 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") else @@ -23,12 +23,12 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf - MINGW_DIR=/mingw32 + MINGW_DIR:=/mingw32 else ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) OS:=windows GPERF:=/usr/bin/gperf - MINGW_DIR=/mingw64 + MINGW_DIR:=/mingw64 else ifeq ($(SYSNAME),Darwin) OS:=osx @@ -122,10 +122,10 @@ PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) 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 -osx_ARCH_LINKS:=$(FRIBIDI_LIB) -beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) -linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) +windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant +osx_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 @@ -715,14 +715,14 @@ $(THUMB_STARTERS): @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ then \ composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ - convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ + convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ - convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \ + convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ fi $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ + @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) .PHONY: echo-thumb-starters echo-thumb-starters: @@ -773,10 +773,10 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv $(THUMB_TEMPLATES): @echo -n "." @mkdir -p templates/.thumbs - @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ ; \ + @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % - @install -D -m 644 $< $@ + @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) .PHONY: echo-thumb-templates echo-thumb-templates: @@ -871,23 +871,23 @@ install-bin: @cp tuxpaint$(EXE_EXT) $(BIN_PREFIX) @chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint$(EXE_EXT) -# Install the required Windows DLLs into the 'bdist' directory +# Install tuxpaint-config and required Windows DLLs into the 'bdist' directory .PHONY: install-dlls install-dlls: @echo @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) @cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) - @src/install-dlls.sh $(TPCONF_PATH) $(BIN_PREFIX) + @src/install-dlls.sh tuxpaint.exe $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) @strip -s $(BIN_PREFIX)/*.dll - echo; \ - echo "...Installing Configuration Files..."; \ - cp -R win32/etc/ $(BIN_PREFIX); \ - echo; \ - echo "...Installing Library Modules..."; \ - mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ + @echo + @echo "...Installing Configuration Files..." + @cp -R win32/etc/ $(BIN_PREFIX) + @echo + @echo "...Installing Library Modules..." + @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll # Install symlink: .PHONY: install-haiku @@ -997,6 +997,7 @@ TuxPaint.dmg: tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \ obj/rgblinear.o obj/playsound.o obj/fonts.o obj/parse.o obj/fill.o \ obj/progressbar.o obj/dirwalk.o obj/get_fname.o obj/onscreen_keyboard.o \ + obj/gifenc.o \ $(ARCH_LIBS) @echo @echo "...Linking Tux Paint..." @@ -1017,6 +1018,7 @@ obj/tuxpaint.o: src/tuxpaint.c \ src/tools.h src/titles.h src/colors.h src/shapes.h \ src/sounds.h src/tip_tux.h src/great.h \ src/tp_magic_api.h src/parse.h src/onscreen_keyboard.h \ + src/gifenc.h \ src/$(MOUSEDIR)/arrow.xbm src/$(MOUSEDIR)/arrow-mask.xbm \ src/$(MOUSEDIR)/hand.xbm src/$(MOUSEDIR)/hand-mask.xbm \ src/$(MOUSEDIR)/insertion.xbm \ @@ -1102,6 +1104,12 @@ obj/pixels.o: src/pixels.c src/pixels.h src/compiler.h src/debug.h @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \ -c src/pixels.c -o obj/pixels.o +obj/gifenc.o: src/gifenc.c src/gifenc.h + @echo + @echo "...Compiling animated GIF export libary..." + @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(DEFS) \ + -c src/gifenc.c -o obj/gifenc.o + obj/playsound.o: src/playsound.c src/playsound.h \ src/compiler.h src/debug.h @echo diff --git a/src/install-dlls.sh b/src/install-dlls.sh index 7481a3f73..20726b773 100644 --- a/src/install-dlls.sh +++ b/src/install-dlls.sh @@ -1,6 +1,20 @@ #!/bin/sh -for dll in `ldd tuxpaint.exe $1/tuxpaint-config.exe 2>&1 | grep /mingw | awk '{print $3}' | sort | uniq` -do - cp $dll $2 -done +find_depends(){ + for dllpath in `ntldd $@ | grep mingw | awk '{print $3}' | sort | uniq` + do + dllname=`basename $dllpath` + if ! grep -q $dllname dlllist; then + echo $dllpath >> dlllist + echo -n . + cp $dllpath $DESTDIR/ + find_depends $dllpath + fi + done +} + +DESTDIR=$3 +echo > dlllist + +find_depends $1 $2 +echo From 522e9ee5bb7a33b0133907f7dbbc4997a34fe2d0 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Tue, 20 Oct 2020 23:25:52 +0900 Subject: [PATCH 12/41] Edited for up-to-date translation fies and directory structure --- win32/tuxpaint.iss | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index da47ce93e..6988952dd 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -73,7 +73,7 @@ OutputDir=.\ LicenseFile={#BdistDir}\docs\COPYING-OC.txt OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer-opencandy #else - LicenseFile={#BdistDir}\docs\COPYING.txt + LicenseFile={#BdistDir}\docs\COPYING\COPYING-en.txt OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer #endif SetupIconFile={#BdistDir}\data\images\tuxpaint-installer.ico @@ -82,7 +82,7 @@ SolidCompression=yes PrivilegesRequired=admin [Languages] -Name: "arm"; MessagesFile: "compiler:Languages\Armenian.islu" +Name: "arm"; MessagesFile: "compiler:Languages\Armenian.isl" Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl" Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" @@ -129,7 +129,7 @@ Name: "epo"; MessagesFile: "compiler:Languages\Esperanto.isl" Name: "est"; MessagesFile: "compiler:Languages\Estonian.isl" Name: "fas"; MessagesFile: "compiler:Languages\Farsi.isl" Name: "gal"; MessagesFile: "compiler:Languages\Galician.isl" -Name: "geo"; MessagesFile: "compiler:Languages\Georgian.islu" +Name: "geo"; MessagesFile: "compiler:Languages\Georgian.isl" Name: "hin"; MessagesFile: "compiler:Languages\Hindi.islu" Name: "ice"; MessagesFile: "compiler:Languages\Icelandic.isl" Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl" @@ -640,38 +640,38 @@ begin lang := Lang2Gettext(false); if lang = 'pt_br' then - licence := 'pt_br\COPYING_pt_BR.txt' + licence := 'COPYING_pt_BR.txt' else if lang = 'ca' then - licence := 'ca\COPYING.txt' + licence := 'COPYING-ca.txt' else if lang = 'cs' then - licence := 'cs\COPYING.txt' + licence := 'COPYING-cs.txt' else if lang = 'da' then - licence := 'da\COPYING.txt' + licence := 'COPYING-da.txt' else if lang = 'nl' then - licence := 'nl\COPYING_nl.txt' + licence := 'COPYING-nl.txt' else if lang = 'fr' then - licence := 'fr\COPIER.txt' + licence := 'COPYING-fr-COPIER.txt' else if lang = 'de' then - licence := 'de\KOPIE.txt' + licence := 'COPYING-de-KOPIE.txt' else if lang = 'it' then - licence := 'it\COPIATURA.txt' + licence := 'COPYING-COPIATURA.txt' else if lang = 'pl' then - licence := 'pl\LICENCJA-GNU.txt' + licence := 'COPYING-pl-LICENCJA-GNU.txt' else if lang = 'es' then - licence := 'es\COPIADO.txt' + licence := 'COPYING-es-COPIADO.txt' else - licence := 'COPYING.txt'; + licence := 'COPYING-en.txt'; - Result := 'docs\'+licence + Result := 'docs\COPYING\'+licence end; function MyPublisherURL(Default: String): String; From ade754a24a24c5a517b71677ef87c2dbb652e079 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Wed, 21 Oct 2020 23:28:26 +0900 Subject: [PATCH 13/41] COPYING-ja.txt was broken --- docs/COPYING/COPYING-ja.txt | 888 +++++++++++++++++------------------- 1 file changed, 431 insertions(+), 457 deletions(-) diff --git a/docs/COPYING/COPYING-ja.txt b/docs/COPYING/COPYING-ja.txt index 92e9972b4..6da607b87 100644 --- a/docs/COPYING/COPYING-ja.txt +++ b/docs/COPYING/COPYING-ja.txt @@ -1,461 +1,435 @@ - Link: translated - - GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ - - [ÎäÀŤʥ°¥Ë¥å¡¼¤Î²èÁü] [ ¥Á¥§¥³¸ì | ±Ñ¸ì | ÆüËܸì ] - - * GPL °ãÈ¿¤È»×¤ï¤ì¤ë»öÎã¤ò¸«¤«¤±¤¿¤é - * GPL ¤Î³Æ¹ñ¸ìÌõ - * GPL ¤Ë´Ø¤·¤Æ¤è¤¯Ê¹¤«¤ì¤ë¼ÁÌä - * GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ (GPL) ¥×¥ì¡¼¥ó¥Æ¥¥¹¥È·Á¼° - * GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ (GPL) Texinfo ·Á¼° - - ---------------------------------------------------------------------- - -¤â¤¯¤¸ - - * GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ - * ¤Ï¤¸¤á¤Ë - * Ê£À½¡¢ÈÒÉÛ¡¢²þÊѤ˴ؤ¹¤ë¾ò·ï¤ÈÀ©Ìó - * °Ê¾å¤Î¾ò¹à¤ò¤¢¤Ê¤¿¤Î¿·¤·¤¤¥×¥í¥°¥é¥à¤ËŬÍѤ¹¤ëÊýË¡ - - ---------------------------------------------------------------------- - -GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ - - ¥Ð¡¼¥¸¥ç¥ó 2¡¢1991ǯ6·î - ÆüËܸìÌõ¡¢2002ǯ8·î28Æü - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - - ¤³¤ÎÍøÍѵöÂú·ÀÌó½ñ¤ò¡¢°ì»ú°ì¶ç¤½¤Î¤Þ¤Þ¤ËÊ£À½¤·ÈÒÉÛ¤¹¤ë¤³¤È¤Ïµö²Ä¤¹¤ë¡£ - ¤·¤«¤·Êѹ¹¤Ïǧ¤á¤Ê¤¤¡£ - - This is an unofficial translation of the GNU General Public License into - Japanese. It was not published by the Free Software Foundation, and does - not legally state the distribution terms for software that uses the GNU - GPL--only the original English text of the GNU GPL does that. However, - we hope that this translation will help Japanese speakers understand the - GNU GPL better. - - (Ìõ: °Ê²¼¤ÏGNU General Public License¤ÎÈó¸ø¼°¤ÊÆüËܸìÌõ¤Ç¤¹¡£¤³¤ì¤Ï¥Õ - ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃÄ(the Free Software Foundation)¤Ë¤è¤Ã¤Æȯɽ¤µ¤ì¤¿¤â - ¤Î¤Ç¤Ï¤Ê¤¯¡¢GNU GPL¤òŬÍѤ·¤¿¥½¥Õ¥È¥¦¥§¥¢¤ÎÈÒÉÛ¾ò·ï¤òˡŪ¤Ë͸ú¤Ê·Á¤Ç - ½Ò¤Ù¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÈÒÉÛ¾ò·ï¤È¤·¤Æ¤ÏGNU GPL¤Î±Ñ¸ìÈǥƥ¥¹¥È¤Ç»Ø - Äꤵ¤ì¤Æ¤¤¤ë¤â¤Î¤Î¤ß¤¬Í¸ú¤Ç¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢»ä¤¿¤Á¤Ï¤³¤ÎËÝÌõ¤¬¡¢ÆüËÜ - ¸ì¤ò»ÈÍѤ¹¤ë¿Í¡¹¤Ë¤È¤Ã¤ÆGNU GPL¤ò¤è¤êÎɤ¯Íý²ò¤¹¤ë½õ¤±¤È¤Ê¤ë¤³¤È¤ò˾¤ó - ¤Ç¤¤¤Þ¤¹¡£) - - ËÝÌõ¤Ï - ȬÅÄ¿¿¹Ô¤¬¹Ô¤Ã¤¿¡£¸¶Ê¸¤Ïhttp://www.gnu.org/licenses/gpl.html - ¤Ç¤¢¤ë¡£¸íÌõ¤Î»ØŦ¤ä²þÁ±°Æ¤ò´¿·Þ¤¹¤ë¡£ - -¤Ï¤¸¤á¤Ë - - ¥½¥Õ¥È¥¦¥§¥¢¸þ¤±¥é¥¤¥»¥ó¥¹¤ÎÂçȾ¤Ï¡¢¤¢¤Ê¤¿¤¬¤½¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò¶¦Í¤·¤¿ - ¤êÊѹ¹¤·¤¿¤ê¤¹¤ë¼«Í³¤òÃ¥¤¦¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ÂоÈŪ¤Ë¡¢GNU °ìÈ̸ø - ½°ÍøÍѵöÂú·ÀÌó½ñ¤Ï¡¢¤¢¤Ê¤¿¤¬¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤ò¶¦Í¤·¤¿¤êÊѹ¹¤·¤¿¤ê¤¹ - ¤ë¼«Í³¤òÊݾڤ¹¤ë--¤¹¤Ê¤ï¤Á¡¢¥½¥Õ¥È¥¦¥§¥¢¤¬¤½¤Î¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¤È¤Ã¤Æ¥Õ¥ê¡¼ - ¤Ç¤¢¤ë¤³¤È¤òÊݾڤ¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î°ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ - ¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤΥ½¥Õ¥È¥¦¥§¥¢¤Î¤Û¤È¤ó¤É¤ËŬÍѤµ¤ì¤Æ¤ª¤ê¡¢¤Þ¤¿ GNU - GPL¤òŬÍѤ¹¤ë¤È·è¤á¤¿¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃİʳ°¤Îºî¼Ô¤Ë¤è¤ë¥×¥í¥° - ¥é¥à¤Ë¤âŬÍѤµ¤ì¤Æ¤¤¤Þ¤¹(¤¤¤¯¤Ä¤«¤Î¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤΥ½¥Õ¥È¥¦¥§ - ¥¢¤Ë¤Ï¡¢GNU GPL¤Ç¤Ï¤Ê¤¯GNU ¥é¥¤¥Ö¥é¥ê°ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤¬Å¬ÍѤµ¤ì - ¤Æ¤¤¤Þ¤¹)¡£¤¢¤Ê¤¿¤â¤Þ¤¿¡¢¤´¼«Ê¬¤Î¥×¥í¥°¥é¥à¤ËGNU GPL¤òŬÍѤ¹¤ë¤³¤È¤¬²Ä - ǽ¤Ç¤¹¡£ - - »ä¤¿¤Á¤¬¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤È¸À¤¦¤È¤¡¢¤½¤ì¤ÏÍøÍѤμ«Í³¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤·¤Æ - ¤¤¤ë¤Î¤Ç¤¢¤Ã¤Æ¡¢²Á³Ê¤ÏÌäÂê¤Ë¤·¤Æ¤¤¤Þ¤»¤ó¡£»ä¤¿¤Á¤Î°ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó - ½ñ¤Ï¡¢¤¢¤Ê¤¿¤¬¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤ÎÊ£À½Êª¤òÈÒÉÛ¤¹¤ë¼«Í³¤òÊݾڤ¹¤ë¤è¤¦Àß - ·×¤µ¤ì¤Æ¤¤¤Þ¤¹(´õ˾¤Ë±þ¤¸¤Æ¤½¤Î¼ï¤Î¥µ¡¼¥Ó¥¹¤Ë¼ê¿ôÎÁ¤ò²Ý¤¹¼«Í³¤âÊݾڤµ - ¤ì¤Þ¤¹)¡£¤Þ¤¿¡¢¤¢¤Ê¤¿¤¬¥½¡¼¥¹¥³¡¼¥É¤ò¼õ¤±¼è¤ë¤«¡¢¤¢¤ë¤¤¤Ï˾¤á¤Ð¤½¤ì¤ò - Æþ¼ê¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¢¤ë¤È¤¤¤¦¤³¤È¡¢¤¢¤Ê¤¿¤¬¥½¥Õ¥È¥¦¥§¥¢¤òÊѹ¹¤·¡¢¤½¤Î - °ìÉô¤ò¿·¤¿¤Ê¥Õ¥ê¡¼¤Î¥×¥í¥°¥é¥à¤ÇÍøÍѤǤ¤ë¤È¤¤¤¦¤³¤È¡¢¤½¤·¤Æ¡¢°Ê¾å¤Ç½Ò - ¤Ù¤¿¤è¤¦¤Ê¤³¤È¤¬¤Ç¤¤ë¤È¤¤¤¦¤³¤È¤¬¤¢¤Ê¤¿¤ËÃΤ餵¤ì¤ë¤È¤¤¤¦¤³¤È¤âÊݾڤµ - ¤ì¤Þ¤¹¡£ - - ¤¢¤Ê¤¿¤Î¸¢Íø¤ò¼é¤ë¤¿¤á¡¢»ä¤¿¤Á¤Ï狼¤¬¤¢¤Ê¤¿¤Îͤ¹¤ë¤³¤ì¤é¤Î¸¢Íø¤òÈÝÄê - ¤¹¤ë¤³¤È¤ä¡¢¤³¤ì¤é¤Î¸¢Íø¤òÊü´þ¤¹¤ë¤è¤¦Í׵᤹¤ë¤³¤È¤ò¶Ø»ß¤¹¤ë¤È¤¤¤¦À©¸Â - ¤ò²Ã¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤è¤Ã¤Æ¡¢¤¢¤Ê¤¿¤¬¥½¥Õ¥È¥¦¥§¥¢¤ÎÊ£À½Êª¤òÈÒÉÛ¤·¤¿ - ¤ê¤½¤ì¤òÊѹ¹¤·¤¿¤ê¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤¦¤¤¤Ã¤¿À©¸Â¤Î¤¿¤á¤Ë¤¢¤Ê¤¿¤Ë¤¢¤ë¼ï¤Î - ÀÕǤ¤¬È¯À¸¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ - - Î㤨¤Ð¡¢¤¢¤Ê¤¿¤¬¥Õ¥ê¡¼¤Ê¥×¥í¥°¥é¥à¤ÎÊ£À½Êª¤òÈÒÉÛ¤¹¤ë¾ì¹ç¡¢ÍÎÁ¤«ÌµÎÁ¤Ë - ´Ø¤ï¤é¤º¡¢¤¢¤Ê¤¿¤Ï¼«Ê¬¤¬Í¤¹¤ë¸¢Íø¤òÁ´¤Æ¼õÎμԤËÍ¿¤¨¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ - ¤Þ¤¿¡¢¤¢¤Ê¤¿¤ÏÈà¤é¤â¥½¡¼¥¹¥³¡¼¥É¤ò¼õ¤±¼è¤ë¤«¼ê¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤¤ë¤è¤¦ - Êݾڤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤½¤·¤Æ¡¢¤¢¤Ê¤¿¤ÏÈà¤é¤ËÂФ·¤Æ°Ê²¼¤Ç½Ò¤Ù¤ë¾ò·ï - ¤ò¼¨¤·¡¢Èà¤é¤Ë¼«¤é¤Î»ý¤Ä¸¢Íø¤Ë¤Ä¤¤¤ÆÃΤ餷¤á¤ë¤è¤¦¤Ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤» - ¤ó¡£ - - »ä¤¿¤Á¤Ï¤¢¤Ê¤¿¤Î¸¢Íø¤òÆóÃʳ¬¤Î¼ê½ç¤òƧ¤ó¤ÇÊݸ¤Þ¤¹¡£(1) ¤Þ¤º¥½¥Õ¥È¥¦¥§ - ¥¢¤ËÂФ·¤ÆÃøºî¸¢¤ò¼çÄ¥¤·¡¢¤½¤·¤Æ (2) ¤¢¤Ê¤¿¤ËÂФ·¤Æ¡¢¥½¥Õ¥È¥¦¥§¥¢¤ÎÊ£ - À½¤äÈÒÉÛ¤Þ¤¿¤Ï²þÊѤˤĤ¤¤Æ¤ÎˡŪ¤Êµö²Ä¤òÍ¿¤¨¤ë¤³¤Î·ÀÌó½ñ¤òÄ󼨤·¤Þ¤¹¡£ - - ¤Þ¤¿¡¢³Æºî¼Ô¤ä»ä¤¿¤Á¤òÊݸ¤ë¤¿¤á¡¢»ä¤¿¤Á¤Ï¤³¤Î¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï - ²¿¤ÎÊݾڤâ̵¤¤¤È¤¤¤¦¤³¤È¤òï¤â¤¬³Î¼Â¤ËÍý²ò¤¹¤ë¤è¤¦¤Ë¤·¡¢¤Þ¤¿¥½¥Õ¥È¥¦¥§ - ¥¢¤¬Ã¯¤«Â¾¿Í¤Ë¤è¤Ã¤Æ²þÊѤµ¤ì¡¢¤½¤ì¤¬¼¡¡¹¤ÈÈÒÉÛ¤µ¤ì¤Æ¤¤¤Ã¤¿¤È¤·¤Æ¤â¡¢¤½ - ¤Î¼õÎμԤÏÈà¤é¤¬¼ê¤ËÆþ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤¬¥ª¥ê¥¸¥Ê¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï̵¤¤ - ¤³¤È¡¢¤½¤·¤Æ¸¶ºî¼Ô¤Î̾À¼¤Ï¾¿Í¤Ë¤è¤Ã¤Æ»ý¤Á¹þ¤Þ¤ì¤¿²ÄǽÀ¤Î¤¢¤ëÌäÂê¤Ë¤è¤Ã - ¤Æ±Æ¶Á¤µ¤ì¤ë¤³¤È¤¬¤Ê¤¤¤È¤¤¤¦¤³¤È¤ò¼þÃΤµ¤»¤¿¤¤¤È»×¤¤¤Þ¤¹¡£ - - ºÇ¸å¤Ë¡¢¥½¥Õ¥È¥¦¥§¥¢Æõö¤¬¤¤¤«¤Ê¤ë¥Õ¥ê¡¼¤Î¥×¥í¥°¥é¥à¤Î¸ºß¤Ë¤âÉÔÃǤζ¼ - °Ò¤òÅꤲ¤«¤±¤Æ¤¤¤Þ¤¹¤¬¡¢»ä¤¿¤Á¤Ï¡¢¥Õ¥ê¡¼¤Ê¥×¥í¥°¥é¥à¤ÎºÆÈÒÉÛ¼Ô¤¬¸Ä¡¹¤Ë - Æõö¥é¥¤¥»¥ó¥¹¤ò¼èÆÀ¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢»ö¼Â¾å¥×¥í¥°¥é¥à¤òÆÈÀêŪ¤Ë¤·¤Æ¤· - ¤Þ¤¦¤È¤¤¤¦´í¸±¤òÈò¤±¤¿¤¤¤È»×¤¤¤Þ¤¹¡£¤³¤¦¤¤¤Ã¤¿»öÂÖ¤òͽËɤ¹¤ë¤¿¤á¡¢»ä¤¿ - ¤Á¤Ï¤¤¤«¤Ê¤ëÆõö¤âï¤â¤¬¼«Í³¤ËÍøÍѤǤ¤ë¤è¤¦¥é¥¤¥»¥ó¥¹¤µ¤ì¤ë¤«¡¢Á´¤¯¥é - ¥¤¥»¥ó¥¹¤µ¤ì¤Ê¤¤¤«¤Î¤É¤Á¤é¤«¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤òÌÀ³Î¤Ë¤·¤Þ¤·¤¿¡£ - - (ÌõÃí: ËÜ·ÀÌó½ñ¤Ç¡ÖÆÈÀêŪ(proprietary)¡×¤È¤Ï¡¢¥½¥Õ¥È¥¦¥§¥¢¤ÎÍøÍѤäºÆÈÒ - ÉÛ¡¢²þÊѤ¬¶Ø»ß¤µ¤ì¤Æ¤¤¤ë¤«¡¢µö²Ä¤òÆÀ¤ë¤³¤È¤¬É¬ÍפȤµ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤ - ¤Ï¸·¤·¤¤À©¸Â¤¬²Ý¤»¤é¤ì¤Æ¤¤¤Æ¼«Í³¤Ë¤½¤¦¤¹¤ë¤³¤È¤¬»ö¼Â¾å¤Ç¤¤Ê¤¯¤Ê¤Ã¤Æ¤¤ - ¤ë¾õÂ֤Τ³¤È¤ò»Ø¤¹¡£¾Ü¤·¤¯¤Ïhttp://www.gnu.org/philosophy/categories.ja.html#ProprietarySoftware - ¤ò»²¾È¤»¤è¡£) - - Ê£À½¤äÈÒÉÛ¡¢²þÊѤˤĤ¤¤Æ¤ÎÀµ³Î¤Ê¾ò·ï¤ÈÀ©Ìó¤ò°Ê²¼¤Ç½Ò¤Ù¤Æ¤¤¤¤Þ¤¹¡£ - -Ê£À½¡¢ÈÒÉÛ¡¢²þÊѤ˴ؤ¹¤ë¾ò·ï¤ÈÀ©Ìó - - 0. ¤³¤ÎÍøÍѵöÂú·ÀÌó½ñ¤Ï¡¢¤½¤Î¥×¥í¥°¥é¥à(¤Þ¤¿¤Ï¤½¤Î¾¤ÎÃøºîʪ)¤ò¤³¤Î°ìÈ̸ø - ½°ÍøÍѵöÂú·ÀÌó½ñ¤ÎÄê¤á¤ë¾ò·ï¤Î²¼¤ÇÈÒÉۤǤ¤ë¡¢¤È¤¤¤¦¹ðÃΤ¬Ãøºî¸¢¼Ô¤Ë¤è¤Ã - ¤ÆµºÜ¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Þ¤¿¤Ï¤½¤Î¾¤ÎÃøºîʪÁ´È̤ËŬÍѤµ¤ì¤ë¡£°Ê²¼¤Ç¤Ï¡¢ - ¡Ö¡Ø¥×¥í¥°¥é¥à¡Ù¡×¤È¤Ï¤½¤Î¤è¤¦¤Ë¤·¤Æ¤³¤Î·ÀÌó½ñ¤¬Å¬ÍѤµ¤ì¤¿¥×¥í¥°¥é¥à¤ä - ÃøºîʪÁ´È̤ò°ÕÌ£¤·¡¢¤Þ¤¿¡Ö¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿Ãøºîʪ¡×¤È¤Ï¡Ø¥×¥í¥° - ¥é¥à¡Ù¤ä¤½¤Î¾Ãøºî¸¢Ë¡¤Î²¼¤ÇÇÉÀ¸Êª¤È¸«¤Ê¤µ¤ì¤ë¤â¤ÎÁ´È̤ò»Ø¤¹¡£¤¹¤Ê¤ï¤Á¡¢ - ¡Ø¥×¥í¥°¥é¥à¡Ù¤«¤½¤Î°ìÉô¤ò¡¢Á´¤¯Æ±°ì¤Î¤Þ¤Þ¤«¡¢²þÊѤò²Ã¤¨¤¿¤«¡¢¤¢¤ë¤¤¤Ï - ¾¤Î¸À¸ì¤ËËÝÌõ¤µ¤ì¤¿·Á¤Ç´Þ¤àÃøºîʪ¤Î¤³¤È¤Ç¤¢¤ë(¡Ö²þÊѡפȤ¤¤¦¸ì¤ÎËÜÍè - ¤Î°ÕÌ£¤«¤é¤Ï¤º¤ì¤ë¤¬¡¢°Ê²¼¤Ç¤ÏËÝÌõ¤â²þÊѤΰì¼ï¤È¸«¤Ê¤¹)¡£¤½¤ì¤¾¤ì¤Î·À - Ìó¼Ô¤Ï¡Ö¤¢¤Ê¤¿¡×¤Èɽ¸½¤µ¤ì¤ë¡£ - - Ê£À½¤äÈÒÉÛ¡¢²þÊѰʳ°¤Î³èÆ°¤Ï¤³¤Î·ÀÌó½ñ¤Ç¤Ï¥«¥Ð¡¼¤µ¤ì¤Ê¤¤¡£¤½¤ì¤é¤Ï¤³¤Î - ·ÀÌó½ñ¤ÎÂоݳ°¤Ç¤¢¤ë¡£¡Ø¥×¥í¥°¥é¥à¡Ù¤ò¼Â¹Ô¤¹¤ë¹Ô°Ù¼«ÂΤËÀ©¸Â¤Ï¤Ê¤¤¡£¤Þ - ¤¿¡¢¤½¤Î¤è¤¦¤Ê¡Ø¥×¥í¥°¥é¥à¡Ù¤Î½ÐÎÏ·ë²Ì¤Ï¡¢¤½¤ÎÆâÍƤ¬¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð - ¤Ë¤·¤¿Ãøºîʪ¤ò¹½À®¤¹¤ë¾ì¹ç¤Î¤ß¤³¤Î·ÀÌó½ñ¤Ë¤è¤Ã¤ÆÊݸ¤ì¤ë(¡Ø¥×¥í¥°¥é - ¥à¡Ù¤ò¼Â¹Ô¤·¤¿¤³¤È¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿¤È¤¤¤¦¤³¤È¤È¤Ï̵´Ø·¸¤Ç¤¢¤ë)¡£¤³¤Î - ¤è¤¦¤ÊÀþ°ú¤¤ÎÂÅÅöÀ¤Ï¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤¬²¿¤ò¤¹¤ë¤Î¤«¤Ë°Í¸¤¹¤ë¡£ - - 1. ¤½¤ì¤¾¤ì¤ÎÊ£À½Êª¤Ë¤ª¤¤¤ÆŬÀÚ¤ÊÃøºî¸¢É½¼¨¤ÈÊݾڤÎÈÝǧÀ¼ÌÀ(disclaimer of - warranty)¤òÌÜΩ¤Ä¤è¤¦Å¬Àڤ˷Ǻܤ·¡¢¤Þ¤¿¤³¤Î·ÀÌó½ñ¤ª¤è¤Ó°ìÀÚ¤ÎÊݾڤÎÉÔ - ºß¤Ë¿¨¤ì¤¿¹ðÃΤ¹¤Ù¤Æ¤ò¤½¤Î¤Þ¤Þ»Ä¤·¡¢¤½¤·¤Æ¤³¤Î·ÀÌó½ñ¤ÎÊ£À½Êª¤ò¡Ø¥×¥í¥° - ¥é¥à¡Ù¤Î¤¤¤«¤Ê¤ë¼õÎμԤˤâ¡Ø¥×¥í¥°¥é¥à¡Ù¤È¶¦¤ËÈÒÉÛ¤¹¤ë¸Â¤ê¡¢¤¢¤Ê¤¿¤Ï - ¡Ø¥×¥í¥°¥é¥à¡Ù¤Î¥½¡¼¥¹¥³¡¼¥É¤ÎÊ£À½Êª¤ò¡¢¤¢¤Ê¤¿¤¬¼õ¤±¼è¤Ã¤¿Ä̤ê¤Î·Á¤ÇÊ£ - À½¤Þ¤¿¤ÏÈÒÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£ÇÞÂΤÏÌä¤ï¤Ê¤¤¡£ - - ¤¢¤Ê¤¿¤Ï¡¢ÊªÍýŪ¤ËÊ£À½Êª¤ò¾ùÅϤ¹¤ë¤È¤¤¤¦¹Ô°Ù¤Ë´Ø¤·¤Æ¼ê¿ôÎÁ¤ò²Ý¤·¤Æ¤âÎÉ - ¤¤¤·¡¢´õ˾¤Ë¤è¤Ã¤Æ¤Ï¼ê¿ôÎÁ¤ò¼è¤Ã¤Æ¸ò´¹¤Ë¤ª¤±¤ëÊݸî¤ÎÊݾڤòÄ󶡤·¤Æ¤âÎÉ - ¤¤¡£ - - 2. ¤¢¤Ê¤¿¤Ï¼«Ê¬¤Î¡Ø¥×¥í¥°¥é¥à¡Ù¤ÎÊ£À½Êª¤«¤½¤Î°ìÉô¤ò²þÊѤ·¤Æ¡Ø¥×¥í¥°¥é¥à¡Ù - ¤ò´ð¤Ë¤·¤¿Ãøºîʪ¤ò·ÁÀ®¤·¡¢¤½¤Î¤è¤¦¤Ê²þÊÑÅÀ¤äÃøºîʪ¤ò¾åµÂè1Àá¤ÎÄê¤á¤ë - ¾ò·ï¤Î²¼¤ÇÊ£À½¤Þ¤¿¤ÏÈÒÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£¤¿¤À¤·¡¢¤½¤Î¤¿¤á¤Ë¤Ï°Ê²¼¤Î¾ò - ·ï¤¹¤Ù¤Æ¤òËþ¤¿¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤: - - * a) ¤¢¤Ê¤¿¤¬¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤¿¤È¤¤¤¦¤³¤È¤ÈÊѹ¹¤·¤¿Æü»þ¤¬Îɤ¯ - ʬ¤«¤ë¤è¤¦¡¢²þÊѤµ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¹ð¼¨¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£ - - * b) ¡Ø¥×¥í¥°¥é¥à¡Ù¤Þ¤¿¤Ï¤½¤Î°ìÉô¤ò´Þ¤àÃøºîʪ¡¢¤¢¤ë¤¤¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù - ¤«¤½¤Î°ìÉô¤«¤éÇÉÀ¸¤·¤¿Ãøºîʪ¤òÈÒÉÛ¤¢¤ë¤¤¤Ïȯɽ¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î - Á´ÂΤò¤³¤Î·ÀÌó½ñ¤Î¾ò·ï¤Ë½¾¤Ã¤ÆÂè»°¼Ô¤Ø̵½þ¤ÇÍøÍѵöÂú¤·¤Ê¤±¤ì - ¤Ð¤Ê¤é¤Ê¤¤¡£ - - * c) ²þÊѤµ¤ì¤¿¥×¥í¥°¥é¥à¤¬¡¢Ä̾ï¼Â¹Ô¤¹¤ëºÝ¤ËÂÐÏÃŪ¤Ë¥³¥Þ¥ó¥É¤òÆɤà¤è - ¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤Î¥×¥í¥°¥é¥à¤òºÇ¤â°ìÈÌŪ¤ÊÊýË¡¤ÇÂÐÏÃŪ¤Ë - ¼Â¹Ô¤¹¤ëºÝ¡¢Å¬ÀÚ¤ÊÃøºî¸¢É½¼¨¡¢ÌµÊݾڤǤ¢¤ë¤³¤È(¤¢¤ë¤¤¤Ï¤¢¤Ê¤¿¤¬ÊÝ - ¾Ú¤òÄ󶡤¹¤ë¤È¤¤¤¦¤³¤È)¡¢¥æ¡¼¥¶¤¬¥×¥í¥°¥é¥à¤ò¤³¤Î·ÀÌó½ñ¤Ç½Ò¤Ù¤¿¾ò - ·ï¤Î²¼¤ÇÈÒÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤È¤¤¤¦¤³¤È¡¢¤½¤·¤Æ¤³¤Î·ÀÌó½ñ¤ÎÊ£À½Êª - ¤ò±ÜÍ÷¤¹¤ë¤Ë¤Ï¤É¤¦¤·¤¿¤é¤è¤¤¤«¤È¤¤¤¦¥æ¡¼¥¶¤Ø¤ÎÀâÌÀ¤ò´Þ¤à¹ðÃΤ¬°õ - ºþ¤µ¤ì¤ë¤«¡¢¤¢¤ë¤¤¤Ï²èÌ̤Ëɽ¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤(Îã³° - ¤È¤·¤Æ¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤½¤Î¤â¤Î¤ÏÂÐÏÃŪ¤Ç¤¢¤Ã¤Æ¤âÄ̾綠¤Î¤è¤¦¤Ê¹ð - ÃΤò°õºþ¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿¤¢¤Ê¤¿¤ÎÃøºîʪ¤Ë - ¤½¤Î¤è¤¦¤Ê¹ðÃΤò°õºþ¤µ¤»¤ëɬÍפϤʤ¤)¡£ - °Ê¾å¤ÎɬÍ×¾ò·ï¤ÏÁ´ÂΤȤ·¤Æ¤Î²þÊѤµ¤ì¤¿Ãøºîʪ¤ËŬÍѤµ¤ì¤ë¡£Ãøºîʪ¤Î°ìÉô - ¤¬¡Ø¥×¥í¥°¥é¥à¡Ù¤«¤éÇÉÀ¸¤·¤¿¤â¤Î¤Ç¤Ï¤Ê¤¤¤È³Îǧ¤Ç¤¡¢¤½¤ì¤é¼«¿ÈÊ̤ÎÆÈΩ - ¤·¤¿Ãøºîʪ¤Ç¤¢¤ë¤È¹çÍýŪ¤Ë¹Í¤¨¤é¤ì¤ë¤Ê¤é¤Ð¡¢¤¢¤Ê¤¿¤¬¤½¤ì¤é¤òÊ̤ÎÃøºîʪ - ¤È¤·¤Æʬ¤±¤ÆÈÒÉÛ¤¹¤ë¾ì¹ç¡¢¤½¤¦¤¤¤Ã¤¿Éôʬ¤Ë¤Ï¤³¤Î·ÀÌó½ñ¤È¤½¤Î¾ò·ï¤ÏŬÍÑ - ¤µ¤ì¤Ê¤¤¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤¬Æ±¤¸Éôʬ¤ò¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿ÃøºîʪÁ´ÂÎ - ¤Î°ìÉô¤È¤·¤ÆÈÒÉÛ¤¹¤ë¤Ê¤é¤Ð¡¢Á´ÂΤȤ·¤Æ¤ÎÈÒÉÛʪ¤Ï¡¢¤³¤Î·ÀÌó½ñ¤¬²Ý¤¹¾ò·ï - ¤Ë½¾¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£¤È¤¤¤¦¤Î¤Ï¡¢¤³¤Î·ÀÌó½ñ¤¬Â¾¤Î·ÀÌó¼Ô¤ËÍ¿¤¨¤ëµö²Ä - ¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù´Ý¤´¤ÈÁ´ÂΤ˵ڤӡ¢Ã¯¤¬½ñ¤¤¤¿¤«¤Ï´Ø·¸¤Ê¤¯³ÆÉôʬ¤Î¤¹¤Ù¤Æ - ¤òÊݸ¤ë¤«¤é¤Ç¤¢¤ë¡£ - - ¤è¤Ã¤Æ¡¢¤¹¤Ù¤Æ¤¢¤Ê¤¿¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿Ãøºîʪ¤ËÂФ·¡¢¸¢Íø¤ò¼çÄ¥¤·¤¿¤ê¤¢¤Ê - ¤¿¤Î¸¢Íø¤Ë°ÛµÄ¤ò¿½¤·Î©¤Æ¤ë¤³¤È¤Ï¤³¤ÎÀá¤Î°Õ¿Þ¤¹¤ë¤È¤³¤í¤Ç¤Ï¤Ê¤¤¡£¤à¤·¤í¡¢ - ¤½¤Î¼ñ»Ý¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿ÇÉÀ¸Êª¤Ê¤¤¤·½¸¹çÃøºîʪ¤ÎÈÒÉÛ¤ò´ÉÍý¤¹ - ¤ë¸¢Íø¤ò¹Ô»È¤¹¤ë¤È¤¤¤¦¤³¤È¤Ë¤¢¤ë¡£ - - ¤Þ¤¿¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤Æ¤¤¤Ê¤¤¤½¤Î¾¤ÎÃøºîʪ¤ò¡Ø¥×¥í¥°¥é¥à¡Ù(¤¢ - ¤ë¤¤¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿Ãøºîʪ)¤È°ì½ï¤Ë½¸¤á¤¿¤À¤±¤Î¤â¤Î¤ò°ì´¬¤Î - ÊÝ´ÉÁõÃ֤ʤ¤¤·ÈÒÉÛÇÞÂΤ˼ý¤á¤Æ¤â¡¢¤½¤Î¾¤ÎÃøºîʪ¤Þ¤Ç¤³¤Î·ÀÌó½ñ¤¬Êݸ - ¤ëÂоݤˤʤë¤È¤¤¤¦¤³¤È¤Ë¤Ï¤Ê¤é¤Ê¤¤¡£ - - 3. ¤¢¤Ê¤¿¤Ï¾åµÂè1Àᤪ¤è¤Ó2Àá¤Î¾ò·ï¤Ë½¾¤¤¡¢¡Ø¥×¥í¥°¥é¥à¡Ù(¤¢¤ë¤¤¤ÏÂè2Àá¤Ë - ¤ª¤±¤ëÇÉÀ¸Êª)¤ò¥ª¥Ö¥¸¥§¥¯¥È¥³¡¼¥É¤Ê¤¤¤·¼Â¹Ô·Á¼°¤ÇÊ£À½¤Þ¤¿¤ÏÈÒÉÛ¤¹¤ë¤³ - ¤È¤¬¤Ç¤¤ë¡£¤¿¤À¤·¡¢¤½¤Î¾ì¹ç¤¢¤Ê¤¿¤Ï°Ê²¼¤Î¤¦¤Á¤É¤ì¤«°ì¤Ä¤ò¼Â»Ü¤·¤Ê¤±¤ì - ¤Ð¤Ê¤é¤Ê¤¤: - * a) Ãøºîʪ¤Ë¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤ËÂбþ¤·¤¿´°Á´¤«¤Äµ¡³£¤ÇÆɤ߼è¤ê²Äǽ¤Ê¥½¡¼ - ¥¹¥³¡¼¥É¤òźÉÕ¤¹¤ë¡£¤¿¤À¤·¡¢¥½¡¼¥¹¥³¡¼¥É¤Ï¾åµÂè1Àᤪ¤è¤Ó2Àá¤Î¾ò - ·ï¤Ë½¾¤¤¥½¥Õ¥È¥¦¥§¥¢¤Î¸ò´¹¤Ç½¬´·Åª¤Ë»È¤ï¤ì¤ëÇÞÂΤÇÈÒÉÛ¤·¤Ê¤±¤ì¤Ð - ¤Ê¤é¤Ê¤¤¡£¤¢¤ë¤¤¤Ï¡¢ - - * b) Ãøºîʪ¤Ë¡¢¤¤¤«¤Ê¤ëÂè»°¼Ô¤ËÂФ·¤Æ¤â¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤ËÂбþ¤·¤¿´°Á´ - ¤«¤Äµ¡³£¤ÇÆɤ߼è¤ê²Äǽ¤Ê¥½¡¼¥¹¥³¡¼¥É¤ò¡¢ÈÒÉÛ¤ËÍפ¹¤ëʪÍýŪ¥³¥¹¥È - ¤ò¾å²ó¤é¤Ê¤¤ÄøÅ٤μê¿ôÎÁ¤È°ú¤´¹¤¨¤ËÄ󶡤¹¤ë»Ý½Ò¤Ù¤¿¾¯¤Ê¤¯¤È¤â3ǯ - ´Ö¤Ï͸ú¤Ê½ñÌ̤ˤʤä¿¿½¤·½Ð¤òź¤¨¤ë¡£¤¿¤À¤·¡¢¥½¡¼¥¹¥³¡¼¥É¤Ï¾åµ - Âè1Àᤪ¤è¤Ó2Àá¤Î¾ò·ï¤Ë½¾¤¤¥½¥Õ¥È¥¦¥§¥¢¤Î¸ò´¹¤Ç½¬´·Åª¤Ë»È¤ï¤ì¤ëÇÞ - ÂΤÇÈÒÉÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£¤¢¤ë¤¤¤Ï¡¢ - - * c) Âбþ¤¹¤ë¥½¡¼¥¹¥³¡¼¥ÉÈÒÉۤ､·½Ð¤ËºÝ¤·¤Æ¡¢¤¢¤Ê¤¿¤¬ÆÀ¤¿¾ðÊó¤ò°ì½ï - ¤Ë°ú¤ÅϤ¹(¤³¤ÎÁªÂò»è¤Ï¡¢±ÄÍø¤òÌÜŪ¤È¤·¤Ê¤¤ÈÒÉۤǤ¢¤Ã¤Æ¡¢¤«¤Ä¤¢¤Ê - ¤¿¤¬¾åµ¾®Àáb¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¿½¤·½Ð¤È¶¦¤Ë¥ª¥Ö¥¸¥§¥¯¥È¥³¡¼¥É - ¤¢¤ë¤¤¤Ï¼Â¹Ô·Á¼°¤Î¥×¥í¥°¥é¥à¤·¤«Æþ¼ê¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¸Â¤êµö²Ä¤µ¤ì ¤ë)¡£ - Ãøºîʪ¤Î¥½¡¼¥¹¥³¡¼¥É¤È¤Ï¡¢¤½¤ì¤ËÂФ·¤Æ²þÊѤò²Ã¤¨¤ë¾å¤Ç¹¥¤Þ¤·¤¤¤È¤µ¤ì¤ë - Ãøºîʪ¤Î·Á¼°¤ò°ÕÌ£¤¹¤ë¡£¤¢¤ë¼Â¹Ô·Á¼°¤ÎÃøºîʪ¤Ë¤È¤Ã¤Æ´°Á´¤Ê¥½¡¼¥¹¥³¡¼¥É - ¤È¤Ï¡¢¤½¤ì¤¬´Þ¤à¥â¥¸¥å¡¼¥ë¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¥³¡¼¥ÉÁ´Éô¤Ë²Ã¤¨¡¢´ØÏ¢¤¹¤ë¥¤¥ó - ¥¿¡¼¥Õ¥§¡¼¥¹ÄêµÁ¥Õ¥¡¥¤¥ë¤Î¤¹¤Ù¤Æ¤È¥é¥¤¥Ö¥é¥ê¤Î¥³¥ó¥Ñ¥¤¥ë¤ä¥¤¥ó¥¹¥È¡¼¥ë - ¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò¤â²Ã¤¨¤¿¤â¤Î¤ò°ÕÌ£¤¹¤ë¡£¤·¤«¤·ÆÃÊÌ - ¤ÊÎã³°¤È¤·¤Æ¡¢¤½¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¼«ÂΤ¬¼Â¹Ô·Á¼°¤ËÉտ魯¤ë¤Î¤Ç¤Ï̵¤¤¸Â¤ê¡¢ - ÈÒÉÛ¤µ¤ì¤ë¤â¤Î¤ÎÃæ¤Ë¡¢¼Â¹Ô·Á¼°¤¬¼Â¹Ô¤µ¤ì¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¼ç - Íפʥ³¥ó¥Ý¡¼¥Í¥ó¥È(¥³¥ó¥Ñ¥¤¥é¤ä¥«¡¼¥Í¥ëÅù)¤ÈÄ̾ï°ì½ï¤Ë(¥½¡¼¥¹¤«¥Ð¥¤¥Ê - ¥ê·Á¼°¤Î¤É¤Á¤é¤«¤Ç)ÈÒÉÛ¤µ¤ì¤ë¤â¤Î¤ò´Þ¤ó¤Ç¤¤¤ëɬÍפϤʤ¤¤È¤¹¤ë¡£ - - ¼Â¹Ô·Á¼°¤Þ¤¿¤Ï¥ª¥Ö¥¸¥§¥¯¥È¥³¡¼¥É¤ÎÈÒÉÛ¤¬¡¢»ØÄꤵ¤ì¤¿¾ì½ê¤«¤é¥³¥Ô¡¼¤¹¤ë - ¤¿¤á¤Î¥¢¥¯¥»¥¹¼êÃʤòÄ󶡤¹¤ë¤³¤È¤Ç°Ù¤µ¤ì¤ë¤È¤·¤Æ¡¢¤½¤Î¾å¤Ç¥½¡¼¥¹¥³¡¼¥É - ¤âƱÅù¤Î¥¢¥¯¥»¥¹¼êÃʤˤè¤Ã¤ÆƱ¤¸¾ì½ê¤«¤é¥³¥Ô¡¼¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Ê - ¤é¤Ð¡¢Âè»°¼Ô¤¬¥ª¥Ö¥¸¥§¥¯¥È¥³¡¼¥É¤È°ì½ï¤Ë¥½¡¼¥¹¤â¶¯À©Åª¤Ë¥³¥Ô¡¼¤µ¤»¤é¤ì - ¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¯¤Æ¤â¥½¡¼¥¹¥³¡¼¥ÉÈÒÉۤξò·ï¤òËþ¤¿¤·¤Æ¤¤¤ë¤â¤Î¤È¤¹¤ë¡£ - - 4. ¤¢¤Ê¤¿¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤ò¡¢¤³¤Î·ÀÌó½ñ¤Ë¤ª¤¤¤ÆÌÀ³Î¤ËÄ󼨤µ¤ì¤¿¹Ô°Ù¤ò½ü¤ - Ê£À½¤ä²þÊÑ¡¢¥µ¥Ö¥é¥¤¥»¥ó¥¹¡¢¤¢¤ë¤¤¤ÏÈÒÉÛ¤·¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£Â¾¤Ë¡Ø¥×¥í¥°¥é - ¥à¡Ù¤òÊ£À½¤ä²þÊÑ¡¢¥µ¥Ö¥é¥¤¥»¥ó¥¹¡¢¤¢¤ë¤¤¤ÏÈÒÉÛ¤¹¤ë´ë¤Æ¤Ï¤¹¤Ù¤Æ̵¸ú¤Ç¤¢ - ¤ê¡¢¤³¤Î·ÀÌó½ñ¤Î²¼¤Ç¤Î¤¢¤Ê¤¿¤Î¸¢Íø¤ò¼«Æ°Åª¤Ë½ª·ë¤µ¤»¤ë¤³¤È¤Ë¤Ê¤í¤¦¡£¤· - ¤«¤·¡¢Ê£À½Êª¤ä¸¢Íø¤ò¤³¤Î·ÀÌó½ñ¤Ë½¾¤Ã¤Æ¤¢¤Ê¤¿¤«¤éÆÀ¤¿¿Í¡¹¤Ë´Ø¤·¤Æ¤Ï¡¢¤½ - ¤Î¤è¤¦¤Ê¿Í¡¹¤¬¤³¤Î·ÀÌó½ñ¤Ë´°Á´¤Ë½¾¤Ã¤Æ¤¤¤ë¸Â¤êÈà¤é¤Î¥é¥¤¥»¥ó¥¹¤Þ¤Ç½ª·ë - ¤¹¤ë¤³¤È¤Ï¤Ê¤¤¡£ - - 5. ¤¢¤Ê¤¿¤Ï¤³¤Î·ÀÌó½ñ¤ò¼õÂú¤¹¤ëɬÍפÏ̵¤¤¡£¤È¤¤¤¦¤Î¤Ï¡¢¤¢¤Ê¤¿¤Ï¤³¤ì¤Ë½ð̾ - ¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£¤·¤«¤·¡¢¤³¤Î·ÀÌó½ñ°Ê³°¤Ë¤¢¤Ê¤¿¤ËÂФ·¤Æ¡Ø¥×¥í¥°¥é - ¥à¡Ù¤ä¤½¤ÎÇÉÀ¸Êª¤ò²þÊѤޤ¿¤ÏÈÒÉÛ¤¹¤ëµö²Ä¤òÍ¿¤¨¤ë¤â¤Î¤Ï¸ºß¤·¤Ê¤¤¡£¤³¤ì - ¤é¤Î¹Ô°Ù¤Ï¡¢¤¢¤Ê¤¿¤¬¤³¤Î·ÀÌó½ñ¤ò¼õ¤±Æþ¤ì¤Ê¤¤¸Â¤êË¡¤Ë¤è¤Ã¤Æ¶Ø¤¸¤é¤ì¤Æ¤¤ - ¤ë¡£¤½¤³¤Ç¡¢¡Ø¥×¥í¥°¥é¥à¡Ù(¤¢¤ë¤¤¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿ÃøºîʪÁ´ÈÌ) - ¤ò²þÊѤʤ¤¤·ÈÒÉÛ¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢¤¢¤Ê¤¿¤Ï¼«Ê¬¤¬¤½¤Î¤è¤¦¤Ê¹Ô°Ù¤ò¹Ô¤¦¤¿¤á - ¤Ë¤³¤Î·ÀÌó½ñ¤ò¼õÂú¤·¤¿¤È¤¤¤¦¤³¤È¡¢¤½¤·¤Æ¡Ø¥×¥í¥°¥é¥à¡Ù¤È¤½¤ì¤Ë´ð¤Å¤¯Ãø - ºîʪ¤ÎÊ£À½¤äÈÒÉÛ¡¢²þÊѤˤĤ¤¤Æ¤³¤Î·ÀÌó½ñ¤¬²Ý¤¹À©Ìó¤È¾ò·ï¤ò¤¹¤Ù¤Æ¼õ¤±Æþ - ¤ì¤¿¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤¿¤â¤Î¤È¸«¤Ê¤¹¡£ - - 6. ¤¢¤Ê¤¿¤¬¡Ø¥×¥í¥°¥é¥à¡Ù(¤Þ¤¿¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤ò´ð¤Ë¤·¤¿ÃøºîʪÁ´ÈÌ)¤òºÆÈÒ - ÉÛ¤¹¤ë¤¿¤Ó¤Ë¡¢¤½¤Î¼õÎμԤϸµ¡¹¤Î¥é¥¤¥»¥ó¥¹µö²Ä¼Ô¤«¤é¡¢¤³¤Î·ÀÌó½ñ¤Ç»ØÄê - ¤µ¤ì¤¿¾ò·ï¤ÈÀ©Ìó¤Î²¼¤Ç¡Ø¥×¥í¥°¥é¥à¡Ù¤òÊ£À½¤äÈÒÉÛ¡¢¤¢¤ë¤¤¤Ï²þÊѤ¹¤ëµö²Ä - ¤ò¼«Æ°Åª¤ËÆÀ¤ë¤â¤Î¤È¤¹¤ë¡£¤¢¤Ê¤¿¤Ï¡¢¼õÎμԤ¬¤³¤³¤Çǧ¤á¤é¤ì¤¿¸¢Íø¤ò¹Ô»È - ¤¹¤ë¤³¤È¤Ë´Ø¤·¤Æ¤³¤ì°Ê¾å¾¤Î¤¤¤«¤Ê¤ëÀ©¸Â¤â²Ý¤·¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¤¢¤Ê¤¿¤Ë¤Ï¡¢ - Âè»°¼Ô¤¬¤³¤Î·ÀÌó½ñ¤Ë½¾¤¦¤³¤È¤ò¶¯À©¤¹¤ëÀÕǤ¤Ï¤Ê¤¤¡£ - - 7. Æõö¿¯³²¤¢¤ë¤¤¤Ï¤½¤Î¾¤ÎÍýͳ(Æõö´Ø·¸¤Ë¸Â¤é¤Ê¤¤)¤«¤é¡¢ºÛȽ½ê¤ÎȽ·è¤¢¤ë - ¤¤¤Ï¿½¤·Î©¤Æ¤Î·ë²Ì¤È¤·¤Æ¤¢¤Ê¤¿¤Ë(ºÛȽ½êÌ¿Îá¤ä·ÀÌó¤Ê¤É¤Ë¤è¤ê)¤³¤Î¥é¥¤¥» - ¥ó¥¹¤Î¾ò·ï¤ÈÌ·½â¤¹¤ëÀ©Ì󤬲ݤµ¤ì¤¿¾ì¹ç¤Ç¤â¡¢¤¢¤Ê¤¿¤¬¤³¤Î·ÀÌó½ñ¤Î¾ò - ·ï¤òÌȽü¤µ¤ì¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¡£¤â¤·¤³¤Î·ÀÌó½ñ¤Î²¼¤Ç¤¢¤Ê¤¿¤Ë²Ý¤»¤é¤ì¤¿ - ÀÕǤ¤È¾¤Î´ØÏ¢¤¹¤ëÀÕǤ¤òƱ»þ¤ËËþ¤¿¤¹¤è¤¦¤Ê·Á¤ÇÈÒÉۤǤ¤Ê¤¤¤Ê¤é¤Ð¡¢·ë²Ì - ¤È¤·¤Æ¤¢¤Ê¤¿¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤òÈÒÉÛ¤¹¤ë¤³¤È¤¬Á´¤¯¤Ç¤¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ç¤¢ - ¤ë¡£Î㤨¤ÐÆõö¥é¥¤¥»¥ó¥¹¤¬¡¢¤¢¤Ê¤¿¤«¤éľÀÜ´ÖÀܤòÌä¤ï¤º¥³¥Ô¡¼¤ò¼õ¤±¼è¤Ã - ¤¿¿Í¤¬Ã¯¤Ç¤â¡Ø¥×¥í¥°¥é¥à¡Ù¤ò»ÈÍÑÎÁ̵ÎÁ¤ÇºÆÈÒÉÛ¤¹¤ë¤³¤È¤òǧ¤á¤Æ¤¤¤Ê¤¤¾ì - ¹ç¡¢¤¢¤Ê¤¿¤¬¤½¤ÎÀ©Ìó¤È¤³¤Î·ÀÌó½ñ¤òξÊý¤È¤âËþ¤¿¤¹¤Ë¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù - ¤ÎÈÒÉÛ¤ò´°Á´¤ËÃæ»ß¤¹¤ë¤·¤«¤Ê¤¤¤À¤í¤¦¡£ - - ¤³¤ÎÀá¤Î°ìÉôʬ¤¬ÆÃÄê¤Î¾õ¶·¤Î²¼¤Ç̵¸ú¤Ê¤¤¤·¼Â»ÜÉÔ²Äǽ¤Ê¾ì¹ç¤Ç¤â¡¢Àá¤Î»Ä - ¤ê¤ÎÉôʬ¤ÏŬÍѤµ¤ì¤ë¤è¤¦°Õ¿Þ¤µ¤ì¤Æ¤¤¤ë¡£¤½¤Î¾¤Î¾õ¶·¤Ç¤ÏÀ᤬Á´ÂΤȤ·¤Æ - ŬÍѤµ¤ì¤ë¤è¤¦°Õ¿Þ¤µ¤ì¤Æ¤¤¤ë¡£ - - Æõö¤ä¤½¤Î¾¤Îºâ»º¸¢¤ò¿¯³²¤·¤¿¤ê¡¢¤½¤Î¤è¤¦¤Ê¸¢Íø¤Î¼çÄ¥¤Î¸úÎϤ˰۵Ĥò¾§ - ¤¨¤¿¤ê¤¹¤ë¤è¤¦¤¢¤Ê¤¿¤òͶÏǤ¹¤ë¤³¤È¤¬¤³¤ÎÀá¤ÎÌÜŪ¤Ç¤Ï¤Ê¤¤¡£¤³¤ÎÀá¤Ë¤Ï¡¢ - ¿Í¡¹¤Ë¤è¤Ã¤Æ¥é¥¤¥»¥ó¥¹´·¹Ô¤È¤·¤Æ¼Â¸½¤µ¤ì¤Æ¤¤¿¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ÈÒÉÛ - ¤Î¥·¥¹¥Æ¥à¤Î´°Á´À¤ò¸î¤ë¤È¤¤¤¦ÌÜŪ¤·¤«¤Ê¤¤¡£Â¿¤¯¤Î¿Í¡¹¤¬¡¢¥Õ¥ê¡¼¥½¥Õ¥È - ¥¦¥§¥¢¤ÎÈÒÉÛ¥·¥¹¥Æ¥à¤¬¼óÈø°ì´Ó¤·¤ÆŬÍѤµ¤ì¤Æ¤¤¤ë¤È¤¤¤¦¿®Íê¤Ë´ð¤Å¤¡¢¤³ - ¤Î¥·¥¹¥Æ¥à¤òÄ̤¸¤ÆÈÒÉÛ¤µ¤ì¤ë¿Íͤʥ½¥Õ¥È¥¦¥§¥¢¤Ë´²Âç¤Ê¹×¸¥¤ò¤·¤Æ¤¤¿¤Î - ¤Ï»ö¼Â¤Ç¤¢¤ë¤¬¡¢¿Í¤¬¤É¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤òÄ̤¸¤Æ¥½¥Õ¥È¥¦¥§¥¢¤òÈÒÉÛ¤·¤¿¤¤ - ¤È»×¤¦¤«¤Ï¤¢¤¯¤Þ¤Ç¤âºî¼Ô/´óÍ¿¼Ô¼¡Âè¤Ç¤¢¤ê¡¢¤¢¤Ê¤¿¤¬ÁªÂò¤ò²¡¤·¤Ä¤±¤ë¤³ - ¤È¤Ï¤Ç¤¤Ê¤¤¡£ - - ¤³¤ÎÀá¤Ï¡¢¤³¤Î·ÀÌó½ñ¤Î¤³¤ÎÀá°Ê³°¤ÎÉôʬ¤Î°ìµ¢·ë¤Ë¤Ê¤ë¤È¹Í¤¨¤é¤ì¤ë¥±¡¼ - ¥¹¤òÅ°ÄìŪ¤ËÌÀ¤é¤«¤Ë¤¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤Æ¤¤¤ë¡£ - - 8. ¡Ø¥×¥í¥°¥é¥à¡Ù¤ÎÈÒÉÛ¤äÍøÍѤ¬¡¢¤¢¤ë¹ñ¤Ë¤ª¤¤¤Æ¤ÏÆõö¤Þ¤¿¤ÏÃøºî¸¢¤¬¼çÄ¥¤µ - ¤ì¤¿¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î¤¤¤º¤ì¤«¤Ë¤è¤Ã¤ÆÀ©¸Â¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¡Ø¥×¥í¥°¥é¥à¡Ù - ¤Ë¤³¤Î·ÀÌó½ñ¤òŬÍѤ·¤¿¸µ¤ÎÃøºî¸¢¼Ô¤Ï¡¢¤½¤¦¤¤¤Ã¤¿¹ñ¡¹¤òÇÓ½ü¤·¤¿ÌÀ³Î - ¤ÊÃÏÍýŪÈÒÉÛÀ©¸Â¤ò²Ã¤¨¡¢¤½¤³¤ÇÇÓ½ü¤µ¤ì¤Æ¤¤¤Ê¤¤¹ñ¤ÎÃæ¤ä¤½¤ì¤é¤Î¹ñ¡¹¤Î´Ö - ¤Ç¤Î¤ßÈÒÉÛ¤¬µö²Ä¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤â¹½¤ï¤Ê¤¤¡£¤½¤Î¾ì¹ç¡¢¤½¤Î¤è¤¦¤ÊÀ©¸Â¤Ï - ¤³¤Î·ÀÌó½ñËÜʸ¤Ç½ñ¤«¤ì¤Æ¤¤¤ë¤Î¤ÈƱÍͤ˸«¤Ê¤µ¤ì¤ë¡£ - - 9. ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤϡ¢»þ¤Ë¤è¤Ã¤Æ²þÄû¤Þ¤¿¤Ï¿·ÈǤΰìÈ̸ø½°ÍøÍѵöÂú½ñ - ¤òȯɽ¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£¤½¤Î¤è¤¦¤Ê¿·ÈǤϸ½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤½¤ÎÀº¿À¤Ë¤ª - ¤¤¤Æ¤Ï»÷¤¿¤â¤Î¤Ë¤Ê¤ë¤À¤í¤¦¤¬¡¢¿·¤¿¤ÊÌäÂê¤ä·üÇ°¤ò²ò·è¤¹¤ë¤¿¤áºÙÉô¤Ç¤Ï°Û - ¤Ê¤ë²ÄǽÀ¤¬¤¢¤ë¡£ - - ¤½¤ì¤¾¤ì¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¡¢¸«Ê¬¤±¤¬ÉÕ¤¯¤è¤¦¤Ë¥Ð¡¼¥¸¥ç¥óÈֹ椬¿¶¤é¤ì¤Æ¤¤ - ¤ë¡£¡Ø¥×¥í¥°¥é¥à¡Ù¤Ë¤ª¤¤¤Æ¤½¤ì¤ËŬÍѤµ¤ì¤ë¤³¤Î·ÀÌó½ñ¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椬 - »ØÄꤵ¤ì¤Æ¤¤¤Æ¡¢¹¹¤Ë¡Ö¤½¤ì°Ê¹ß¤Î¤¤¤«¤Ê¤ë¥Ð¡¼¥¸¥ç¥ó(any later version)¡× - ¤âŬÍѤ·¤ÆÎɤ¤¤È¤Ê¤Ã¤Æ¤¤¤¿¾ì¹ç¡¢¤¢¤Ê¤¿¤Ï½¾¤¦¾ò·ï¤ÈÀ©Ìó¤È¤·¤Æ¡¢»ØÄê¤Î¥Ð¡¼ - ¥¸¥ç¥ó¤«¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤˤè¤Ã¤Æȯ¹Ô¤µ¤ì¤¿»ØÄê¤Î¥Ð¡¼¥¸¥ç¥ó°Ê¹ß - ¤ÎÈǤΤɤ줫°ì¤Ä¤Î¤É¤Á¤é¤«¤òÁª¤Ö¤³¤È¤¬½ÐÍè¤ë¡£¡Ø¥×¥í¥°¥é¥à¡Ù¤Ç¥é¥¤¥»¥ó - ¥¹¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤Ê¤é¤Ð¡¢¤¢¤Ê¤¿¤Ïº£¤Þ¤Ç¤Ë¥Õ¥ê¡¼¥½¥Õ - ¥È¥¦¥§¥¢ºâÃĤ«¤éȯ¹Ô¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎÃ椫¤é¹¥¤¤ËÁª¤ó¤Ç¹½¤ï¤Ê¤¤¡£ - - 10. ¤â¤·¤¢¤Ê¤¿¤¬¡Ø¥×¥í¥°¥é¥à¡Ù¤Î°ìÉô¤ò¡¢¤½¤ÎÈÒÉÛ¾ò·ï¤¬¤³¤Î·ÀÌó½ñ¤È°Û¤Ê¤ë¾ - ¤Î¥Õ¥ê¡¼¤Ê¥×¥í¥°¥é¥à¤ÈÅý¹ç¤·¤¿¤¤¤Ê¤é¤Ð¡¢ºî¼Ô¤ËÏ¢Íí¤·¤Æµö²Ä¤òµá¤á¤è¡£¥Õ - ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬Ãøºî¸¢¤òÊÝͤ¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥Õ¥ê¡¼¥½ - ¥Õ¥È¥¦¥§¥¢ºâÃĤËÏ¢Íí¤»¤è¡£»ä¤¿¤Á¤Ï¡¢¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Î¤¿¤á¤ËÆÃÊ̤ÊÎã³°¤ò - Àߤ±¤ë¤³¤È¤â¤¢¤ë¡£»ä¤¿¤Á¤¬·èÄê¤ò²¼¤¹¤Ë¤¢¤¿¤Ã¤Æ¤Ï¡¢»ä¤¿¤Á¤Î¥Õ¥ê¡¼¥½¥Õ¥È - ¥¦¥§¥¢¤ÎÇÉÀ¸Êª¤¹¤Ù¤Æ¤¬¥Õ¥ê¡¼¤Ê¾õÂÖ¤ËÊݤ¿¤ì¤ë¤È¤¤¤¦¤³¤È¤È¡¢°ìÈÌŪ¤Ë¥½¥Õ - ¥È¥¦¥§¥¢¤Î¶¦Í¤ÈºÆÍøÍѤòÂ¥¿Ê¤¹¤ë¤È¤¤¤¦Æó¤Ä¤ÎÌÜɸ¤òµ¬½à¤Ë¸¡Æ¤¤µ¤ì¤ë¤Ç¤¢ - ¤í¤¦¡£ - - ̵ÊݾڤˤĤ¤¤Æ - - 11. ¡Ø¥×¥í¥°¥é¥à¡Ù¤ÏÂå²Á̵¤·¤ËÍøÍѤ¬µö²Ä¤µ¤ì¤ë¤Î¤Ç¡¢Å¬ÀÚ¤ÊË¡¤¬Ç§¤á¤ë¸Â¤ê¤Ë - ¤ª¤¤¤Æ¡¢¡Ø¥×¥í¥°¥é¥à¡Ù¤Ë´Ø¤¹¤ë¤¤¤«¤Ê¤ëÊݾڤ⸺ߤ·¤Ê¤¤¡£½ñÌ̤ÇÊ̤˽Ҥ٠- ¤ë¾ì¹ç¤ò½ü¤¤¤Æ¡¢Ãøºî¸¢¼Ô¡¢¤Þ¤¿¤Ï¤½¤Î¾¤ÎÃÄÂΤϡ¢¡Ø¥×¥í¥°¥é¥à¡Ù¤ò¡¢É½ÌÀ - ¤µ¤ì¤¿¤«¸À³°¤Ë¤«¤ÏÌä¤ï¤º¡¢¾¦¶ÈŪŬÀ¤òÊݾڤ¹¤ë¤Û¤Î¤á¤«¤·¤ä¤¢¤ëÆÃÄê¤ÎÌÜ - Ū¤Ø¤ÎŬ¹çÀ(¤Ë¸Â¤é¤ì¤Ê¤¤)¤ò´Þ¤à°ìÀÚ¤ÎÊݾÚ̵¤·¤Ë¡Ö¤¢¤ë¤¬¤Þ¤Þ¡×¤ÇÄ󶡤¹ - ¤ë¡£¡Ø¥×¥í¥°¥é¥à¡Ù¤Î¼Á¤ÈÀǽ¤Ë´Ø¤¹¤ë¥ê¥¹¥¯¤Î¤¹¤Ù¤Æ¤Ï¤¢¤Ê¤¿¤Ëµ¢Â°¤¹¤ë¡£ - ¡Ø¥×¥í¥°¥é¥à¡Ù¤Ë·ç´Ù¤¬¤¢¤ë¤ÈȽÌÀ¤·¤¿¾ì¹ç¡¢¤¢¤Ê¤¿¤ÏɬÍפÊÊݼéÅÀ¸¡¤äÊ佤¡¢ - ½¤Àµ¤ËÍפ¹¤ë¥³¥¹¥È¤Î¤¹¤Ù¤Æ¤ò°ú¤¼õ¤±¤ë¤³¤È¤Ë¤Ê¤ë¡£ - - 12. ŬÀÚ¤ÊË¡¤«½ñÌ̤ǤÎƱ°Õ¤Ë¤è¤Ã¤ÆÌ¿¤¼¤é¤ì¤Ê¤¤¸Â¤ê¡¢Ãøºî¸¢¼Ô¡¢¤Þ¤¿¤Ï¾åµ¤Ç - µö²Ä¤µ¤ì¤Æ¤¤¤ëÄ̤ê¤Ë¡Ø¥×¥í¥°¥é¥à¡Ù¤ò²þÊѤޤ¿¤ÏºÆÈÒÉÛ¤·¤¿¤½¤Î¾¤ÎÃÄÂΤϡ¢ - ¤¢¤Ê¤¿¤ËÂФ·¤Æ¡Ø¥×¥í¥°¥é¥à¡Ù¤ÎÍøÍѤʤ¤¤·ÍøÍÑÉÔǽ¤ÇÀ¸¤¸¤¿Ä̾ﻳ²¤äÆÃÊÌ - »³²¡¢¶öȯ»³²¡¢´ÖÀÜ»³²(¥Ç¡¼¥¿¤Î¾Ã¼º¤äÉÔÀµ³Î¤Ê½èÍý¡¢¤¢¤Ê¤¿¤«Âè»°¼Ô¤¬ - Èï¤Ã¤¿Â»¼º¡¢¤¢¤ë¤¤¤Ï¡Ø¥×¥í¥°¥é¥à¡Ù¤¬Â¾¤Î¥½¥Õ¥È¥¦¥§¥¢¤È°ì½ï¤ËÆ°ºî¤·¤Ê¤¤ - ¤È¤¤¤¦ÉÔ¶ñ¹ç¤Ê¤É¤ò´Þ¤à¤¬¤½¤ì¤é¤Ë¸Â¤é¤Ê¤¤)¤Ë°ìÀÚ¤ÎÀÕǤ¤òÉé¤ï¤Ê¤¤¡£¤½¤Î - ¤è¤¦¤Ê»³²¤¬À¸¤º¤ë²ÄǽÀ¤Ë¤Ä¤¤¤ÆÈà¤é¤¬Ãé¹ð¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤âƱÍͤǤ¢¤ë¡£ - -¾ò·ï¤ÈÀ©Ì󽪤ï¤ê - -°Ê¾å¤Î¾ò¹à¤ò¤¢¤Ê¤¿¤Î¿·¤·¤¤¥×¥í¥°¥é¥à¤ËŬÍѤ¹¤ëÊýË¡ - - ¤¢¤Ê¤¿¤¬¿·¤·¤¤¥×¥í¥°¥é¥à¤ò³«È¯¤·¤¿¤È¤·¤Æ¡¢¸ø½°¤Ë¤è¤Ã¤Æ¤½¤ì¤¬ÍøÍѤµ¤ì¤ë - ²ÄǽÀ¤òºÇÂç¤Ë¤·¤¿¤¤¤Ê¤é¡¢¤½¤Î¥×¥í¥°¥é¥à¤ò¤³¤Î·ÀÌó½ñ¤Î¾ò¹à¤Ë½¾¤Ã¤Æ - ï¤Ç¤âºÆÈÒÉÛ¤¢¤ë¤¤¤ÏÊѹ¹¤Ç¤¤ë¤è¤¦¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ë¤¹¤ë¤Î¤¬ºÇÁ±¤Ç¤¹¡£ - - ¤½¤Î¤¿¤á¤Ë¤Ï¡¢¥×¥í¥°¥é¥à¤Ë°Ê²¼¤Î¤è¤¦¤Êɽ¼¨¤òźÉÕ¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¾ì¹ç¡¢ - Êݾڤ¬ÇÓ½ü¤µ¤ì¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤òºÇ¤â¸ú²ÌŪ¤ËÅÁ¤¨¤ë¤¿¤á¤Ë¡¢¤½¤ì¤¾¤ì¤Î¥½¡¼ - ¥¹¥Õ¥¡¥¤¥ë¤ÎËÁƬ¤Ëɽ¼¨¤òźÉÕ¤¹¤ì¤ÐºÇ¤â°ÂÁ´¤Ç¤¹¡£¾¯¤Ê¤¯¤È¤â¡¢¡ÖÃøºî¸¢É½ - ¼¨¡×¤È¤¤¤¦¹Ô¤ÈÁ´Ê¸¤¬¤¢¤ë¾ì½ê¤Ø¤Î¥Ý¥¤¥ó¥¿¤À¤±¤Ï³Æ¥Õ¥¡¥¤¥ë¤Ë´Þ¤á¤ÆÃÖ¤¤¤Æ - ¤¯¤À¤µ¤¤¡£ - - one line to give the program's name and an idea of what it does. - Copyright (C) yyyy name of author - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - (Ìõ: - - ¥×¥í¥°¥é¥à¤Î̾Á°¤È¡¢¤½¤ì¤¬²¿¤ò¤¹¤ë¤«¤Ë¤Ä¤¤¤Æ¤Î´Êñ¤ÊÀâÌÀ¡£ - Copyright (C) À¾Îñǯ ºî¼Ô¤Î̾Á° - - ¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤ì¤ò¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§ - ¥¢ºâÃĤˤè¤Ã¤Æȯ¹Ô¤µ¤ì¤¿ GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ(¥Ð¡¼¥¸¥ç¥ó2¤«¡¢´õ - ˾¤Ë¤è¤Ã¤Æ¤Ï¤½¤ì°Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¤¦¤Á¤É¤ì¤«)¤ÎÄê¤á¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ - ¤Þ¤¿¤Ï²þÊѤ¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - - ¤³¤Î¥×¥í¥°¥é¥à¤ÏÍÍѤǤ¢¤ë¤³¤È¤ò´ê¤Ã¤ÆÈÒÉÛ¤µ¤ì¤Þ¤¹¤¬¡¢*Á´¤¯¤Î̵ÊݾÚ* - ¤Ç¤¹¡£¾¦¶È²ÄǽÀ¤ÎÊݾڤäÆÃÄê¤ÎÌÜŪ¤Ø¤ÎŬ¹çÀ¤Ï¡¢¸À³°¤Ë¼¨¤µ¤ì¤¿¤â¤Î¤â´Þ - ¤áÁ´¤¯Â¸ºß¤·¤Þ¤»¤ó¡£¾Ü¤·¤¯¤ÏGNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ - - ¤¢¤Ê¤¿¤Ï¤³¤Î¥×¥í¥°¥é¥à¤È¶¦¤Ë¡¢GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤ÎÊ£À½Êª¤ò°ìÉô - ¼õ¤±¼è¤Ã¤¿¤Ï¤º¤Ç¤¹¡£¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃÄ¤Þ - ¤ÇÀÁµá¤·¤Æ¤¯¤À¤µ¤¤(°¸Àè¤Ï the Free Software Foundation, Inc., 59 - Temple Place, Suite 330, Boston, MA 02111-1307 USA)¡£ - - ) - - ÅŻҤʤ¤¤·»æ¤Î¥á¡¼¥ë¤Ç¤¢¤Ê¤¿¤ËÌ䤤¹ç¤ï¤»¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤â½ñ¤²Ã¤¨ - ¤Þ¤·¤ç¤¦¡£ +COPYING-ja.txt for Tux Paint + +Tux Paint - 子供向けのシンプルなお絵かきプログラム + +Copyright (c) 2005 by Bill Kendrick and others +bill@newbreedsoftware.com +http://www.newbreedsoftware.com/tuxpaint/ + + +注: この文書に加えて、Tux Paint に同梱されている TrueType フォントに +ついても、関連する著作権情報を確認してください。 + +参照: ../fonts/locale/LL_docs/, （"LL" はフォントファイル名と対応） + +Bill Kendrick, 2005.October.10 +$Id$ + +---------------------------------------- + + GNU 一般公衆利用許諾契約書 + バージョン2、1991年6月 + 日本語訳、2002年5月20日 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + この利用許諾契約書を、一字一句そのままに複製し頒布することは許可する。 + しかし変更は認めない。 + + This is an unofficial translation of the GNU General Public License + into Japanese. It was not published by the Free Software Foundation, + and does not legally state the distribution terms for software that + uses the GNU GPL--only the original English text of the GNU GPL does + that. However, we hope that this translation will help Japanese + speakers understand the GNU GPL better. + + (訳: 以下はGNU General Public Licenseの非公式な日本語訳です。これはフ + リーソフトウェア財団(the Free Software Foundataion)によって発表された + ものではなく、GNU GPLを適用したソフトウェアの頒布条件を法的に有効な形 + で述べたものではありません。頒布条件としてはGNU GPLの英語版テキストで + 指定されているもののみが有効です。しかしながら、私たちはこの翻訳が、 + 日本語を使用する人々にとってGNU GPLをより良く理解する助けとなることを + 望んでいます。) + + 翻訳は 八田真行が行った。原文は + http://www.gnu.org/licenses/gpl.txtである。誤訳の指摘や改善案を歓迎す + る。 + はじめに + +ソフトウェア向けライセンスの大半は、あなたがそのソフトウェアを共有した +り変更したりする自由を奪うように設計されています。対照的に、GNU 一般公 +衆利用許諾契約書は、あなたがフリーソフトウェアを共有したり変更したりす +る自由を保証する--すなわち、ソフトウェアがそのユーザすべてにとってフリー +であることを保証することを目的としています。この一般公衆利用許諾契約書 +はフリーソフトウェア財団のソフトウェアのほとんどに適用されており、また +GNU GPLを適用すると決めたフリーソフトウェア財団以外の作者によるプログ +ラムにも適用されています(いくつかのフリーソフトウェア財団のソフトウェ +アには、GNU GPLではなくGNU ライブラリ一般公衆利用許諾契約書が適用され +ていることもあります)。あなたもまた、ご自分のプログラムにGNU GPLを適用 +することが可能です。 + +私たちがフリーソフトウェアと言うとき、それは利用の自由について言及して +いるのであって、価格は問題にしていません。私たちの一般公衆利用許諾契約 +書は、あなたがフリーソフトウェアの複製物を頒布する自由を保証するよう設 +計されています(希望に応じてその種のサービスに手数料を課す自由も保証さ +れます)。また、あなたがソースコードを受け取るか、あるいは望めばそれを +入手することが可能であるということ、あなたがソフトウェアを変更し、その +一部を新たなフリーのプログラムで利用できるということ、そして、以上で述 +べたようなことができるということがあなたに知らされるということも保証さ +れます。 + +あなたの権利を守るため、私たちは誰かがあなたの有するこれらの権利を否定 +することや、これらの権利を放棄するよう要求することを禁止するという制限 +を加える必要があります。よって、あなたがソフトウェアの複製物を頒布した +りそれを変更したりする場合には、これらの制限のためにあなたにある種の責 +任が発生することになります。 + +例えば、あなたがフリーなプログラムの複製物を頒布する場合、有料か無料に +関わらず、あなたは自分が有する権利を全て受領者に与えなければなりません。 +また、あなたは彼らもソースコードを受け取るか手に入れることができるよう +保証しなければなりません。そして、あなたは彼らに対して以下で述べる条件 +を示し、彼らに自らの持つ権利について知らしめるようにしなければなりませ +ん。 + +私たちはあなたの権利を二段階の手順を踏んで保護します。(1) まずソフトウェ +アに対して著作権を主張し、そして (2) あなたに対して、ソフトウェアの複 +製や頒布または改変についての法的な許可を与えるこの契約書を提示します。 + +また、各作者や私たちを保護するため、私たちはこのフリーソフトウェアには +何の保証も無いということを誰もが確実に理解するようにし、またソフトウェ +アが誰か他人によって改変され、それが次々と頒布されていったとしても、そ +の受領者は彼らが手に入れたソフトウェアがオリジナルのバージョンでは無い +こと、そして原作者の名声は他人によって持ち込まれた可能性のある問題によっ +て影響されることがないということを周知させたいと思います。 + +最後に、ソフトウェア特許がいかなるフリーのプログラムの存在にも不断の脅 +威を投げかけていますが、私たちは、フリーなプログラムの再頒布者が個々に +特許ライセンスを取得することによって、事実上プログラムを独占的にしてし +まうという危険を避けたいと思います。こういった事態を予防するため、私た +ちはいかなる特許も誰もが自由に利用できるようライセンスされるか、全くラ +イセンスされないかのどちらかでなければならないことを明確にしました。 + +(訳注: 本契約書で「独占的(proprietary)」とは、ソフトウェアの利用や再頒 +布、改変が禁止されているか、許可を得ることが必要とされているか、あるい +は厳しい制限が課せられていて自由にそうすることが事実上できなくなってい +る状態のことを指す。詳しくは +http://www.gnu.org/philosophy/categories.ja.html#ProprietarySoftwareを +参照せよ。) + +複製や頒布、改変についての正確な条件と制約を以下で述べていきます。 + + GNU 一般公衆利用許諾契約書 + 複製、頒布、改変に関する条件と制約 + +0. この利用許諾契約書は、そのプログラム(またはその他の著作物)をこの一 +般公衆利用許諾契約書の定める条件の下で頒布できるという告知が著作権者に +よって記載されたプログラムまたはその他の著作物全般に適用される。以下で +は、「『プログラム』」とはそのようにしてこの契約書が適用されたプログラ +ムや著作物全般を意味し、また「『プログラム』を基にした著作物」とは『プ +ログラム』やその他著作権法の下で派生物と見なされるもの全般を指す。すな +わち、『プログラム』かその一部を、全く同一のままか、改変を加えたか、あ +るいは他の言語に翻訳された形で含む著作物のことである(「改変」という語 +の本来の意味からはずれるが、以下では翻訳も改変の一種と見なす)。それぞ +れの契約者は「あなた」と表現される。 + +複製や頒布、改変以外の活動はこの契約書ではカバーされない。それらはこの +契約書の対象外である。『プログラム』を実行する行為自体に制限はない。ま +た、そのような『プログラム』の出力結果は、その内容が『プログラム』を基 +にした著作物を構成する場合のみこの契約書によって保護される(『プログラ +ム』を実行したことによって作成されたということとは無関係である)。この +ような線引きの妥当性は、『プログラム』が何をするのかに依存する。 + +1. それぞれの複製物において適切な著作権表示と保証の否認声明(disclaimer +of warranty)を目立つよう適切に掲載し、またこの契約書および一切の保証の +不在に触れた告知すべてをそのまま残し、そしてこの契約書の複製物を『プロ +グラム』のいかなる受領者にも『プログラム』と共に頒布する限り、あなたは +『プログラム』のソースコードの複製物を、あなたが受け取った通りの形で複 +製または頒布することができる。媒体は問わない。 + +あなたは、物理的に複製物を譲渡するという行為に関して手数料を課しても良 +いし、希望によっては手数料を取って交換における保護の保証を提供しても良 +い。 + +2. あなたは自分の『プログラム』の複製物かその一部を改変して『プログラ +ム』を基にした著作物を形成し、そのような改変点や著作物を上記第1節の定 +める条件の下で複製または頒布することができる。ただし、そのためには以下 +の条件すべてを満たしていなければならない: + + a) あなたがそれらのファイルを変更したということと変更した日時が良 + く分かるよう、改変されたファイルに告示しなければならない。 + + b) 『プログラム』またはその一部を含む著作物、あるいは『プログラム』 + かその一部から派生した著作物を頒布あるいは発表する場合には、その全 + 体をこの契約書の条件に従って第三者へ無償で利用許諾しなければならな + い。 + + c) 改変されたプログラムが、通常実行する際に対話的にコマンドを読む + ようになっているならば、そのプログラムを最も一般的な方法で対話的に + 実行する際、適切な著作権表示、無保証であること(あるいはあなたが保 + 証を提供するということ)、ユーザがプログラムをこの契約書で述べた条 + 件の下で頒布することができるということ、そしてこの契約書の複製物を + 閲覧するにはどうしたらよいかというユーザへの説明を含む告知が印刷さ + れるか、あるいは画面に表示されるようにしなければならない(例外とし + て、『プログラム』そのものは対話的であっても通常そのような告知を印 + 刷しない場合には、『プログラム』を基にしたあなたの著作物にそのよう + な告知を印刷させる必要はない)。 + +以上の必要条件は全体としての改変された著作物に適用される。著作物の一部 +が『プログラム』から派生したものではないと確認でき、それら自身別の独立 +した著作物であると合理的に考えられるならば、あなたがそれらを別の著作物 +として分けて頒布する場合、そういった部分にはこの契約書とその条件は +適用されない。しかし、あなたが同じ部分を『プログラム』を基にした著作物 +全体の一部として頒布するならば、全体としての頒布物は、この契約書が +課す条件に従わなければならない。というのは、この契約書が他の契約者 +に与える許可は『プログラム』丸ごと全体に及び、誰が書いたかは関係なく各 +部分のすべてを保護するからである。 + +よって、すべてあなたによって書かれた著作物に対し、権利を主張したりあな +たの権利に異議を申し立てることはこの節の意図するところではない。むしろ、 +その趣旨は『プログラム』を基にした派生物ないし集合著作物の頒布を管理す +る権利を行使するということにある。 + +また、『プログラム』を基にしていないその他の著作物を『プログラム』(あ +るいは『プログラム』を基にした著作物)と一緒に集めただけのものを一巻の +保管装置ないし頒布媒体に収めても、その他の著作物までこの契約書が保 +護する対象になるということにはならない。 + +3. あなたは上記第1節および2節の条件に従い、『プログラム』(あるいは第2 +節における派生物)をオブジェクトコードないし実行形式で複製または頒布す +ることができる。ただし、その場合あなたは以下のうちどれか一つを実施しな +ければならない: + + a) 著作物に、『プログラム』に対応した完全かつ機械で読み取り可能な + ソースコードを添付する。ただし、ソースコードは上記第1節および2節の + 条件に従いソフトウェアの交換で習慣的に使われる媒体で頒布しなければ + ならない。あるいは、 + + b) 著作物に、いかなる第三者に対しても、『プログラム』に対応した完 + 全かつ機械で読み取り可能なソースコードを、頒布に要する物理的コスト + を上回らない程度の手数料と引き換えに提供する旨述べた少なくとも3年 + 間は有効な書面になった申し出を添える。ただし、ソースコードは上記第 + 1節および2節の条件に従いソフトウェアの交換で習慣的に使われる媒体で + 頒布しなければならない。あるいは、 + + c) 対応するソースコード頒布の申し出に際して、あなたが得た情報を一 + 緒に引き渡す(この選択肢は、営利を目的としない頒布であって、かつあ + なたが上記小節bで指定されているような申し出と共にオブジェクトコー + ドあるいは実行形式のプログラムしか入手していない場合に限り許可され + る)。 + +著作物のソースコードとは、それに対して改変を加える上で好ましいとされる +著作物の形式を意味する。ある実行形式の著作物にとって完全なソースコード +とは、それが含むモジュールすべてのソースコード全部に加え、関連するイン +ターフェース定義ファイルのすべてとライブラリのコンパイルやインストール +を制御するために使われるスクリプトをも加えたものを意味する。しかし特別 +な例外として、そのコンポーネント自体が実行形式に付随するのでは無い限り、 +頒布されるものの中に、実行形式が実行されるオペレーティングシステムの主 +要なコンポーネント(コンパイラやカーネル等)と通常一緒に(ソースかバイナ +リ形式のどちらかで)頒布されるものを含んでいる必要はないとする。 + +実行形式またはオブジェクトコードの頒布が、指定された場所からコピーする +ためのアクセス手段を提供することで為されるとして、その上でソースコード +も同等のアクセス手段によって同じ場所からコピーできるようになっているな +らば、第三者がオブジェクトコードと一緒にソースも強制的にコピーさせられ +るようになっていなくてもソースコード頒布の条件を満たしているものとする。 + +4. あなたは『プログラム』を、この契約書において明確に提示された行 +為を除き複製や改変、サブライセンス、あるいは頒布してはならない。他に +『プログラム』を複製や改変、サブライセンス、あるいは頒布する企てはすべ +て無効であり、この契約書の下でのあなたの権利を自動的に終結させるこ +とになろう。しかし、複製物や権利をこの契約書に従ってあなたから得た +人々に関しては、そのような人々がこの契約書に完全に従っている限り彼 +らのライセンスまで終結することはない。 + +5. あなたはこの契約書を受諾する必要は無い。というのは、あなたはこ +れに署名していないからである。しかし、この契約書以外にあなたに対し +て『プログラム』やその派生物を変更、頒布する許可を与えるものは存在しな +い。これらの行為は、あなたがこの契約書を受け入れない限り法によって +禁じられている。そこで、『プログラム』(あるいは『プログラム』を基にし +た著作物のすべて)を改変ないし頒布することにより、あなたは自分がそのよ +うな行為を行うためにこの契約書を受諾したということ、そして『プログ +ラム』とそれに基づく著作物の複製や頒布、改変についてこの契約書が課 +す制約と条件をすべて受け入れたということを示したものと見なす。 + +6. あなたが『プログラム』(または『プログラム』を基にした著作物全般)を +再頒布するたびに、その受領者は元々のライセンス許可者から、この契約書で +指定された条件と制約の下で『プログラム』を複製や頒布、あるいは改変する +許可を自動的に得るものとする。あなたは、受領者がここで認められた権利を +行使することに関してこれ以上他のいかなる制限も課すことができない。あな +たには、第三者がこの契約書に従うことを強制する責任はない。 + +7. 特許侵害あるいはその他の理由(特許関係に限らない)から、裁判所の判決 +あるいは申し立ての結果としてあなたに(裁判所命令や契約などにより)この契 +約書の条件と矛盾する制約が課された場合でも、あなたがこの契約書の条件を +免除されるわけではない。もしこの契約書の下であなたに課せられた責任と他 +の関連する責任を同時に満たすような形で頒布できないならば、結果としてあ +なたは『プログラム』を頒布することが全くできないということである。例え +ば特許ライセンスが、あなたから直接間接を問わずコピーを受け取った人が誰 +でも『プログラム』を使用料無料で再頒布することを認めていない場合、あな +たがその制約とこの契約書を両方とも満たすには『プログラム』の頒布を完全 +に中止するしかないだろう。 + +この節の一部分が特定の状況の下で無効ないし実施不可能な場合でも、節の残 +りの部分は適用されるよう意図されている。その他の状況では節が全体として +適用されるよう意図されている。 + +特許やその他の財産権を侵害したり、そのような権利の主張の効力に異議を唱 +えたりするようあなたを誘惑することがこの節の目的ではない。この節には、 +人々によってライセンス慣行として実現されてきた、フリーソフトウェア頒布 +のシステムの完全性を護るという目的しかない。多くの人々が、フリーソフト +ウェアの頒布システムが首尾一貫して適用されているという信頼に基づき、こ +のシステムを通じて頒布される多様なソフトウェアに寛大な貢献をしてきたの +は事実であるが、人がどのようなシステムを通じてソフトウェアを頒布したい +と思うかはあくまでも作者/寄与者次第であり、あなたが選択を押しつけるこ +とはできない。 + +この節は、この契約書のこの節以外の部分の一帰結になると考えられるケー +スを徹底的に明らかにすることを目的としている。 + +8. 『プログラム』の頒布や利用が、ある国においては特許または著作権が主 +張されたインターフェースのいずれかによって制限されている場合、『プログ +ラム』にこの契約書を適用した元の著作権者は、そういった国々を排除し +た明確な地理的頒布制限を加え、そこで排除されていない国の中やそれらの国々 +の間でのみ頒布が許可されるようにしても構わない。その場合、そのような制 +限はこの契約書本文で書かれているのと同様に見なされる。 + +9. フリーソフトウェア財団は、時によって改訂または新版の一般公衆利用許 +諾書を発表することができる。そのような新版は現在のバージョンとその精神 +においては似たものになるだろうが、新たな問題や懸念を解決するため細部で +は異なる可能性がある。 + +それぞれのバージョンには、見分けが付くようにバージョン番号が振られてい +る。『プログラム』においてそれに適用されるこの契約書のバージョン番号が +指定されていて、更に「それ以降のいかなるバージョン」も適用して良いとなっ +ていた場合、あなたは従う条件と制約として、指定のバージョンか、フリーソ +フトウェア財団によって発行された指定のバージョン以降の版のどれか一つの +どちらかを選ぶことが出来る。『プログラム』でライセンスのバージョン番号 +が指定されていないならば、あなたは今までにフリーソフトウェア財団から発 +行されたバージョンの中から好きに選んで構わない。 + +10. もしあなたが『プログラム』の一部を、その頒布条件がこの契約書と +異なる他のフリーなプログラムと統合したいならば、作者に連絡して許可を求 +めよ。フリーソフトウェア財団が著作権を保有するソフトウェアについては、 +フリーソフトウェア財団に連絡せよ。私たちは、このような場合のために特別 +な例外を設けることもある。私たちが決定を下すにあたっては、私たちのフリー +ソフトウェアの派生物すべてがフリーな状態に保たれるということと、一般的 +にソフトウェアの共有と再利用を促進するという二つの目標を規準に検討され +るであろう。 + 無保証について + +11. 『プログラム』は代価無しに利用が許可されるので、適切な法が認める限 +りにおいて、『プログラム』に関するいかなる保証も存在しない。書面で別に +述べる場合を除いて、著作権者、またはその他の団体は、『プログラム』を、 +表明されたか言外にかは問わず、商業的適性を保証するほのめかしやある特定 +の目的への適合性(に限られない)を含む一切の保証無しに「あるがまま」で提 +供する。『プログラム』の質と性能に関するリスクのすべてはあなたに帰属す +る。『プログラム』に欠陥があると判明した場合、あなたは必要な保守点検や +補修、修正に要するコストのすべてを引き受けることになる。 + +12. 適切な法か書面での同意によって命ぜられない限り、著作権者、または上 +記で許可されている通りに『プログラム』を改変または再頒布したその他の団 +体は、あなたに対して『プログラム』の利用ないし利用不能で生じた一般的、 +特別的、偶然的、必然的な損害(データの消失や不正確な処理、あなたか第三 +者が被った損失、あるいは『プログラム』が他のソフトウェアと一緒に動作し +ないという不具合などを含むがそれらに限らない)に一切の責任を負わない。 +そのような損害が生ずる可能性について彼らが忠告されていたとしても同様で +ある。 + + 条件と制約終わり + + 以上の条項をあなたの新しいプログラムに適用する方法 + +あなたが新しいプログラムを開発したとして、公衆によってそれが利用される +可能性を最大にしたいなら、そのプログラムをこの契約書の条項に従って +誰でも再頒布あるいは変更できるようフリーソフトウェアにするのが最善です。 + +そのためには、プログラムに以下のような表示を添付してください。その場合、 +保証が排除されているということを最も効果的に伝えるために、それぞれのソー +スファイルの冒頭に表示を添付すれば最も安全です。少なくとも、「著作権表 +示」という行と全文がある場所へのポインタだけは各ファイルに含めて置いて +ください。 + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + (訳: + + <プログラムの名前と、それが何をするかについての簡単な説明。> + Copyright (C) <西暦年> <作者の名前> + + このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフ + トウェア財団によって発行された GNU 一般公衆利用許諾契約書(バージョ + ン2か、希望によってはそれ以降のバージョンのうちどれか)の定める条件 + の下で再頒布または改変することができます。 + + このプログラムは有用であることを願って頒布されますが、*全くの無保 + 証* です。商業可能性の保証や特定の目的への適合性は、言外に示された + ものも含め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご + 覧ください。 + + あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を + 一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェ + ア財団まで請求してください(宛先は the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA)。 + + ) + +電子ないし紙のメールであなたに問い合わせる方法についての情報も書き加え +ましょう。 + +プログラムが対話的なものならば、対話モードで起動した際に出力として以下 +のような短い告知が表示されるようにしてください: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + (訳: + + Gnomovision バージョン 69, Copyright (C) 年 作者の名前 + Gnomovision は*全くの無保証*で提供されます。詳しくは「show w」 + とタイプして下さい。これはフリーソフトウェアであり、ある条件の下で + 再頒布することが奨励されています。詳しくは「show c」とタイプして下 + さい。 + + ) + +ここで、仮想的なコマンド「show w」と「show c」は一般公衆利用許諾契約書 +の適切な部分を表示するようになっていなければなりません。もちろん、あな +たが使うコマンドを「show w」や「show c」と呼ぶ必然性はありませんので、 +あなたのプログラムに合わせてマウスのクリックやメニューのアイテムにして +も結構です。 + +またあなたは、必要ならば(プログラマーとして働いていたら)あなたの雇用主、 +あるいは場合によっては学校から、そのプログラムに関する「著作権放棄声明 +(copyright disclaimer)」に署名してもらうべきです。以下は例ですので、名 +前を変えてください: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice - ¥×¥í¥°¥é¥à¤¬ÂÐÏÃŪ¤Ê¤â¤Î¤Ê¤é¤Ð¡¢ÂÐÏå⡼¥É¤Çµ¯Æ°¤·¤¿ºÝ¤Ë½ÐÎϤȤ·¤Æ°Ê²¼ - ¤Î¤è¤¦¤Êû¤¤¹ðÃΤ¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤: + (訳: + + Yoyodyne社はここに、James Hackerによって書かれたプログラム + 「Gnomovision」(コンパイラへ通すプログラム)に関する一切の著作権の利 + 益を放棄します。 - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details - type `show w'. This is free software, and you are welcome - to redistribute it under certain conditions; type `show c' - for details. + 、1989年4月1日 + Ty Coon、副社長 - (Ìõ: + ) - Gnomovision ¥Ð¡¼¥¸¥ç¥ó 69, Copyright (C) À¾Îñǯ ºî¼Ô¤Î̾Á° - Gnomovision ¤Ï*Á´¤¯¤Î̵ÊݾÚ*¤ÇÄ󶡤µ¤ì¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¡Öshow w¡×¤È¥¿¥¤¥×¤· - ¤Æ²¼¤µ¤¤¡£ - ¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¢¤ê¡¢¤¢¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ¤¹¤ë¤³¤È¤¬¾©Î夵¤ì¤Æ - ¤¤¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¡Öshow c¡×¤È¥¿¥¤¥×¤·¤Æ²¼¤µ¤¤¡£ - - ) - - ¤³¤³¤Ç¡¢²¾ÁÛŪ¤Ê¥³¥Þ¥ó¥É¡Öshow w¡×¤È¡Öshow c¡× - ¤Ï°ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤ÎŬÀÚ¤ÊÉôʬ¤òɽ¼¨¤¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Ê - ¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤â¤Á¤í¤ó¡¢¤¢¤Ê¤¿¤¬»È¤¦¥³¥Þ¥ó¥É¤ò¡Öshow w¡× ¤ä¡Öshow - c¡×¤È¸Æ¤ÖɬÁ³À¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢¤¢¤Ê¤¿¤Î - ¥×¥í¥°¥é¥à¤Ë¹ç¤ï¤»¤Æ¥Þ¥¦¥¹¤Î¥¯¥ê¥Ã¥¯¤ä¥á¥Ë¥å¡¼¤Î¥¢¥¤¥Æ¥à¤Ë¤·¤Æ¤â·ë¹½¤Ç - ¤¹¡£ - - ¤Þ¤¿¡¢¤¢¤Ê¤¿¤Ï¡¢É¬Íפʤé¤Ð(¥×¥í¥°¥é¥Þ¡¼¤È¤·¤ÆƯ¤¤¤Æ¤¤¤¿¤é)¤¢¤Ê¤¿¤Î¸ÛÍÑ - ¼ç¡¢¤¢¤ë¤¤¤Ï¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï³Ø¹»¤«¤é¡¢¤½¤Î¥×¥í¥°¥é¥à¤Ë´Ø¤¹¤ë¡ÖÃøºî¸¢Êü´þ - À¼ÌÀ(copyright disclaimer)¡×¤Ë½ð̾¤·¤Æ¤â¤é¤¦¤Ù¤¤Ç¤¹¡£°Ê²¼¤ÏÎã¤Ç¤¹¤Î¤Ç¡¢ - ̾Á°¤òÊѤ¨¤Æ¤¯¤À¤µ¤¤: - - Yoyodyne, Inc., hereby disclaims all copyright - interest in the program `Gnomovision' - (which makes passes at compilers) written - by James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - (Ìõ: - - Yoyodyne¼Ò¤Ï¤³¤³¤Ë¡¢James Hacker¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¥×¥í¥°¥é¥à¡ÖGnomovision¡× - (¥³¥ó¥Ñ¥¤¥é¤ØÄ̤¹¥×¥í¥°¥é¥à)¤Ë´Ø¤¹¤ë°ìÀÚ¤ÎÃøºî¸¢¤ÎÍø±×¤òÊü´þ¤·¤Þ¤¹¡£ - - Ty Coon»á¤Î½ð̾¡¢1989ǯ4·î1Æü - Ty Coon¡¢Éû¼ÒĹ - - - ) - - ¤³¤Î°ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤Ç¤Ï¡¢¤¢¤Ê¤¿¤Î¥×¥í¥°¥é¥à¤òÆÈÀêŪ¤Ê¥×¥í¥°¥é¥à - ¤ËÅý¹ç¤¹¤ë¤³¤È¤òǧ¤á¤Æ¤¤¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Î¥×¥í¥°¥é¥à¤¬¥µ¥Ö¥ë¡¼¥Á¥ó¥é¥¤¥Ö - ¥é¥ê¤Ê¤é¤Ð¡¢ÆÈÀêŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤¢¤Ê¤¿¤Î¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤¹¤ë¤³ - ¤È¤òµö²Ä¤·¤¿¤Û¤¦¤¬¤è¤êÊØÍø¤Ç¤¢¤ë¤È¹Í¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤â¤·¤³¤ì¤¬¤¢¤Ê - ¤¿¤Î˾¤à¤³¤È¤Ê¤é¤Ð¡¢¤³¤Î·ÀÌó½ñ¤ÎÂå¤ï¤ê¤ËGNU ¥é¥¤¥Ö¥é¥ê°ìÈ̸ø½°ÍøÍѵöÂú - ·ÀÌó½ñ¤òŬÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ - - ---------------------------------------------------------------------- - - GNU¤Î¥Û¡¼¥à¤Ú¡¼¥¸¤ØÌá¤ë¡£ - - FSF ¤ª¤è¤Ó GNU ¤Ø¤Î¤´¼ÁÌä¡¢¤ªÌ䤤¹ç¤ï¤»¤Ïgnu@gnu.org¤Þ¤Ç¤É¤¦¤¾¡£FSF ¤ÈÏ¢ - Íí¤ò¼è¤ë¤Ë¤Ï ¾¤Î¼êÃʤ⤢¤ê¤Þ ¤¹¡£ - - ¤³¤ì¤é¤Î¥¦¥§¥Ö¥Ú¡¼¥¸¤Ë¤Ä¤¤¤Æ¤Î¤´°Õ¸«¤Ïwebmasters@gnu.org¤Þ - ¤Ç¡¢¤½¤Î¤Û¤«¤Î¤´¼ÁÌä¤Ïgnu@gnu.org¤Þ¤Ç¤ªÁ÷¤ê¤¯¤À¤µ¤¤¡£ - - Ãøºî¸¢É½¼¨¤Ï¾å¤ËµºÜ¡£ - Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111, USA - - ËÝÌõ¤Ï ȬÅÄ¿¿¹Ô ¤¬¹Ô¤¤¤Þ¤·¤¿¡£ - - Based on: 1.4 - - Updated: Last modified: Wed Aug 28 11:00:50 JST 2002 - - ---------------------------------------------------------------------- +この一般公衆利用許諾契約書では、あなたのプログラムを独占的なプログラム +に統合することを認めていません。あなたのプログラムがサブルーチンライブ +ラリならば、独占的なアプリケーションとあなたのライブラリをリンクするこ +とを許可したほうがより便利であると考えるかもしれません。もしこれがあな +たの望むことならば、この契約書の代わりにGNU ライブラリ一般公衆利用許諾 +契約書を適用してください。 From 4b909ffee90414c0e35fef964caccbc4e989ed97 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Wed, 21 Oct 2020 23:28:49 +0900 Subject: [PATCH 14/41] Updated for new setup translations and missing definition for localized COPYING --- win32/tuxpaint.iss | 141 +++++++++++++++++++++++++++++++++------------ 1 file changed, 103 insertions(+), 38 deletions(-) diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index 6988952dd..affda3790 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -77,78 +77,83 @@ OutputDir=.\ OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer #endif SetupIconFile={#BdistDir}\data\images\tuxpaint-installer.ico -Compression=lzma +WizardStyle=modern +Compression=lzma2 SolidCompression=yes PrivilegesRequired=admin [Languages] -Name: "arm"; MessagesFile: "compiler:Languages\Armenian.isl" -Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" -Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl" -Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" -Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl" -Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl" -Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl" -Name: "eng"; MessagesFile: "compiler:Default.isl" -Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl" -Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl" -Name: "fre"; MessagesFile: "compiler:Languages\French.isl" -Name: "ger"; MessagesFile: "compiler:Languages\German.isl" -Name: "gla"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" -Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl" -Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl" -Name: "hun"; MessagesFile: "compiler:Languages\Hungarian.isl" -Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl" -Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl" -Name: "nep"; MessagesFile: "compiler:Languages\Nepali.islu" -Name: "nor"; MessagesFile: "compiler:Languages\Norwegian.isl" -Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl" -Name: "por"; MessagesFile: "compiler:Languages\Portuguese.isl" -Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" -Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl" -Name: "slv"; MessagesFile: "compiler:Languages\Slovenian.isl" -Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl" -Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" - -; Additional, Unofficial translations Name: "afr"; MessagesFile: "compiler:Languages\Afrikaans.isl" Name: "alb"; MessagesFile: "compiler:Languages\Albanian.isl" Name: "ara"; MessagesFile: "compiler:Languages\Arabic.isl" +Name: "arm"; MessagesFile: "compiler:Languages\Armenian.isl" Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl" Name: "baq"; MessagesFile: "compiler:Languages\Basque.isl" Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl" Name: "ben"; MessagesFile: "compiler:Languages\Bengali.islu" Name: "bos"; MessagesFile: "compiler:Languages\Bosnian.isl" +Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl" +Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl" Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl" -Name: "scr"; MessagesFile: "compiler:Languages\Croatian.isl" +Name: "cnr"; MessagesFile: "compiler:Languages\Montenegrin.isl" +Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" +Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl" Name: "enb"; MessagesFile: "compiler:Languages\EnglishBritish.isl" +Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "epo"; MessagesFile: "compiler:Languages\Esperanto.isl" +Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "est"; MessagesFile: "compiler:Languages\Estonian.isl" Name: "fas"; MessagesFile: "compiler:Languages\Farsi.isl" +Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "fre"; MessagesFile: "compiler:Languages\French.isl" Name: "gal"; MessagesFile: "compiler:Languages\Galician.isl" Name: "geo"; MessagesFile: "compiler:Languages\Georgian.isl" +Name: "ger"; MessagesFile: "compiler:Languages\German.isl" +Name: "gla"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" +Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl" +Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl" Name: "hin"; MessagesFile: "compiler:Languages\Hindi.islu" +Name: "hun"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "ice"; MessagesFile: "compiler:Languages\Icelandic.isl" Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl" +Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl" Name: "kaz"; MessagesFile: "compiler:Languages\Kazakh.islu" Name: "kor"; MessagesFile: "compiler:Languages\Korean.isl" Name: "kur"; MessagesFile: "compiler:Languages\Kurdish.isl" Name: "lav"; MessagesFile: "compiler:Languages\Latvian.isl" +Name: "lij"; MessagesFile: "compiler:Languages\Ligurian.isl" Name: "lit"; MessagesFile: "compiler:Languages\Lithuanian.isl" Name: "ltz"; MessagesFile: "compiler:Languages\Luxemburgish.isl" Name: "mac"; MessagesFile: "compiler:Languages\Macedonian.isl" +Name: "mar"; MessagesFile: "compiler:Languages\Marathi.islu" Name: "may"; MessagesFile: "compiler:Languages\Malaysian.isl" Name: "mon"; MessagesFile: "compiler:Languages\Mongolian.isl" +Name: "nep"; MessagesFile: "compiler:Languages\Nepali.islu" Name: "nno"; MessagesFile: "compiler:Languages\NorwegianNynorsk.isl" +Name: "nor"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "occ"; MessagesFile: "compiler:Languages\Occitan.isl" +Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "por"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "rum"; MessagesFile: "compiler:Languages\Romanian.isl" +Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" +Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl" +Name: "scr"; MessagesFile: "compiler:Languages\Croatian.isl" +Name: "sin"; MessagesFile: "compiler:Languages\Sinhala.islu" Name: "slo"; MessagesFile: "compiler:Languages\Slovak.isl" +Name: "slv"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "swe"; MessagesFile: "compiler:Languages\Swedish.isl" Name: "tai"; MessagesFile: "compiler:Languages\Thai.isl" Name: "tat"; MessagesFile: "compiler:Languages\Tatar.isl" +Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl" +Name: "uig"; MessagesFile: "compiler:Languages\Uyghur.islu" +Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" +Name: "urd"; MessagesFile: "compiler:Languages\Urdu.isl" Name: "uzb"; MessagesFile: "compiler:Languages\Uzbek.isl" Name: "vie"; MessagesFile: "compiler:Languages\Vietnamese.isl" @@ -514,6 +519,9 @@ begin if lang = 'mac' then lc := 'mk' else + if lang = 'mar' then + lc := 'mr' + else if lang = 'may' then lc := 'ms' else @@ -556,6 +564,9 @@ begin if lang = 'scr' then lc := 'hr' else + if lang = 'sin' then + lc := 'si' + else if lang = 'slo' then lc := 'sk' else @@ -571,9 +582,15 @@ begin if lang = 'tur' then lc := 'tr' else + if lang = 'uig' then + lc := 'ug' + else if lang = 'ukr' then lc := 'uk' else + if lang = 'urd' then + lc := 'ur' + else if lang = 'uzb' then lc := 'uz' else @@ -642,32 +659,80 @@ begin if lang = 'pt_br' then licence := 'COPYING_pt_BR.txt' else + if lang = 'be' then + licence := 'COPYING-be.txt' + else + if lang = 'bg' then + licence := 'COPYING-bg.txt' + else if lang = 'ca' then licence := 'COPYING-ca.txt' else if lang = 'cs' then licence := 'COPYING-cs.txt' else + if lang = 'cy' then + licence := 'COPYING-cy.txt' + else if lang = 'da' then licence := 'COPYING-da.txt' else - if lang = 'nl' then - licence := 'COPYING-nl.txt' + if lang = 'de' then + licence := 'COPYING-de-COPIE.txt' + else + if lang = 'el' then + licence := 'COPYING-el.txt' + else + if lang = 'es' then + licence := 'COPYING-es-COPIADO.txt' + else + if lang = 'fi' then + licence := 'COPYING-fi.txt' else if lang = 'fr' then licence := 'COPYING-fr-COPIER.txt' else - if lang = 'de' then - licence := 'COPYING-de-KOPIE.txt' + if lang = 'he' then + licence := 'COPYING-he.txt' + else + if lang = 'id' then + licence := 'COPYING-id.txt' else if lang = 'it' then licence := 'COPYING-COPIATURA.txt' else + if lang = 'ja' then + licence := 'COPYING-ja.txt' + else + if lang = 'ko' then + licence := 'COPYING-ko.txt' + else + if lang = 'lt' then + licence := 'COPYING-lt.txt' + else + if lang = 'nl' then + licence := 'COPYING-nl.txt' + else if lang = 'pl' then licence := 'COPYING-pl-LICENCJA-GNU.txt' else - if lang = 'es' then - licence := 'COPYING-es-COPIADO.txt' + if lang = 'ro' then + licence := 'COPYING-ro.txt' + else + if lang = 'sr' then + licence := 'COPYING-sr.txt' + else + if lang = 'sv' then + licence := 'COPYING-sv.txt' + else + if lang = 'tr' then + licence := 'COPYING-tr.txt' + else + if lang = 'zh_cn' then + licence := 'COPYING-zh_cn.txt' + else + if lang = 'zh_tw' then + licence := 'COPYING-zh_tw_GNU_GPL_Chinese.txt' else licence := 'COPYING-en.txt'; From db09aacf4b897cb3003938354c54ea3e373bbcaa Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Thu, 22 Oct 2020 03:14:26 +0200 Subject: [PATCH 15/41] Elefant, fish-icon and frame_hearts SVGs touched the edges and got ugly strips at some Tux Paint's window sizes. Remade them in inkscape and put a margin of 3 units on each side. --- starters/elephant.svg | 31 ++- starters/fish_icon.svg | 36 +-- starters/frame_hearts.svg | 541 ++++++++++++++++++-------------------- 3 files changed, 289 insertions(+), 319 deletions(-) diff --git a/starters/elephant.svg b/starters/elephant.svg index 24c6e41b5..3ac6ed322 100644 --- a/starters/elephant.svg +++ b/starters/elephant.svg @@ -1,5 +1,6 @@ + + showguides="true" + fit-margin-top="3" + fit-margin-left="3" + fit-margin-bottom="3" + fit-margin-right="3" + inkscape:window-maximized="0"> + position="-525.1386,4.8649025" + inkscape:locked="false" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.87462372px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> diff --git a/starters/fish_icon.svg b/starters/fish_icon.svg index 954bafa08..26956b0e1 100644 --- a/starters/fish_icon.svg +++ b/starters/fish_icon.svg @@ -11,14 +11,14 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="Layer_1" - width="608" - height="472" - viewBox="0 0 608.00003 472" + width="558.93433" + height="478.00323" + viewBox="0 0 558.93435 478.00323" overflow="visible" enable-background="new 0 0 360.869 306.978" xml:space="preserve" - inkscape:version="0.47pre1 r21720" - sodipodi:docname="johnny_automatic_fish_icon.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="fish_icon.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" style="overflow:visible"> @@ -41,20 +41,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1440" - inkscape:window-height="826" + inkscape:window-width="1910" + inkscape:window-height="1052" id="namedview7" showgrid="false" inkscape:zoom="0.76878474" - inkscape:cx="184.18619" - inkscape:cy="154.63759" + inkscape:cx="163.81131" + inkscape:cy="157.64091" inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" /> + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1" + fit-margin-top="3" + fit-margin-right="3" + fit-margin-bottom="3" + fit-margin-left="3" /> + d="m 337.95092,280.26019 c 29.03631,29.29297 76.72423,56.57923 133.56162,54.02621 26.60637,-1.19622 46.19604,-14.05288 70.53305,-9.00537 6.49737,25.42516 -24.53212,31.94655 -37.51786,43.52145 -27.03562,24.09686 -42.06859,48.10518 -87.03989,60.02828 -12.39139,3.28396 -23.39896,-0.76395 -39.01877,3.0003 -16.54736,3.98787 -28.92674,26.61536 -48.02262,33.01667 -11.08112,3.71322 -35.3791,5.51879 -54.02472,3.0003 -5.61184,-0.75796 -15.69186,-6.32327 -21.01102,-7.50298 -33.88721,-7.51348 -57.61335,8.50257 -91.54258,9.00387 -26.6799,0.39473 -56.95145,-4.13946 -51.02442,-31.51429 8.64966,-14.65474 24.57715,-10.08751 42.01905,-10.50476 35.03388,-0.839 74.69503,-11.54488 97.54615,-28.514 -3.07983,-12.54148 -14.56168,-17.56347 -22.51041,-24.01132 -17.35635,-14.07839 -29.75825,-24.34301 -46.52174,-46.52173 -4.83588,-6.39832 -12.47543,-25.26156 -21.01102,-25.51221 -11.33777,-0.3332 -21.48831,29.07383 -28.51401,40.51966 -20.31461,33.09773 -32.51688,50.52462 -60.028286,78.03602 -9.979449,9.98095 -25.516712,29.00179 -39.018762,30.0149 C 25.310022,452.05261 12.0226,447.32328 9.2924734,434.83284 5.4666924,417.3294 20.152947,401.11674 27.301709,389.812 c 9.337067,-14.7658 17.66253,-24.93737 25.51221,-37.51786 -10.381689,-22.31681 4.188998,-30.28807 12.005657,-43.51995 19.939387,-33.75963 18.653117,-84.64597 0,-117.05479 -6.859089,-11.9171 -19.34053,-22.85262 -7.504474,-39.01876 -6.345783,-11.01206 -16.961611,-20.68233 -24.011315,-34.51608 -7.804652,-15.31513 -23.145298,-54.829181 0,-60.028281 15.071986,-3.38452 28.509498,11.718984 39.018762,21.011026 29.431041,26.018005 60.621151,68.089585 76.538131,103.546725 4.75334,10.59182 3.86181,29.69521 18.00774,30.0149 12.56699,0.28217 13.97633,-18.77319 19.51013,-28.514 18.25239,-32.12665 49.55204,-59.7116 79.53842,-82.53871 0.68441,-8.726198 -12.18577,-11.777523 -6.00358,-21.009529 9.31005,-12.20077 37.95613,-5.064013 49.52353,-15.007442 -1.63448,-15.18456 -25.01692,-2.75564 -24.01132,-18.00924 1.40784,-21.36523 54.0082,2.32789 60.02829,-13.50655 -4.60925,-14.64123 -22.27929,-2.38943 -22.51042,-16.50834 -0.12308,-7.52549 7.67857,-8.9378297 21.00952,-9.0038697 49.28789,-0.24465 82.99348,14.6487297 108.05092,42.0205497 12.43341,13.5816 16.24419,32.811062 27.0131,52.525321 11.67397,21.37424 32.79756,38.93471 45.02085,63.03007 17.38036,34.26243 45.98891,105.88063 6.00207,133.56313 -53.36131,36.94153 -137.92772,7.65306 -168.0777,-19.51013 -7.05721,-6.35629 -21.89506,-36.47475 -33.01668,-33.01518 -17.16124,5.33868 1.70802,26.03602 9.00537,33.01518 z M 322.94347,100.17532 c -0.39174,2.11026 -3.29146,1.71103 -4.50268,3.0018 -11.04359,23.1543 -23.37344,54.1778 -27.01161,85.54049 -1.1647,10.03348 -5.019,24.83831 3.00029,33.01669 12.97674,-0.95607 8.11534,-15.66484 9.00536,-24.01132 4.11696,-38.65705 20.42718,-68.56988 27.01162,-96.04526 -3.61717,0.61237 -3.26145,-2.742137 -7.50298,-1.5024 z m 91.54257,24.01132 c -26.18761,-0.86752 -23.06875,53.74854 -15.00745,76.53663 6.82758,-15.78491 32.8771,-22.86913 54.02622,-15.00745 -8.51007,-20.94198 -15.18906,-60.73971 -39.01877,-61.52918 z m -178.58397,34.51608 c -5.45875,9.0684 -10.77042,24.22294 -15.00744,39.01876 -3.41604,11.93211 -13.13733,33.92473 1.5009,40.51966 6.33977,-23.23385 9.81584,-56.78185 21.00952,-79.53842 -0.31669,-1.68401 -1.66449,-2.3369 -3.00179,-3.00179 -0.39024,2.11176 -3.29146,1.71102 -4.50119,3.00179 z m 178.58397,84.0396 c 1.35381,7.90221 15.41869,24.62068 27.01311,22.51192 17.40888,-3.16839 18.35144,-40.36806 15.00745,-63.03008 -21.73447,-3.11135 -46.26209,15.78191 -42.02056,40.51816 z" + inkscape:connector-curvature="0" /> \ No newline at end of file diff --git a/starters/frame_hearts.svg b/starters/frame_hearts.svg index 643956845..1e19299fa 100644 --- a/starters/frame_hearts.svg +++ b/starters/frame_hearts.svg @@ -1,5 +1,6 @@ + - - - + inkscape:window-x="588" + inkscape:window-y="119" + fit-margin-top="2" + fit-margin-right="2" + fit-margin-bottom="2" + fit-margin-left="2" + inkscape:window-maximized="0" /> @@ -890,6 +884,7 @@ image/svg+xml + @@ -897,145 +892,41 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-127.491,-326.001)"> - - - - - - - - - - + transform="translate(-141.78828,-320.46072)"> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3589);fill-opacity:1;stroke:url(#linearGradient3591);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + transform="matrix(0.3728452,0.00522107,-0.00495722,0.3539988,500.73271,746.64797)"> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -348.63405,-134.23591 c -10.17207,-3.47278 -22.62011,-2.29799 -28.81866,6.76212 -6.3104,9.22362 -8.56923,30.504374 6.44688,42.216958 9.21223,7.777668 17.64171,17.443176 19.23248,29.770826 10.56987,-8.508167 19.19165,-12.227605 32.4967,-11.473759 18.68523,0.115874 28.78423,-18.554357 28.98848,-29.921102 0.39005,-21.706893 -35.0847,-34.490573 -42.78974,-17.810573 1.61943,-8.84512 -5.95234,-16.26568 -15.55614,-19.54447 z" + style="fill:url(#linearGradient3597);fill-opacity:1;stroke:url(#linearGradient3599);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -367.46932,-120.37127 c -10.69302,0.0492 -22.16903,5.2624 -25.36888,15.90897 -3.25759,10.838687 0.91097,31.797074 18.65026,37.980545 11.05857,4.355953 21.93373,10.762838 27.1026,21.949458 7.516,-11.561059 14.60236,-17.932032 27.4647,-21.595241 17.78377,-6.040093 21.83728,-27.099265 18.65865,-37.963922 -6.07018,-20.74809 -43.56127,-21.21513 -45.93124,-2.83448 -1.08613,-8.93514 -10.48044,-13.49182 -20.57609,-13.44533 z" + style="fill:url(#linearGradient3605);fill-opacity:1;stroke:url(#linearGradient3607);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3613);fill-opacity:1;stroke:url(#linearGradient3615);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3621);fill-opacity:1;stroke:url(#linearGradient3623);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + transform="matrix(0.428234,0.0413948,-0.0393025,0.406588,-308.593,203.521)"> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3629);fill-opacity:1;stroke:url(#linearGradient3631);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3637);fill-opacity:1;stroke:url(#linearGradient3639);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3645);fill-opacity:1;stroke:url(#linearGradient3647);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3653);fill-opacity:1;stroke:url(#linearGradient3655);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3661);fill-opacity:1;stroke:url(#linearGradient3663);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.33414,-129.95527 c -10.69151,-0.19474 -22.27205,4.75537 -25.69013,15.32643 -3.47975,10.76182 0.25676,31.810402 17.86472,38.39716 10.96638,4.607243 21.70722,11.26075 26.64478,22.562678 7.75202,-11.386861 14.96776,-17.594658 27.90242,-20.96354 17.90383,-5.632923 22.38953,-26.594668 19.43511,-37.529308 -5.64203,-20.88171 -43.1147,-22.20405 -45.86217,-3.88177 -0.9021,-8.95783 -10.20049,-13.72777 -20.29473,-13.91165 z" + style="fill:url(#linearGradient3669);fill-opacity:1;stroke:url(#linearGradient3671);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -365.39272,-118.29914 c -9.96261,4.09133 -18.89484,13.29816 -18.25024,24.444759 0.65623,11.347749 11.69424,29.330379 30.35846,28.39008 11.8061,-0.118414 24.14048,1.746619 32.77945,10.231194 3.07163,-13.632943 7.51231,-22.259632 18.26695,-30.544429 14.53701,-12.364917 11.13798,-33.552154 4.46621,-42.489214 -12.74098,-17.06694 -47.88929,-3.31925 -43.83256,14.73133 -4.06087,-7.92792 -14.38224,-8.62646 -23.78827,-4.76372 z" + style="fill:url(#linearGradient3677);fill-opacity:1;stroke:url(#linearGradient3679);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -354.80863,-138.08482 c -10.67299,-0.69066 -22.44934,3.71729 -26.30628,14.11947 -3.92654,10.58991 -1.0741,31.79143 16.24123,39.188837 10.76302,5.111628 21.21511,12.257067 25.67513,23.777133 8.22079,-11.016098 15.68921,-16.883039 28.75222,-19.648462 18.12207,-4.796685 23.48023,-25.529928 20.98607,-36.591038 -4.76307,-21.12323 -42.14405,-24.18308 -45.65527,-6.00609 -0.52651,-8.99098 -9.61636,-14.18776 -19.6931,-14.83985 z" + style="fill:url(#linearGradient3685);fill-opacity:1;stroke:url(#linearGradient3687);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3693);fill-opacity:1;stroke:url(#linearGradient3695);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + transform="matrix(0.426011,-0.0601078,0.0570694,0.404477,-300.094,210.776)"> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3701);fill-opacity:1;stroke:url(#linearGradient3703);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3709);fill-opacity:1;stroke:url(#linearGradient3711);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3717);fill-opacity:1;stroke:url(#linearGradient3719);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> + d="m -358.95108,-128.09912 c -10.69276,0.0924 -22.14972,5.35185 -25.31081,16.01125 -3.21813,10.85176 1.02666,31.793169 18.78832,37.904995 11.07434,4.311286 21.97273,10.674229 27.18226,21.839904 7.47388,-11.591311 14.53701,-17.990839 27.38593,-21.705937 17.76166,-6.111828 21.73851,-27.187202 18.52038,-38.038962 -6.14563,-20.72343 -43.63814,-21.03915 -45.94122,-2.64906 -1.11863,-8.93069 -10.52945,-13.44942 -20.62486,-13.36219 z" + style="fill:url(#linearGradient3725);fill-opacity:1;stroke:url(#linearGradient3727);stroke-width:1.80972004;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cscccscc" + inkscape:connector-curvature="0" /> + d="m -368.87991,-95.954025 c -5.09948,-0.425477 -8.80243,-5.993445 -8.26552,-12.428505 0.53691,-6.43505 5.94751,-13.71704 10.21085,-10.88691 3.81618,2.53328 -3.5335,5.18568 -4.07041,11.62073 -0.53691,6.43506 5.96041,6.03451 2.12508,11.694685 z" + style="opacity:0.92741903;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter6901)" + inkscape:connector-curvature="0" /> From 8f25020a91e28ea5e75ec1f5a6e27506049e39fb Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Thu, 22 Oct 2020 22:05:24 +0900 Subject: [PATCH 16/41] Added some languages and corrected wrong filenames for localized COPYING text. --- win32/tuxpaint.iss | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index affda3790..a2d9d8a21 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -426,6 +426,12 @@ begin else lc := 'zh_tw' else + if lang = 'cnr' then + if TwoLetter = true then + lc := 'sr' + else + lc := 'sr_latin' + else if lang = 'cos' then lc := 'co' else @@ -570,6 +576,9 @@ begin if lang = 'slo' then lc := 'sk' else + if lang = 'slv' then + lc := 'sl' + else if lang = 'swe' then lc := 'sv' else @@ -678,7 +687,7 @@ begin licence := 'COPYING-da.txt' else if lang = 'de' then - licence := 'COPYING-de-COPIE.txt' + licence := 'COPYING-de-KOPIE.txt' else if lang = 'el' then licence := 'COPYING-el.txt' @@ -699,7 +708,7 @@ begin licence := 'COPYING-id.txt' else if lang = 'it' then - licence := 'COPYING-COPIATURA.txt' + licence := 'COPYING-it-COPIATURA.txt' else if lang = 'ja' then licence := 'COPYING-ja.txt' From d42620502ca0872fb0c97451b722ca850d77873a Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Fri, 23 Oct 2020 23:23:00 +0900 Subject: [PATCH 17/41] Enabled showing localized License Files --- docs/COPYING/COPYING-ja.txt | 2 +- docs/COPYING/COPYING-zh_cn.txt | 300 ++++++------------ .../COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt | 298 ++++++----------- win32/tuxpaint.iss | 54 ++-- 4 files changed, 228 insertions(+), 426 deletions(-) diff --git a/docs/COPYING/COPYING-ja.txt b/docs/COPYING/COPYING-ja.txt index 6da607b87..1eddff2d4 100644 --- a/docs/COPYING/COPYING-ja.txt +++ b/docs/COPYING/COPYING-ja.txt @@ -1,4 +1,4 @@ -COPYING-ja.txt for Tux Paint +COPYING-ja.txt for Tux Paint Tux Paint - 子供向けのシンプルなお絵かきプログラム diff --git a/docs/COPYING/COPYING-zh_cn.txt b/docs/COPYING/COPYING-zh_cn.txt index 2e97de719..fcd12b0de 100644 --- a/docs/COPYING/COPYING-zh_cn.txt +++ b/docs/COPYING/COPYING-zh_cn.txt @@ -1,198 +1,102 @@ - [IMG] - - Software Liberty Association of Taiwan - - - º¶ - - ³Ì·s®ø®§ - - ¬¡°Ê®ø®§ - - ¦³Ãö¨ó·| - - LIY ¾Ç¶é - - ½u¤W¹Ï®ÑÀ] - - ±M®×pµe - - ³q«H½×¾Â - - ¶}©ñ·½½X¤u§@¾÷·| - (2003/07/25 §ó·s) - - ¨ó·| FAQ - - ¬ÛÃöºô¯¸ - - ·|°T¶é¦a - - ùº¿¤s±MÄæ - - »Ýn±zªºÀ°§U - - GNU ³q¥Î¤½¦@±ÂÅv - - ¡]ÁcÅ餤¤å°Ñ¦Òª©¡^ - - 1991¦~6¤ë¡A²Ä¤Gª© - - ¡]ì¤å¥X³B: http://www.gnu.org/copyleft/gpl.html¡^ - - µÛ§@Åv©Ò¦³ (C) 1989¡A1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ¤¹³\¨CÓ¤H½Æ»s©M´²¥¬¥»±ÂÅv¤å¥óªº§¹¾ã°Æ¥»¡A - - ¦ý¤£¤¹³\¹ï¥¦¶i¦æ¥ô¦óקï¡C - - Án©ú - - This is an unofficial translation of the GNU General Public License into - Chinese. It was not published by the Free Software Foundation, and does - not legally state the distribution terms for software that uses the GNU - GPL--only the original English text of the GNU GPL does that. However, we - hope that this translation will help Chinese speakers understand the GNU - GPL better. - - ³o¬O¤@¥÷ GNU - ³q¥Î¤½¦@±ÂÅv«D¥¿¦¡ªº¤¤¤å½Ķ¡C¥¦¨Ã«D¥Ñ¦Û¥Ñ³nÅé°òª÷·|©Òµoªí¡A¥ç«D¨Ï¥Î GNU - ³q¥Î¤½¦@±ÂÅvªº³nÅ骺ªk©w´²¥¬±ø´Ú¢w¥u¦³ GNU - ³q¥Î¤½¦@±ÂÅv^¤åì¤åªºª©¥»©l¨ã¦³¦¹µ¥®Ä¤O¡CµM¦Ó¡A§Ú̧Ʊæ³o¥÷½Ķ¯àÀ°§U¤¤¤åªº¨Ï¥ÎªÌ§ó¤F¸Ñ - GNU ³q¥Î¤½¦@±ÂÅv¡C - - «e¨¥ - - ¤j¦h¼Æ³nÅé±ÂÅvÁn©ú¬O³]p¥Î¥Hé¹Ü±z¤À¨É»Pקï³nÅ骺¦Û¥Ñ¡C¬Û¤Ï¦a¡AGNU³q¥Î¤½¦@±ÂÅv¤O¹Ï«OÃÒ±z¤À¨É»Pקï¦Û¥Ñ³nÅ骺¦Û¥Ñ¡X½T«O³nÅé¹ï©Ò¦³ªº¨Ï¥ÎªÌ¦Ó¨¥³£¬O¦Û¥Ñªº¡C³q¥Î¤½¦@±ÂÅv¾A¥Î©ó¤j¦h¼Æ¦Û¥Ñ³nÅé°òª÷·|ªº³nÅé¡A¥H¤Î¥ô¦ó§@ªÌ«ü©w¨Ï¥Î¥»±ÂÅvªº¨ä¥L³nÅé¡C¡]¦³¨Ç¦Û¥Ñ³nÅé°òª÷·|ªº³nÅé¡A«h¾A¥ÎGNU¨ç¦¡®w³q¥Î¤½¦@±ÂÅv³W©w¡C¡^±z¤]¥i¥HÅý±zªº³nÅé¾A¥Î¥»±ÂÅv³W©w¡C - - ·í§Ú̦b½Í½×¦Û¥Ñ³nÅé®É¡A§ÚÌ©Ò«üªº¬O¦Û¥Ñ¡A¦Ó«D»ù®æ¡C§Ú̪º³q¥Î¤½¦@±ÂÅv«Y³]p¥Î¥H½T«O¨Ï±z«O¦³´²¥¬¦Û¥Ñ³nÅé«»sª«ªº¦Û¥Ñ¡]¥H¤Î±z¥i¥H¨M©w¦¹¤@ªA°È¬O§_¦¬¶O¡^¡A½T«O±z¯à¦¬¨ì·½½X©ÎªÌ¦b±z»Ýn®É«K¯à±o¨ì¥¦¡A½T«O±z¯àÅܧó³nÅé©Î±N¥¦ªº¤@³¡¤À¥Î©ó·sªº¦Û¥Ñ³nÅé¡F¨Ã¥B½T«O±zª¾¹D±z¥i¥H±q¨Æ¤Wzªº¨Æ±¡¡C - - ¬°¤F«O»Ù±zªºÅv§Q¡A§ÚÌ»Ýn§@¥X¨î¡G¸T¤î¥ô¦ó¤H§_»{±z¤WzªºÅv§Q¡A©ÎªÌn¨D±z©ñ±ó³o¨ÇÅv§Q¡C¦pªG±z´²¥¬³nÅ骺°Æ¥»¡A©ÎªÌ¹ï¤§¥[¥Hקï¡A³o¨Ç¨î´NÂà¤Æ¦¨¬°±zªº³d¥ô¡C - - ¨Ò¦p¡A°²¦p±z´²¥¬¦¹Ãþµ{¦¡ªº°Æ¥»¡AµL½×¬O§K¶O©Î¦¬¨ú¶O¥Î¡A±z¥²¶·±N±z©Ò¨É¦³ªº¤@¤ÁÅv§Q¥æ¥I¦¬¨üªÌ¡C±z¤]¥²¶·½T«O¥L̯ব¨ì©Î±o¨ì·½½X¡C¦Ó¥B±z¥²¶·¦V¥LÌ®i¥Ü³o¨Ç±ø´Úªº¤º®e¡A¨Ï¥L̪¾±x¥L̩Ҩɦ³ªºÅv§Q¡C - - §Ú̱Ĩú¨â¶µ±¹¬I¨Ó«OÅ@±zªºÅv§Q¡G(1)¥HµÛ§@Åv«OÅ@³nÅé¡A¥H¤Î(2)´£¨Ñ±z¥»±ÂÅv¡A½á»P±z½Æ»s¡B´²¥¬¤Î¡þ©Îקï³nÅ骺ªk«ß³\¥i¡C - - ¦P®É¡A¬°¤F«OÅ@§@ªÌ»P§ÚÌ¡]«ö¡G«ü¦Û¥Ñ³nÅé°òª÷·|¡^¡A§Ú̧Ʊæ½T©w¨CÓ¤H³£©úÁA¡A¦Û¥Ñ³nÅé¬O¨S¦³¾á«O³d¥ôªº¡C¦pªG³nÅé³Q¥L¤Hקï¨Ã¥[¥H¶Ç»¼¡A§ÚÌ»Ýn¨ä¦¬¨üªÌª¾¹D¡A¥LÌ©Ò±o¨ìªº¨Ã«Dì³nÅé¡A¦]¦¹¥Ñ¥L¤H©Ò¤Þ¥Xªº¥ô¦ó°ÝÃD¹ïì§@ªÌªºÁnÅA±N¤£·|¦³¥ô¦óªº¼vÅT¡C - - ³Ì«á¡A©Ò¦³¦Û¥Ñ³nÅ餣Â_¦a¨ü¨ì³nÅé±M§Qªº«Â¯Ù¡C§Ú̧Ʊæ¯àÁקK¦Û¥Ñ³nÅ骺¦A´²¥¬ªÌ¥HÓ¤H¦W¸q¨ú±o±M§Q±ÂÅv¦Ó¨Ïµ{¦¡±M¦³¤Æªº·ÀI¡C¬°¤F¨¾¤î¤Wzªº±¡¨Æµo¥Í¡A§Ú̦b¦¹©ú½TÁn©ú¡G¥ô¦ó±M§Q³£¥²¶·¬°¤F¨CÓ¤Hªº¦Û¥Ñ¨Ï¥Î¦Ó®Öã¡A§_«h´N¤£À³±Â»P±M§Q¡C - - ¥H¤U¬O¦³Ãö½Æ»s¡B´²¥¬¤Îק諸©ú½T±ø´Ú¤Î±ø¥ó¡C - - ½Æ»s¡B´²¥¬»Pק諸±ø´Ú»P±ø¥ó - - 0. - ¤ZµÛ§@Åv¤H¦b¨äµ{¦¡©Î¨ä¥LµÛ§@¤¤Án©ú¡A¸Óµ{¦¡©ÎµÛ§@±o¦b³q¥Î¤½¦@±ÂÅv±ø´Ú¤U´²¥¬¡A¥»±ÂÅv¹ï¨ä§¡¦³¾A¥Î¡C¥H¤U©ÒºÙªº¡u¥»µ{¦¡¡v¡A«Y«ü¥ô¦ó¤@ºØ¾A¥Î³q¥Î¤½¦@±ÂÅvªºµ{¦¡©ÎµÛ§@¡F¡u°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡v¡A«h«ü¥»µ{¦¡©Î¥ô¦ó°ò©óµÛ§@Åvªk©Ò²£¥Íªºl¥ÍµÛ§@¡A´«¨¥¤§¡A«Y«ü¥]§t¥»µ{¦¡¥þ³¡©Î¤@³¡ªºµÛ§@¡A¤£½×¬O§¹¾ãªº©Î¸g¹Lק諸µ{¦¡¡A¥H¤Î¡]©Î¡^½Ķ¦¨¨ä¥L»y¨¥ªºµ{¦¡¡]¥H¤U¡uקï¡v¤@µü¥]¬A¦ý¤£©ó½Ķ¦æ¬°¦b¤º¡^¡C³Q±ÂÅv¤H«hºÙ¬°¡u±z¡v¡C - - ¥»±ÂÅv¤£¾A¥Î©ó½Æ»s¡B´²¥¬»Pקï¥H¥~ªº¦æ¬°¡F³o¨Ç¦æ¬°¤£¦b¥»±ÂÅv½d³ò¤º¡C°õ¦æ¥»µ{¦¡ªº¦æ¬°¨Ã¤£¨ü¨î¡A¦Ó¥»µ{¦¡ªº¿é¥X¥u¦³¦b¨ä¤º®eºc¦¨°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡]¦Ó«D¥u¬O¦]¬°°õ¦æ¥»µ{¦¡©Ò³y¦¨¡^®É¡A©l¨ü¥»±ÂÅv©ë§ô¡C¦Ü©óµ{¦¡ªº¿é¥X¤º®e¬O§_ºc¦¨¥»µ{¦¡ªºl¥ÍµÛ§@¡A«h¨ú¨M©ó¥»µ{¦¡ªº¨ãÅé¥Î³~¡C - - 1. - ±z¥i¥H¹ï©Ò¦¬¨üªº¥»µ{¦¡·½½X¡AµL½×¥H¦óºØ´C¤¶¡A½Æ»s»P´²¥¬¨ä§¹¾ãªº«»sª«¡AµM¦Ó±z¥²¶·²Å¦X¥H¤Un¥ó¡G¥HÅãµÛ¤Î¾A·íªº¤è¦¡¦b¨C¤@¥÷«»sª«¤Wµo§G¾A·íªºµÛ§@Åv¼Ð¥Ü¤ÎµL¾á«OÁn©ú¡Fºû«ù©Ò¦³¦³Ãö¥»±ÂÅv¥H¤ÎµL¾á«OÁn©úªºì»ª¡F¨Ã±N¥»±ÂÅvªº°Æ¥»³s¦P¥»µ{¦¡¤@¨Ö¥æ¥I¤©¨ä¥L¥ô¤@¦ì¥»µ{¦¡ªº¦¬¨üªÌ¡C - - ±z¥i¥H¹ïÅý»P«»sª«ªº¹ê»Ú¦æ¬°½Ð¨D¤@©wªº¶O¥Î¡A±z¤]¥i¥H¦Û¥Ñ¨M©w¬O§_´£¨Ñ¾á«O¥H§@¬°¹ï»ùªº¥æ´«¡C - - 2. - ±z¥i¥Hק糧µ{¦¡ªº¤@өμÆÓ«»sª«©ÎªÌ¥»µ{¦¡ªº¥ô¦ó³¡¥÷¡A¥H¦¹§Î¦¨°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡A¨Ã¨Ì«ez²Ä¤@±ø³W©w¡A½Æ»s»P´²¥¬¦¹¤@קï¹Lªºµ{¦¡©ÎµÛ§@¡A¦ý±z¥²¶·²Å¦X¥H¤Un¥ó¡G - - (a) - ±z¥²¶·¦b©Òק諸ÀɮפWªþ¥[ÅãµÛªº¼Ð¥Ü¡A±Ô©ú±zקï¹L³o¨ÇÀɮסA¥H¤Îקï¤é´Á¡C - - (b) - ±z¥²¶·´N±z©Ò´²¥¬©Îµo¦æªºµÛ§@¡AµL½×¬O¥]§t¥»µ{¦¡¥þ³¡©Î¤@³¡ªºµÛ§@¡A©ÎªÌ¬O¦Û¥»µ{¦¡©Î¨ä¥ô¦ó³¡¥÷©Òl¥ÍªºµÛ§@¡A¾ãÅé±ÂÅv©Ò¦³²Ä¤T¤H¨Ì¥»±ÂÅv³W©w¨Ï¥Î¡A¥B¤£±o¦]¦¹¶µ±ÂÅv¦æ¬°¦Ó¦¬¨ú¥ô¦ó¶O¥Î¡C - - (c) - Y¸g¹Lק諸µ{¦¡¦b°õ¦æ®É³q±`¥H¤¬°Ê¤è¦¡Åª¨ú©R¥O®É¡A±z¥²¶·¦b³Ì±`³Q¨Ï¥Îªº¤è¦¡¤U¡A©ó¶}©l¶i¤J³oºØ¤¬°Ê¦¡¨Ï¥Î®É¡A¦C¦L©Î®i¥Ü¥H¤U«Å§i¡G¾A·íªºµÛ§@Åv¼Ð¥Ü¤ÎµL¾á«OÁn©ú¡]©ÎªÌÁn©ú±z´£¨Ñ¾á«O¡^¡B¨Ï¥ÎªÌ¥i¥H¨Ì³o¨Ç±ø¥ó¦A´²¥¬¦¹µ{¦¡¡A¥H¤Î§iª¾¨Ï¥ÎªÌ¦p¦óÂsÄý¥»±ÂÅvªº°Æ¥»¡C¡]¨Ò¥~¡GY¥»µ{¦¡¥»¨«Y¥H¤¬°Êªº¤è¦¡°õ¦æ¡AµM¦Ó³q±`«o¤£·|¦C¦L¸Ó«Å§i®É¡A«h±z°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@«KµL»Ý¦C¦L¸Ó«Å§i¡C¡^ - - ³o¨Çn¨D¹ïקï¹LªºµÛ§@¬O¾ãÅé¾A¥Îªº¡CÕµÛ§@¤¤¥iÃѧOªº¤@³¡¥÷¨Ã«Dl¥Í¦Û¥»µ{¦¡¡A¨Ã¥B¥i¥H¦X²z¦a»{¬°¬O¤@¿W¥ßªº¡BÓ§OªºµÛ§@¡A«h·í±z±N¨ä§@¬°Ó§OµÛ§@¥[¥H´²¥¬®É¡A¥»±ÂÅv¤Î¨ä±ø´Ú±N¤£¾A¥Î©ó¸Ó³¡¤À¡CµM¦Ó·í±z±N¤Wz³¡¤À¡A§@¬°°ò©ó¥»µ{¦¡©Ò¥ÍµÛ§@ªº¤@³¡¦Ó´²¥¬®É¡A¾ãÓµÛ§@ªº´²¥¬¥²¶·²Å¦X¥»±ÂÅv±ø´Úªº³W©w¡A¦Ó¥»±ÂÅv¹ï©ó¨ä¥L³Q±ÂÅv¤H©Ò¬°ªº³\¥i¤Î©óµÛ§@¾ãÅé¡C - - ¦]¦¹¡A¥»±ø³W©wªº·N¹Ï¤£¦b©ó¥D±i©Îé¹Ü±z¹ï©ó§¹¥þ¥Ñ±z©Ò§¹¦¨µÛ§@ªºÅv§Q¡FÀ³¸Ó»¡¡A¥»±ø³W©w·N¦b¦æ¨Ï¹ï°ò©óµ{¦¡©Ò¥Íªº¤§l¥ÍµÛ§@©Î¶°¦XµÛ§@´²¥¬¦æ¬°ªº±±¨îÅv¡C - - ¦¹¥~¡A«D°ò©ó¥»µ{¦¡©Ò¥Íªº¨ä¥LµÛ§@»P¥»µ{¦¡¡]©Î°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^¦b¦P¤@Àx¦s©Î´²¥¬ªº´C¤¶¤Wªº³æ¯Â»E¶°¦æ¬°¡A¨Ã¤£·|¨Ï¸ÓµÛ§@¦]¦¹¨ü¥»±ÂÅv±ø´Ú©ë§ô¡C - - 3. - ±z¥i¥H¨Ì«ez²Ä¤@¡B¤G±ø³W©w¡A½Æ»s»P´²¥¬¥»µ{¦¡¡]©Î²Ä¤G±ø©Òz°ò©ó¥»µ{¦¡©Ò²£¥ÍªºµÛ§@¡^ªº¥Øªº½X©Î¥i°õ¦æ§Î¦¡¡A¦ý±z¥²¶·²Å¦X¥H¤Un¥ó¡G - - (a) - ªþ¤W§¹¾ã¡B¬Û¹ïÀ³ªº¾÷¾¹¥i§PŪ·½½X¡A¦Ó³o¨Ç·½½X¥²¶·¨Ì«ez²Ä¤@¡B¤G±ø³W©w¦b¸g±`¥Î¥H§@¬°³nÅé¥æ´«ªº´C¤¶ª«¤W´²¥¬¡F©Î - - (b) - ªþ¤W¦Ü¤Ö¤T¦~¦³®Äªº®Ñ±³ø»ù¤å¥ó¡A´£¨Ñ¥ô¦ó²Ä¤T¤H¦b¤ä¥I¤£¶W¹L¹ê»Ú´²¥¬·½½X©Ò»Ý¦¨¥»ªº¶O¥Î¤U¡A¨ú±o¬Û¦P·½½Xªº§¹¾ã¾÷¾¹¥iŪ«»sª«¡A¨Ã¨Ì«ez²Ä¤@¡B¤G±ø³W©w¦b¸g±`¥Î¥H§@¬°³nÅé¥æ´«ªº´C¤¶ª«¤W´²¥¬¸Ó«»sª«¡F©Î - - (c) - ªþ¤W±z©Ò¦¬¨ü¦³Ãö´²¥¬¬Û¦P·½½Xªº³ø»ù¸ê°T¡C¡]¥»¶µ¿ï¾Ü¶È¦b«DÀç§Q´²¥¬¡B¥B¶È¦b±z¨Ì«ezb¶µ¤è¦¡¦Û¸Ó®Ñ±³ø»ù¤å¥ó¦¬¨üµ{¦¡¥Øªº½X©Î¥i°õ¦æ§Î¦¡®É¡A©l¦³¾A¥Î¡C¡^ - - µÛ§@ªº·½½X¡A¬O«ü¹ïµÛ§@¶i¦æקï®É¾A¥Îªº§Î¦¡¡C¹ï©ó¤@Ó¥i°õ¦æªºµÛ§@¦Ó¨¥¡A§¹¾ãªº·½½X¬O«üµÛ§@¤¤©Ò¥]§t©Ò¦³¼Ò²Õªº¥þ³¡·½½X¡A¥[¤W¬ÛÃö¤¶±ªº©w¸qÀÉ¡AÁÙ¥[¤W¥Î¥H±±¨î¸ÓµÛ§@½sö»P¦w¸Ëªº´yz¡CµM¦Ó¡A¯S§Oªº¨Ò¥~±¡ªp¬O¡A©Ò´²¥¬ªº·½½X¨Ã¤£»Ý¥]§t¥ô¦ó³q±`·|ÀHµÛ©Ò°õ¦æ§@·~¨t²Îªº¥Dn²Õ¦¨³¡¤À¡]½sĶ¾¹¡B®Ö¤ßµ¥µ¥¡^¦Ó´²¥¬ªº³nÅé¡]µL½×¥H·½½X©Î¤G¶i¦ì®æ¦¡¡^¡A°£«D¸Ó³¡¤À¥»¨§Yªþ¥[¦b¥i°õ¦æµ{¦¡¤¤¡C - - Y¥i°õ¦æ½X©Î¥Øªº½Xªº´²¥¬¤è¦¡¡A¬O¥H«ü©wªº¦aÂI´£¨Ñ¦s¨ú¦ì¸m¨Ñ¤H½Æ»s¡A«h´£¨Ñ¥i¦Û¬Û¦P¦aÂI½Æ»s·½½Xªº¨Ï¥Î¾÷·|¡Aµø¦P¹ï©ó·½½Xªº´²¥¬¡AµM¦Ó²Ä¤T¤H¨Ã¤£¦]¦¹¦Ót¦³±N¥Øªº½X³s¦P·½½X¤@¨Ö½Æ»sªº¸q°È¡C - - 4. - °£¥»±ÂÅv©Ò©ú¥Üªº¤è¦¡¥~¡A±z¤£±o¹ï¥»µ{¦¡¥[¥H½Æ»s¡Bקï¡B¦A±ÂÅv©Î´²¥¬¡C¥ô¦ó¸Õ¹Ï¥H¨ä¥L¤è¦¡¶i¦æ½Æ»s¡Bקï¡B¦A±ÂÅv©ÎªÌ´²¥¬¥»µ{¦¡ªº¦æ¬°§¡¬°µL®Ä¡A¨Ã¥B±N¦Û°Ê²×¤î±z°ò©ó¥»±ÂÅv©Ò±o¨É¦³ªºÅv§Q¡CµM¦Ó¡A¨Ì¥»±ÂÅv³W©w¦Û±z¤â¤¤¦¬¨ü«»sª«©ÎÅv§Q¤§¤H¡A¥un¿í¦u¥»±ÂÅv³W©w¡A¥LÌ©ÒÀò±oªº±ÂÅv¨Ã¤£·|¦]¦¹²×¤î¡C - - 5. - ¦]¬°±z¨Ã¥¼¦b¥»±ÂÅv¤Wñ¦W¡A©Ò¥H±zµL¶·±µ¨ü¥»±ÂÅv¡CµM¦Ó¡A°£¦¹¤§¥~±z§OµL¨ä¥Lקï©Î´²¥¬¥»µ{¦¡©Î¨äl¥ÍµÛ§@ªº±ÂÅv³\¥i¡CY±z¤£±µ¨ü¥»±ÂÅv¡A«h³o¨Ç¦æ¬°¦bªk«ß¤W³£¬O³Q¸T¤îªº¡C¦]¦¹¡AÂǥѹ糧µ{¦¡¡]©Î¥ô¦ó°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^ªº×§ï©Î´²¥¬¦æ¬°¡A±zªí¥Ü¤F¹ï©ó¥»±ÂÅvªº±µ¨ü¡A¥H¤Î±µ¨ü©Ò¦³Ãö©ó½Æ»s¡B´²¥¬©Îק糧µ{¦¡©Î°ò©ó¥»µ{¦¡©Ò¥ÍµÛ§@ªº±ø´Ú»P±ø¥ó¡C - - 6. - ¨C·í±z¦A´²¥¬¥»µ{¦¡¡]©Î¥ô¦ó°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^®É¡A¦¬¨üªÌ§Y¦Û°ÊÀò±oì±ÂÅv¤H©Ò±Â¤©¨Ì¥»±ÂÅv±ø´Ú»P±ø¥ó½Æ»s¡B´²¥¬©Îק糧µ{¦¡ªºÅv§Q¡C±z¤£±o´N¥»±ÂÅv©Ò½á¤©¦¬¨üªÌ¦æ¨ÏªºÅv§Qªþ¥[¥ô¦ó¶i¤@¨Bªº¨î¡C±z¹ï©ó²Ä¤T¤H¬O§_¼i¦æ¥»±ÂÅv¤@¨Æ¡AµL¶·t³d¡C - - 7. - Yªk°|§P¨M¡B±M§Q«IÅv¥D±i©ÎªÌ¨ä¥L¥ô¦ó²z¥Ñ¡]¤£©ó±M§Qª§Ä³¡^ªºµ²ªG¡A¨Ï±o¥[½Ñ©ó±zªº±ø¥ó¡]µL½×¬O¥Ñªk°|©R¥O¡B¨óij©Î¨ä¥L¤è¦¡³y¦¨¡^»P¥»±ÂÅv³W©w¦³©Ò½Ä¬ð¡A¥L̨䣧K°£±z¹ï©ó¥»±ÂÅv³W©wªº¿í¦u¡CY±zµLªk¦P®É²Å¦X¨Ì¥»±ÂÅv©Ò¥Í¸q°È¤Î¨ä¥L¬ÛÃö¸q°È¦Ó¶i¦æ´²¥¬¡A¨º»ò¨äµ²ªG«K¬O±z¤£±o´²¥¬¸Óµ{¦¡¡C¨Ò¦p¡AY±M§Q±ÂÅv¤£¤¹³\ª½±µ©Î¶¡±µ³z¹L±z¦Ó¨ú±o«»sª«¤§¤H¡A¥H§K¥IÅv§Qª÷ªº¤è¦¡¦A´²¥¬¸Óµ{¦¡®É¡A±z°ß¤@¯à¦P®Éº¡¨¬¸Ó¸q°È¤Î¥»±ÂÅvªº¤è¦¡´N¬O¹ý©³ÁקK¶i¦æ¸Óµ{¦¡ªº´²¥¬¡C - - Y¥»±ø¥ô¤@³¡¥÷¦b¯S®í±¡ªp¤U³Q»{©wµL®Ä©ÎµLªk°õ¦æ®É¡A¥»±ø¨ä¾l³¡¤À¤´À³¾A¥Î¡A¥B¥»±ø¥þ³¡©ó¨ä¥L±¡ªp¤U¤´À³¾A¥Î¡C - - ¥»±øªº¥Øªº¨Ã¤£¦b»¤¨Ï±z«I®`±M§Q©Î¨ä¥L°]²£ÅvªºÅv§Q¥D±i¡A©Î´N¦¹Ãþ¥D±iªº¦³®Ä©Ê¥[¥Hª§°õ¡F¥»±øªº°ß¤@¥Øªº¡A¬O¦b«O»ÙÂǥѤ½¦@±ÂÅvºD¨Ò©Ò°õ¦æ¦Û¥Ñ³nÅé´²¥¬¨t²Îªº§¹¾ã©Ê¡C³\¦h¤H«H¿à¸Ó¨t²Î¤@³e¨Ï¥ÎªºÀ³¥Îµ{¦¡¡A¦Ó¹ï¸g¥Ñ¦¹¨t²Î´²¥¬ªº¤j¶q³nÅ馳¬Û·í¦hªº°^Äm¡F§@ªÌ¡þ°^ÄmªÌ¦³Åv¨M©w¥L©Î¦o¬O§_§Æ±æ¸g¥Ñ¨ä¥Lªº¨t²Î´²¥¬³nÅé¡A¦Ó³Q±ÂÅv¤H«hµL¸ÓºØ¿ï¾ÜÅv¡C - - ¥»±øªº¥Î·N¦b©ó±N¥»±ÂÅv¨ä¥L¤£½T©wªº³¡¤À¹ý©³¸ÑÄÀ²M·¡¡C - - 8. - Y¦]¬°±M§Q©Î¨É¦³µÛ§@Åv«OÅ@ªº¤¶±°ÝÃD¡A¦Ó¨Ï±o¥»µ{¦¡ªº´²¥¬»P¡þ©Î¨Ï¥Î«]©ó¬Y¨Ç°ê®a®É¡A«h±N¥»µ{¦¡¸m©ó¥»±ÂÅv³W½d¤§¤UªºìµÛ§@Åv¤H±o¼W¦C©ú½Tªº´²¥¬¦a°Ï¨î±ø´Ú¡A±N¸Óµ¥°ê®a±Æ°£¦b¥~¡A¦Ó¨Ï´²¥¬ªº³\¥i¥u¦b¥¼¨ü±Æ°£ªº°ê®a¤§¤º©Î¤§¤¤¡C¦b¸Óµ¥±¡ªp¤U¡A¸Ó¨î±ø´Ú¦p¦P¥H®Ñ±¤è¦¡q©w©ó¥»±ÂÅv¤º®e¤¤¡A¦Ó¦¨¬°¥»±ÂÅvªº±ø´Ú¡C - - 9. - ¦Û¥Ñ³nÅé°òª÷·|±oÀH®Éµoªí³q¥Î¤½¦@±ÂÅvªº×¥¿ª©»P¡þ©Î·sª©¥»¡C·sª©¥»¦bºë¯«¤W±Nªñ¦ü©ó¥Ø«eªºª©¥»¡AµM¦Ó¦b²Ó¸`¤W©Î©Ò¤£¦P¥H¦]À³·sªº°ÝÃD©Îª¬ªp¡C - - ¨C¤@Óª©¥»³£¦³Ó§Oªºª©¥»¸¹½X¡CY¥»µ{¦¡«ü©w¦³±ÂÅvª©¥»¸¹½X¡Aªí¥Ü¨ä¾A¥Î¸Óª©¥»©Î¬O¡u¥ô¦ó·sª©¥»¡v®É¡A±z±o¿ï¾Ü¿í´`¸Óª©¥»©Î¥ô¦ó¥Ñ¦Û¥Ñ³nÅé°òª÷·|¤é«á©Òµoªí·sª©¥»ªº±ø´Ú»P±ø¥ó¡CY¥»µ{¦¡¨Ã¥¼«ü©w±ÂÅvª©¥»¸¹½X®É¡A±z«K±o¿ï¾Ü¥ô¤@¦Û¥Ñ³nÅé°òª÷·|©Òµoªíªºª©¥»¡C - - 10. - Y±z·Q±N³¡¤À¥»µ{¦¡¯Ç¤J¨ä¥L¦Û¥Ñµ{¦¡¡A¦Ó¨ä´²¥¬ªº±ø¥ó¦³©Ò¤£¦P®É¡A½Ð¼g«H¨ú±o§@ªÌªº³\¥i¡CY¬°¦Û¥Ñ³nÅé°òª÷·|¨É¦³µÛ§@Åvªº³nÅé¡A½Ð¼g«H¦Ü¦Û¥Ñ³nÅé°òª÷·|¡F§Ú̦³®É·|¥H¨Ò¥~¤è¦¡¤©¥H³B²z¡C§Ú̪º¨M©w¨ú¨M©ó¨â¶µ¥Ø¼Ð¡G½T«O§Ú̦ۥѳnÅ骺©Ò¦³l¥ÍµÛ§@§¡ºû«ù¦b¦Û¥Ñªºª¬ºA¡A¨Ã¼sªx¦a«P¶i³nÅ骺¤À¨É»P¦A§Q¥Î¡C - - µL¾á«OÁn©ú - - 11. - ¥Ñ©ó¥»µ{¦¡«YµLÀv±ÂÅv¡A¦]¦¹¦bªk«ß³\¥i½d³ò¤º¡A¥»±ÂÅv¹ï¥»µ{¦¡¨Ã¤£t¾á«O³d¥ô¡C«D¸g®Ñ±Án©ú¡AµÛ§@Åv¤H»P¡þ©Î¨ä¥L´£¨Ñµ{¦¡¤§¤H¡AµL½×©ú¥Ü©ÎÀq¥Ü¡A§¡«Y¨Ì¡u²{ªp¡v´£¨Ñ¥»µ{¦¡¦Ó¨ÃµL¥ô¦ó§Î¦¡ªº¾á«O³d¥ô¡A¨ä¥]¬A¦ý¤£©ó¡A´N¾A°â©Ê¥H¤Î¯S©w¥Øªºªº¾A¥Î©Ê¬°Àq¥Ü©Ê¾á«O¡C¦³Ãö¥»µ{¦¡«~½è»P®Ä¯àªº¥þ³¡·ÀI±x¥Ñ±z©Ó¾á¡C¦p¥»µ{¦¡³QÃÒ©ú¦³·å²«¡A±zÀ³©Ó¾á©Ò¦³ªA°È¡B×´_©Î§ï¥¿ªº¶O¥Î¡C - - 12. - «D¸gªk«ßn¨D©Î®Ñ±¦P·N¡A¥ô¦óµÛ§@Åv¤H©Î¥ô¦ó¥i¯à¨Ì«ez¤è¦¡×§ï»P¡þ©Î´²¥¬¥»µ{¦¡ªÌ¡A¹ï©ó±z¦]¬°¨Ï¥Î©Î¤£¯à¨Ï¥Î¥»µ{¦¡©Ò³y¦¨ªº¤@¯ë©Ê¡B¯S®í©Ê¡B·N¥~©Ê©Î¶¡±µ©Ê·l¥¢¡A¤£t¥ô¦ó³d¥ô¡]¥]¬A¦ý¤£©ó¡A¸ê®Æ·l¥¢¡A¸ê®Æ°õ¦æ¤£ºë½T¡A©ÎÀ³¥Ñ±z©Î²Ä¤T¤H©Ó¾áªº·l¥¢¡A©Î¥»µ{¦¡µLªk»P¨ä¥Lµ{¦¡¹B§@µ¥¡^¡A§Y«K«ezªºµÛ§@Åv¤H©Î¨ä¥L¤H¤w³Q§iª¾¸Óµ¥·l¥¢ªº¥i¯à©Ê®É¡A¥ç¦P¡C - - ¡X±ø¤åµ²§ô¡X - -±zªº·sµ{¦¡¸Ó¦p¦ó±Ä¥Î³o¨Ç±ø´Ú¡H - - ¦pªG±z¶}µo¤F¤@Ó·sµ{¦¡¡A¨Ã¥B§Æ±æ¯à°÷Åý¥¦ºÉ¥i¯à¦a³Q¤j²³¨Ï¥Î¡A¹F¦¨¦¹¥Øªºªº³Ì¦n¤è¦¡´N¬OÅý¥¦¦¨¬°¦Û¥Ñ³nÅé¡A¥ô¦ó¤H¨Ì³o¨Ç±ø´Ú³W©w³£¯à´N¸Ó³nÅé¦A¬°´²¥¬¤Îקï¡C - - ¬°¤F°µ¨ì³o¤@ÂI¡A½Ð±N¥H¤UÁn©úªþ¥[¨ìµ{¦¡¤W¡C³Ì¦w¥þªº§@ªk¡A¬O±NÁn©ú©ñ¦b¨C¥÷·½½XÀɮתº°_©l³B¡A¥H¦³®Ä¶Ç¹FµL¾á«O³d¥ôªº°T®§¡F¥B¨C¥÷ÀɮצܤÖÀ³¦³¡uµÛ§@Åv¡v¦C¥H¤Î¥»¥÷Án©ú¥þ¤å¦ì¸mªº´£¥Ü¡C - - ¡q¥Î¤@¦æ´yzµ{¦¡ªº¦WºÙ»P¨ä¥Î³~²z¡r - - µÛ§@Åv©Ò¦³(c) ¡q¦~¥÷¡r¡q§@ªÌ©m¦W¡r - - ¥»µ{¦¡¬°¦Û¥Ñ³nÅé¡F±z¥i¨Ì¾Ú¦Û¥Ñ³nÅé°òª÷·|©ÒµoªíªºGNU³q¥Î¤½¦@±ÂÅv±ø´Ú³W©w¡A´N¥»µ{¦¡¦A¬°´²¥¬»P¡þ©Îקï¡FµL½×±z¨Ì¾Úªº¬O¥»±ÂÅvªº²Ä¤Gª©©Î¡]±z¦Û¦æ¿ï¾Üªº¡^¥ô¤@¤é«áµo¦æªºª©¥»¡C - - ¥»µ{¦¡«Y°ò©ó¨Ï¥Î¥Øªº¦Ó¥[¥H´²¥¬¡AµM¦Ó¤£t¥ô¦ó¾á«O³d¥ô¡F¥çµL¹ï¾A°â©Ê©Î¯S©w¥Øªº¾A¥Î©Ê©Ò¬°ªºÀq¥Ü©Ê¾á«O¡C¸Ô±¡½Ð°Ñ·ÓGNU³q¥Î¤½¦@±ÂÅv¡C - - ±zÀ³¤w¦¬¨ìªþÀH©ó¥»µ{¦¡ªºGNU³q¥Î¤½¦@±ÂÅvªº°Æ¥»¡F¦pµL¡A½Ð¼g«H¦Ü¦Û¥Ñ³nÅé°òª÷·|¡G59 - Temple Place ¡V Suite 330, Boston, Ma 02111-1307, USA¡C - - ¦P®Éªþ¤W¦p¦ó¥H¹q¤l¤Î®Ñ±«H¥ó»P±zÁpµ¸ªº¸ê°T¡C - - Yµ{¦¡¬O¥H¤¬°Ê¤è¦¡¹B§@®É¡A½Ð¦b¤¬°Ê¦¡¼Ò¦¡¶}©l®É¡A¿é¥X²µu´£¥Ü¦p¤U¡G - - Gnomovision ²Ä69ª©¡AµÛ§@Åv©Ò¦³ (c) ¦~¥÷ §@ªÌ©m¦W - - Gnomovision¤£t¾á«O³d¥ô¡A±ýª¾¸Ô±¡½ÐÁä¤J¡ushow - w¡v¡C³o¬O¤@ӦۥѳnÅé¡AÅwªï±z¦b¯S©w±ø¥ó¤U¦A´²¥¬¥»µ{¦¡¡F±ýª¾¸Ô±¡½ÐÁä¤J¡ushow - c¡v¡C - - ©Ò°²³]ªº«ü¥O¡ushow w¡v»P¡ushow - c¡vÀ³Åã¥Ü³q¥Î¤½¦@±ÂÅvªº¬Û¹ïÀ³±ø´Ú¡C·íµM¡A±z¥i¥H¨Ï¥Î¡ushow w¡v»P¡ushow - c¡v¥H¥~ªº«ü¥O¦WºÙ¡F¬Æ¦Ü¥H·Æ¹«ÁäÀ»©Î¿ï³æ¤è¦¡¶i¦æ¡X¥un¬O¦X©ó±zµ{¦¡»Ýnªº¤è¦¡³£¥i¥H¡C - - ¦p¦³»Ýn¡A±z¥çÀ³¨ú±o±zªº¶±¥D¡]Y±zªº¤u§@¬°µ{¦¡³]p®v¡^©Î¾Ç®Õ´N¥»µ{¦¡©Òñ¸pªº¡uµÛ§@Åv©ñ±ó©Ó¿Õ®Ñ¡v¡C¨ä½d¨Ò¦p¤U¡A±z¥unקï©m¦W§Y¥i¡G - - Yoyodyne¤½¥q¡A¯÷¦¹©ñ±óJames - Hacker©Ò¼g¤§¡¨Gnomovision¡¨µ{¦¡¡]¸Óµ{¦¡²£¥X½sĶ¾¹©Ò»Ý¸ê°T¡^©Ò¦³ªºµÛ§@Åv§Q¯q¡C - - ¡qTy Coon¤½¥qñ³¹¡r¡A1989¦~¥|¤ë¤@¤é - - Ty Coon¤½¥q°ÆÁ`µô - - ¥»³q¥Î¤½¦@±ÂÅv¨Ã¤£¤¹³\±z±N¥»µ{¦¡¨Ö¤J±M¦³µ{¦¡¤¤¡CY±zªºµ{¦¡¬O¤@¤lµ{¦¡¨ç¦¡®w®É¡A±z¥i¯à»{¬°¤¹³\±M¦³À³¥Îµ{¦¡»P¸Ó¨ç¦¡®w¬Û³sµ²·|§ó¦³À°§U¡CY³o¬O±z©Ò·Q°µªº¡A½Ð¨Ï¥ÎGNU¨ç¦¡®w³q¥Î¤½¦@±ÂÅv¥N´À¥»±ÂÅv¡C - - ---------------------------------------------------------------------- - - ĶªÌ : ¤è©Éªâ +GNU通用公共许可协议 +第二版，1991年6月 +版权所有（C）1989, 1991 自由软件基金会 +51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA +任何人皆可复制和发布本协议的完整副本，但不得修改 + +【译者声明】 +　　This is an unofficial translation of the GNU General Public License into Chinese. It was not published by the Free Software Foundation, and does not legally state the distribution terms for software that uses the GNU GPL--only the original English text of the GNU GPL does that. However, we hope that this translation will help Chinese speakers understand the GNU GPL better. +　　这是GNU通用公共许可协议的一份非官方中文翻译，并非自由软件基金会所发表，不适用于使用GNU通用公共许可协议发布的软件的法律声明——只有GNU通用公共许可协议英文原版才具有法律效力。不过我们希望本翻译能够帮助中文读者更好地理解GNU通用公共许可协议。 + +You may publish this translation, modified or unmodified, only under the terms at https://www.gnu.org/licenses/translations.html. + +【引言】 +　　就多数软件而言，许可协议被设计用于剥夺你分享和修改软件的自由。相反，GNU通用公共许可协议力图保障你分享和修改自由软件的权利——确保自由软件对其用户来说是自由的。本GNU通用公共许可协议用于自由软件基金会的大多数软件（自由软件基金会的有些软件受GNU宽松通用公共许可协议保护），以及那些作者声明使用此协议的软件。你也可以将本协议用于你的程序。 +　　所谓自由软件，强调自由，而非免费。本GNU通用公共许可协议设计用于确保你享有分发自由软件的自由（你可以为此服务收费），确保你可以在需要的时候获得这些软件的源码，确保你可以修改这些软件或者在新的自由软件中复用其中某些片段，并且确保你在这方面享有知情权。 +　　为保障你的权益，我们需要作一些限定：禁止任何人否认你的上述权利，或者要求你放弃它们。当你分发或修改这些软件时，这种限定就变成你的义务。如果你分发这种程序的副本，无论收费还是免费，你必须给予与你同等的权利。你还要确保他们也能收到源码并了解他们的权利。 +　　我们通过两步保障你的权益：其一，赋予软件著作权；其二，通过本协议使你可以合法地复制、分发和修改该软件。同时，为了保护每一位作者以及我们自己，我们向所有人指明如下一点：自由软件并不提供品质担保。如果软件被修改并继续传播，我们希望接收者知道获得的不是原版，后来引入的任何问题不应该影响原作者的声誉。 +　　最后，自由软件还持续受到软件专利的威胁。我们希望避免再发布者以个人名义取得专利，即将程序据为己有。为防止此类情况发生，我们需要澄清：专利必须为保障每个人的自由使用而申请，否则不应该存在。 + +　　下文是关于复制、分发和修改的严谨描述和实施条件。 + +【关于复制、分发和修改的术语和条件】 +　　〇、但凡版权持有人在他的程序或其他作品中声明该作品可在GNU通用公共许可协议约束下发布，本协议便对之适用。下文中所说的“程式”指任何程序或作品，而“程式的派生作品”指该程式或者版权法认定的派生作品，即全部或部分包含了该程式的作品，无论是原样包含或做了修改，乃至翻译成了其他语言（后文中“修改”涵盖翻译）。每个许可获得者称作“你”。 +　　除复制、分发和修改外的行为超出了本协议的约束范围。执行程式的行为并不受限，程式的输出一般不在约束之内，除非其内容构成了本程式的派生作品（并非单纯地作为本程式的运行结果），判别取决于此程式的具体用途。 +　　一、只要你做到为每一个副本醒目而恰当地发布版权与免责声明，原封不动地保留本协议及免责声明，并将本协议连同程式发予接收者，你可以通过任何媒介完整地复制和分发你收到的本程式的源码。 +　　你可以就传输副本的具体行为收费，也可以选择提供品质担保以换取收入。 + +　　二、你可以修改你的程式副本的任意部分，以构成本程式的派生作品，并在满足上述条款及以下三点要求的前提下复制和分发该修改版： +　　a)你必须在你修改了的文件中醒目地声明你的修改及标注修改日期。 +　　b)你必须使你分发或发布的作品，部分或全部包含本程式或其派生作品，允许第三方在本协议约束下使用，并不得就授权收费。 +　　c)如果修改后的程序通常在运行时通过交互方式获取命令，你应该让它进入交互模式时显示简要的版权声明和免责声明（抑或者你的品质担保声明），以及告诉用户可以在本协议约束下再发布该程序并提供查阅本协议的途径。（例外：如果本程式有交互式执行却通常不显示任何声明，则对你的派生作品也不作此要求。） +　　上述要求对修改后的作品整体有效。如果该作品中某些可划定的部分并非派生自本程式，并可以被合理地看作是从中分离的独立作品，则当你将它们分开发布时，这种独立部分可以不受本协议约束。但是，在你将这些部分和你修改后的作品一起发布时，整个套件将受本协议约束，本协议对其他许可获得者的授权将延伸至整个作品，即套件的每一部分，不管是谁写的。 + +　　三、你可以在上述条款约束下以目标码或可执行文件的形式复制和分发本程式（或条款二所说的派生作品），不过你还要满足以下要求之一： +　　a)附上相应的源码。源码要求完整且机器可读，并在条款一、二的约束下通过常用的软件交换媒介分发。 +　　b)附上至少三年有效的书面报价表以供第三方付费获取相应的源码。源码要求完整且机器可读，并在条款一、二的约束下通过常用的软件交换媒介分发，费用不得超过实际的分发成本。 +　　c)附上你所收到的获取源码途径的信息。（该选择只适用于非商业分发,并且你只收到目标码或可执行文件以及满足b项要求的报价单的情况下。） +　　作品的源码指其可修改的首选形式。对可执行的作品而言，完整的源码指其包含的所有模块的源码、相关接口定义文档以及编译和安装所需脚本。然而，有一种例外情况，分发的源码不必包含那些通常会随会目标运行环境的操作系统的主要部件（编译器、内核等）发布的内容（以源码或二进制形式），除非这些部件自身是本程式的一部分。 +　　如果以指定特定复制地点的形式分发可执行文件或目标码，则在同一地点提供对等源码复制途径也算一种源码分发手段，即便不强求第三方在复制目标码的同时复制源码。 + +　　四、在本协议授权之外，你不能复制、修改、再授权或分发本程式。任何用其他方法复制、修改、再授权或分发本程式的企图都是无效的，并使你从本协议获得的权利自动终止。然而从你那按本协议获得副本和许可的人，只要继续遵守协议，他们获得的许可并不会终止。 + +　　五、你没有在此协议上签字，也不是非要接受它不可。但是，此外没人可授权你去修改或分发本程式或其派生作品。此种行为为法律所不容，除非你接受本协议。因此，修改或发布本程式（或本程式的任何派生作品），就表明你已经接受本协议，即接受它的所有关于复制、分发和修改本程式及其派生的条款。 + +　　六、每当你再发布本程式（或本程式的任何派生作品），接收者自动从原始权利人获得本许可，以复制、分发和修改本程式。你不可以对他们获得的权利加以进一步的限制，你也没有要求第三方遵守该协议的义务。 + +　　七、如果因为法庭裁决或专利侵权指控或其他原因（不限于专利事宜），你面临与本协议条款冲突的条件（来自于法庭要求、协议或其他），那也不能成为你违背本协议的理由。倘若你不能在发布本程式时同时满足本协议和其他文件的要求，你就不能发布本程式。例如某专利授权不允许通过你直接或间接地获得本程式的人在不付授权费的前提下再发布本程式，唯一能同时满足它和本协议要求的做法便是不发布本程式。 +　　如果本条款在特定环境下无效或无法实施，本条款的其他部分仍适用且本条款整体在其他环境下仍适用。 +　　本条款的目的不在于诱使你去侵犯专利或其他产权要求，抑或者对之抗辩。本条款的根本目的是保护自由软件发布系统的完整性，而这要通过应用公共许可证实现。借助同样出自该系统的应用程序，许多人已经对在该系统上发布的软件作出了广泛而慷慨的贡献。作者/捐赠人有权确定是否通过其他渠道发布软件，被授权人不得干预其选择。 +　　本条款旨在彻底阐明其余条款所带来的当然结果。 + +　　八、如果由于专利或受版权保护的接口的问题，分发或使用本程式在某些国家受到限制，原始版权持有人在其程式中使用本协议时可以附加明确的区域分发限制以排除那些国家，以支持此外地区的分发。在此情况下，这种限制条款将纳入协议之中。 + +　　九、自由软件联盟可能会不定时发布GNU通用公共许可协议的修订版或新版。新版将秉承当前版本的精神，但对问题或事项的描述细节不尽相同。 +　　每一版都会有不同的版本号，如果本程式指定其使用的协议版本以及“任何更新的版本”，你可以选择遵守该版本或者任何更新的版本的条款。如果本程式没有指定协议版本，你可以选用自由软件联盟发布的任意版本。 + +　　十、如果你希望将本程式的某部分并入采取不同发布条件的自由软件中，应书面请求其作者的许可。对于自由软件联盟持有版权的软件，还应向联盟提出书面请求，我们有时会作例外处理。在处理这种事情时我们秉承两大宗旨：保持所有自由软件派生作品的自由属性，以及在整体上促进软件的共享和复用。 + +不提供品质担保 +　　十一、本程式为免费授权，故在适用法律范围内不提供品质担保。除非另作书面声明，版权持有人及其他程式提供者“概”不提供任何显式或隐式的品质担保，品质担保所指包括而不仅限于有经济价值和适合特定用途的保证。全部风险，如程式的质量和性能问题，皆由你承担。若程式出现缺陷，你将承担所有必要的修复和更正服务的费用。 + +　　十二、除非适用法律或书面协议要求，任何版权持有人或本程式按本协议可能存在的第三方修改和再发布者，都不对你的损失负有责任，包括由于使用或者不能使用本程式造成的任何一般的、特殊的、偶发的或重大的损失（包括而不仅限于数据丢失、数据失真、你或第三方的后续损失、其他程序无法与本程序协同运作），即使那些人声称会对此负责。 + +【附录：如何将上述条款应用到你的新程序】 +　　如果你开发了一个新程序，并希望它能最大限度地为公众所使用，最好的办法是将其作为自由软件，以使每个人都能在本协议约束下对其再发布及修改。 +　　为此，请在附上以下声明。最安全的做法是将其附在每份源码的开头，以便于最有效地传递免责信息。同时，每个文件至少包含一处“版权”声明和一个协议全文的链接。 + +　　用一行来标明程序名及其作用。 + +　　版权所有（C）年份 姓名 +　　本程序为自由软件，在自由软件联盟发布的GNU通用公共许可协议的约束下，你可以对其进行再发布及修改。协议版本为第二版或（随你）更新的版本。 +　　我们希望发布的这款程序有用，但不保证，甚至不保证它有经济价值和适合特定用途。详情参见GNU通用公共许可协议。 +　　你理当已收到一份GNU通用公共许可协议的副本，如果没有，请致信自由软件基金会：51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA + +　　同时提供你的电子邮件地址或传统的邮件联系方式。 + +　　如果该程序是交互式的，让它在交互模式下输出类似下面的一段声明： + +　　Gnomovision 第69版，版权所有（C）年份 姓名 +　　Gnomovision从未提供品质担保，输入'show w'可查看详情。这是款自由软件，欢迎你在满足一定条件后对其再发布，输入'show c'可查看详情。 + +　　例子中的命令'show w'和'show c'应用于显示GNU通用公共许可协议相应的部分。当然你也可以因地制宜地选用别的命令乃至点击操作。 + +　　如果你之上存在雇主（你是码农）或校方，你还应当让他们在必要时为此程序签署放弃版权声明。以下有例子： + +　　Yoyodyne公司，在此放弃对James Hacker所写的'Gnomovision'程序所享有的版权利益。 +　　Ty Coon 签字，1989年4月1日 +　　Ty Coon 副总裁 + +　　本GNU通用公共许可协议不允许把你的程序并入私有程序。如果你的程序是某种库，且你想允许它被私有程序链接而使之更有用，请使用GNU较宽松通用公共许可协议。 + + +翻译：阮坤良 +校对：汪蔚，和丹 + +译注： +[1] distribute既译作分发也译作发布，前者强调转发，后者强调公布。 +[2] license既译作协议也译作许可，前者强调此文本，后者强调内容。 +[3] 首字母大写的Program译作程式，首字母小写的program译作程序。 + +参考： +[繁体中文译本] https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html \ No newline at end of file diff --git a/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt b/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt index f0b6e894b..7d5076910 100644 --- a/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt +++ b/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt @@ -1,200 +1,98 @@ - [IMG] - - Software Liberty Association of Taiwan - - - º¶ - - ³Ì·s®ø®§ - - ¬¡°Ê®ø®§ - - ¦³Ãö¨ó·| - - ¨ó·|¦æ¨Æ¾ä - - ®Õ¶é¦Û¥Ñ³nÅépµe - - LIY ¾Ç¶é - - ½u¤W¹Ï®ÑÀ] - - ±M®×pµe - - ³q«H½×¾Â - - ¶}©ñ·½½X¤u§@¾÷·| - (2004/02/05 §ó·s) - - ¨ó·| FAQ - - ¬ÛÃöºô¯¸ - - ·|°T¶é¦a - - ùº¿¤s±MÄæ - - »Ýn±zªºÀ°§U - - GNU ³q¥Î¤½¦@±ÂÅv - - ¡]ÁcÅ餤¤å°Ñ¦Òª©¡^ - - 1991¦~6¤ë¡A²Ä¤Gª© - - ¡]ì¤å¥X³B: http://www.gnu.org/copyleft/gpl.html¡^ - - µÛ§@Åv©Ò¦³ (C) 1989¡A1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ¤¹³\¨CÓ¤H½Æ»s©M´²¥¬¥»±ÂÅv¤å¥óªº§¹¾ã°Æ¥»¡A - - ¦ý¤£¤¹³\¹ï¥¦¶i¦æ¥ô¦óקï¡C - - Án©ú - - This is an unofficial translation of the GNU General Public License into - Chinese. It was not published by the Free Software Foundation, and does - not legally state the distribution terms for software that uses the GNU - GPL--only the original English text of the GNU GPL does that. However, we - hope that this translation will help Chinese speakers understand the GNU - GPL better. - - ³o¬O¤@¥÷ GNU - ³q¥Î¤½¦@±ÂÅv«D¥¿¦¡ªº¤¤¤å½Ķ¡C¥¦¨Ã«D¥Ñ¦Û¥Ñ³nÅé°òª÷·|©Òµoªí¡A¥ç«D¨Ï¥Î GNU - ³q¥Î¤½¦@±ÂÅvªº³nÅ骺ªk©w´²¥¬±ø´Ú¢w¥u¦³ GNU - ³q¥Î¤½¦@±ÂÅv^¤åì¤åªºª©¥»©l¨ã¦³¦¹µ¥®Ä¤O¡CµM¦Ó¡A§Ú̧Ʊæ³o¥÷½Ķ¯àÀ°§U¤¤¤åªº¨Ï¥ÎªÌ§ó¤F¸Ñ - GNU ³q¥Î¤½¦@±ÂÅv¡C - - «e¨¥ - - ¤j¦h¼Æ³nÅé±ÂÅvÁn©ú¬O³]p¥Î¥Hé¹Ü±z¤À¨É»Pקï³nÅ骺¦Û¥Ñ¡C¬Û¤Ï¦a¡AGNU³q¥Î¤½¦@±ÂÅv¤O¹Ï«OÃÒ±z¤À¨É»Pקï¦Û¥Ñ³nÅ骺¦Û¥Ñ¡X½T«O³nÅé¹ï©Ò¦³ªº¨Ï¥ÎªÌ¦Ó¨¥³£¬O¦Û¥Ñªº¡C³q¥Î¤½¦@±ÂÅv¾A¥Î©ó¤j¦h¼Æ¦Û¥Ñ³nÅé°òª÷·|ªº³nÅé¡A¥H¤Î¥ô¦ó§@ªÌ«ü©w¨Ï¥Î¥»±ÂÅvªº¨ä¥L³nÅé¡C¡]¦³¨Ç¦Û¥Ñ³nÅé°òª÷·|ªº³nÅé¡A«h¾A¥ÎGNU¨ç¦¡®w³q¥Î¤½¦@±ÂÅv³W©w¡C¡^±z¤]¥i¥HÅý±zªº³nÅé¾A¥Î¥»±ÂÅv³W©w¡C - - ·í§Ú̦b½Í½×¦Û¥Ñ³nÅé®É¡A§ÚÌ©Ò«üªº¬O¦Û¥Ñ¡A¦Ó«D»ù®æ¡C§Ú̪º³q¥Î¤½¦@±ÂÅv«Y³]p¥Î¥H½T«O¨Ï±z«O¦³´²¥¬¦Û¥Ñ³nÅé«»sª«ªº¦Û¥Ñ¡]¥H¤Î±z¥i¥H¨M©w¦¹¤@ªA°È¬O§_¦¬¶O¡^¡A½T«O±z¯à¦¬¨ì·½½X©ÎªÌ¦b±z»Ýn®É«K¯à±o¨ì¥¦¡A½T«O±z¯àÅܧó³nÅé©Î±N¥¦ªº¤@³¡¤À¥Î©ó·sªº¦Û¥Ñ³nÅé¡F¨Ã¥B½T«O±zª¾¹D±z¥i¥H±q¨Æ¤Wzªº¨Æ±¡¡C - - ¬°¤F«O»Ù±zªºÅv§Q¡A§ÚÌ»Ýn§@¥X¨î¡G¸T¤î¥ô¦ó¤H§_»{±z¤WzªºÅv§Q¡A©ÎªÌn¨D±z©ñ±ó³o¨ÇÅv§Q¡C¦pªG±z´²¥¬³nÅ骺°Æ¥»¡A©ÎªÌ¹ï¤§¥[¥Hקï¡A³o¨Ç¨î´NÂà¤Æ¦¨¬°±zªº³d¥ô¡C - - ¨Ò¦p¡A°²¦p±z´²¥¬¦¹Ãþµ{¦¡ªº°Æ¥»¡AµL½×¬O§K¶O©Î¦¬¨ú¶O¥Î¡A±z¥²¶·±N±z©Ò¨É¦³ªº¤@¤ÁÅv§Q¥æ¥I¦¬¨üªÌ¡C±z¤]¥²¶·½T«O¥L̯ব¨ì©Î±o¨ì·½½X¡C¦Ó¥B±z¥²¶·¦V¥LÌ®i¥Ü³o¨Ç±ø´Úªº¤º®e¡A¨Ï¥L̪¾±x¥L̩Ҩɦ³ªºÅv§Q¡C - - §Ú̱Ĩú¨â¶µ±¹¬I¨Ó«OÅ@±zªºÅv§Q¡G(1)¥HµÛ§@Åv«OÅ@³nÅé¡A¥H¤Î(2)´£¨Ñ±z¥»±ÂÅv¡A½á»P±z½Æ»s¡B´²¥¬¤Î¡þ©Îקï³nÅ骺ªk«ß³\¥i¡C - - ¦P®É¡A¬°¤F«OÅ@§@ªÌ»P§ÚÌ¡]«ö¡G«ü¦Û¥Ñ³nÅé°òª÷·|¡^¡A§Ú̧Ʊæ½T©w¨CÓ¤H³£©úÁA¡A¦Û¥Ñ³nÅé¬O¨S¦³¾á«O³d¥ôªº¡C¦pªG³nÅé³Q¥L¤Hקï¨Ã¥[¥H¶Ç»¼¡A§ÚÌ»Ýn¨ä¦¬¨üªÌª¾¹D¡A¥LÌ©Ò±o¨ìªº¨Ã«Dì³nÅé¡A¦]¦¹¥Ñ¥L¤H©Ò¤Þ¥Xªº¥ô¦ó°ÝÃD¹ïì§@ªÌªºÁnÅA±N¤£·|¦³¥ô¦óªº¼vÅT¡C - - ³Ì«á¡A©Ò¦³¦Û¥Ñ³nÅ餣Â_¦a¨ü¨ì³nÅé±M§Qªº«Â¯Ù¡C§Ú̧Ʊæ¯àÁקK¦Û¥Ñ³nÅ骺¦A´²¥¬ªÌ¥HÓ¤H¦W¸q¨ú±o±M§Q±ÂÅv¦Ó¨Ïµ{¦¡±M¦³¤Æªº·ÀI¡C¬°¤F¨¾¤î¤Wzªº±¡¨Æµo¥Í¡A§Ú̦b¦¹©ú½TÁn©ú¡G¥ô¦ó±M§Q³£¥²¶·¬°¤F¨CÓ¤Hªº¦Û¥Ñ¨Ï¥Î¦Ó®Öã¡A§_«h´N¤£À³±Â»P±M§Q¡C - - ¥H¤U¬O¦³Ãö½Æ»s¡B´²¥¬¤Îק諸©ú½T±ø´Ú¤Î±ø¥ó¡C - - ½Æ»s¡B´²¥¬»Pק諸±ø´Ú»P±ø¥ó - - 0. - ¤ZµÛ§@Åv¤H¦b¨äµ{¦¡©Î¨ä¥LµÛ§@¤¤Án©ú¡A¸Óµ{¦¡©ÎµÛ§@±o¦b³q¥Î¤½¦@±ÂÅv±ø´Ú¤U´²¥¬¡A¥»±ÂÅv¹ï¨ä§¡¦³¾A¥Î¡C¥H¤U©ÒºÙªº¡u¥»µ{¦¡¡v¡A«Y«ü¥ô¦ó¤@ºØ¾A¥Î³q¥Î¤½¦@±ÂÅvªºµ{¦¡©ÎµÛ§@¡F¡u°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡v¡A«h«ü¥»µ{¦¡©Î¥ô¦ó°ò©óµÛ§@Åvªk©Ò²£¥Íªºl¥ÍµÛ§@¡A´«¨¥¤§¡A«Y«ü¥]§t¥»µ{¦¡¥þ³¡©Î¤@³¡ªºµÛ§@¡A¤£½×¬O§¹¾ãªº©Î¸g¹Lק諸µ{¦¡¡A¥H¤Î¡]©Î¡^½Ķ¦¨¨ä¥L»y¨¥ªºµ{¦¡¡]¥H¤U¡uקï¡v¤@µü¥]¬A¦ý¤£©ó½Ķ¦æ¬°¦b¤º¡^¡C³Q±ÂÅv¤H«hºÙ¬°¡u±z¡v¡C - - ¥»±ÂÅv¤£¾A¥Î©ó½Æ»s¡B´²¥¬»Pקï¥H¥~ªº¦æ¬°¡F³o¨Ç¦æ¬°¤£¦b¥»±ÂÅv½d³ò¤º¡C°õ¦æ¥»µ{¦¡ªº¦æ¬°¨Ã¤£¨ü¨î¡A¦Ó¥»µ{¦¡ªº¿é¥X¥u¦³¦b¨ä¤º®eºc¦¨°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡]¦Ó«D¥u¬O¦]¬°°õ¦æ¥»µ{¦¡©Ò³y¦¨¡^®É¡A©l¨ü¥»±ÂÅv©ë§ô¡C¦Ü©óµ{¦¡ªº¿é¥X¤º®e¬O§_ºc¦¨¥»µ{¦¡ªºl¥ÍµÛ§@¡A«h¨ú¨M©ó¥»µ{¦¡ªº¨ãÅé¥Î³~¡C - - 1. - ±z¥i¥H¹ï©Ò¦¬¨üªº¥»µ{¦¡·½½X¡AµL½×¥H¦óºØ´C¤¶¡A½Æ»s»P´²¥¬¨ä§¹¾ãªº«»sª«¡AµM¦Ó±z¥²¶·²Å¦X¥H¤Un¥ó¡G¥HÅãµÛ¤Î¾A·íªº¤è¦¡¦b¨C¤@¥÷«»sª«¤Wµo§G¾A·íªºµÛ§@Åv¼Ð¥Ü¤ÎµL¾á«OÁn©ú¡Fºû«ù©Ò¦³¦³Ãö¥»±ÂÅv¥H¤ÎµL¾á«OÁn©úªºì»ª¡F¨Ã±N¥»±ÂÅvªº°Æ¥»³s¦P¥»µ{¦¡¤@¨Ö¥æ¥I¤©¨ä¥L¥ô¤@¦ì¥»µ{¦¡ªº¦¬¨üªÌ¡C - - ±z¥i¥H¹ïÅý»P«»sª«ªº¹ê»Ú¦æ¬°½Ð¨D¤@©wªº¶O¥Î¡A±z¤]¥i¥H¦Û¥Ñ¨M©w¬O§_´£¨Ñ¾á«O¥H§@¬°¹ï»ùªº¥æ´«¡C - - 2. - ±z¥i¥Hק糧µ{¦¡ªº¤@өμÆÓ«»sª«©ÎªÌ¥»µ{¦¡ªº¥ô¦ó³¡¥÷¡A¥H¦¹§Î¦¨°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡A¨Ã¨Ì«ez²Ä¤@±ø³W©w¡A½Æ»s»P´²¥¬¦¹¤@קï¹Lªºµ{¦¡©ÎµÛ§@¡A¦ý±z¥²¶·²Å¦X¥H¤Un¥ó¡G - - (a) - ±z¥²¶·¦b©Òק諸ÀɮפWªþ¥[ÅãµÛªº¼Ð¥Ü¡A±Ô©ú±zקï¹L³o¨ÇÀɮסA¥H¤Îקï¤é´Á¡C - - (b) - ±z¥²¶·´N±z©Ò´²¥¬©Îµo¦æªºµÛ§@¡AµL½×¬O¥]§t¥»µ{¦¡¥þ³¡©Î¤@³¡ªºµÛ§@¡A©ÎªÌ¬O¦Û¥»µ{¦¡©Î¨ä¥ô¦ó³¡¥÷©Òl¥ÍªºµÛ§@¡A¾ãÅé±ÂÅv©Ò¦³²Ä¤T¤H¨Ì¥»±ÂÅv³W©w¨Ï¥Î¡A¥B¤£±o¦]¦¹¶µ±ÂÅv¦æ¬°¦Ó¦¬¨ú¥ô¦ó¶O¥Î¡C - - (c) - Y¸g¹Lק諸µ{¦¡¦b°õ¦æ®É³q±`¥H¤¬°Ê¤è¦¡Åª¨ú©R¥O®É¡A±z¥²¶·¦b³Ì±`³Q¨Ï¥Îªº¤è¦¡¤U¡A©ó¶}©l¶i¤J³oºØ¤¬°Ê¦¡¨Ï¥Î®É¡A¦C¦L©Î®i¥Ü¥H¤U«Å§i¡G¾A·íªºµÛ§@Åv¼Ð¥Ü¤ÎµL¾á«OÁn©ú¡]©ÎªÌÁn©ú±z´£¨Ñ¾á«O¡^¡B¨Ï¥ÎªÌ¥i¥H¨Ì³o¨Ç±ø¥ó¦A´²¥¬¦¹µ{¦¡¡A¥H¤Î§iª¾¨Ï¥ÎªÌ¦p¦óÂsÄý¥»±ÂÅvªº°Æ¥»¡C¡]¨Ò¥~¡GY¥»µ{¦¡¥»¨«Y¥H¤¬°Êªº¤è¦¡°õ¦æ¡AµM¦Ó³q±`«o¤£·|¦C¦L¸Ó«Å§i®É¡A«h±z°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@«KµL»Ý¦C¦L¸Ó«Å§i¡C¡^ - - ³o¨Çn¨D¹ïקï¹LªºµÛ§@¬O¾ãÅé¾A¥Îªº¡CÕµÛ§@¤¤¥iÃѧOªº¤@³¡¥÷¨Ã«Dl¥Í¦Û¥»µ{¦¡¡A¨Ã¥B¥i¥H¦X²z¦a»{¬°¬O¤@¿W¥ßªº¡BÓ§OªºµÛ§@¡A«h·í±z±N¨ä§@¬°Ó§OµÛ§@¥[¥H´²¥¬®É¡A¥»±ÂÅv¤Î¨ä±ø´Ú±N¤£¾A¥Î©ó¸Ó³¡¤À¡CµM¦Ó·í±z±N¤Wz³¡¤À¡A§@¬°°ò©ó¥»µ{¦¡©Ò¥ÍµÛ§@ªº¤@³¡¦Ó´²¥¬®É¡A¾ãÓµÛ§@ªº´²¥¬¥²¶·²Å¦X¥»±ÂÅv±ø´Úªº³W©w¡A¦Ó¥»±ÂÅv¹ï©ó¨ä¥L³Q±ÂÅv¤H©Ò¬°ªº³\¥i¤Î©óµÛ§@¾ãÅé¡C - - ¦]¦¹¡A¥»±ø³W©wªº·N¹Ï¤£¦b©ó¥D±i©Îé¹Ü±z¹ï©ó§¹¥þ¥Ñ±z©Ò§¹¦¨µÛ§@ªºÅv§Q¡FÀ³¸Ó»¡¡A¥»±ø³W©w·N¦b¦æ¨Ï¹ï°ò©óµ{¦¡©Ò¥Íªº¤§l¥ÍµÛ§@©Î¶°¦XµÛ§@´²¥¬¦æ¬°ªº±±¨îÅv¡C - - ¦¹¥~¡A«D°ò©ó¥»µ{¦¡©Ò¥Íªº¨ä¥LµÛ§@»P¥»µ{¦¡¡]©Î°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^¦b¦P¤@Àx¦s©Î´²¥¬ªº´C¤¶¤Wªº³æ¯Â»E¶°¦æ¬°¡A¨Ã¤£·|¨Ï¸ÓµÛ§@¦]¦¹¨ü¥»±ÂÅv±ø´Ú©ë§ô¡C - - 3. - ±z¥i¥H¨Ì«ez²Ä¤@¡B¤G±ø³W©w¡A½Æ»s»P´²¥¬¥»µ{¦¡¡]©Î²Ä¤G±ø©Òz°ò©ó¥»µ{¦¡©Ò²£¥ÍªºµÛ§@¡^ªº¥Øªº½X©Î¥i°õ¦æ§Î¦¡¡A¦ý±z¥²¶·²Å¦X¥H¤Un¥ó¡G - - (a) - ªþ¤W§¹¾ã¡B¬Û¹ïÀ³ªº¾÷¾¹¥i§PŪ·½½X¡A¦Ó³o¨Ç·½½X¥²¶·¨Ì«ez²Ä¤@¡B¤G±ø³W©w¦b¸g±`¥Î¥H§@¬°³nÅé¥æ´«ªº´C¤¶ª«¤W´²¥¬¡F©Î - - (b) - ªþ¤W¦Ü¤Ö¤T¦~¦³®Äªº®Ñ±³ø»ù¤å¥ó¡A´£¨Ñ¥ô¦ó²Ä¤T¤H¦b¤ä¥I¤£¶W¹L¹ê»Ú´²¥¬·½½X©Ò»Ý¦¨¥»ªº¶O¥Î¤U¡A¨ú±o¬Û¦P·½½Xªº§¹¾ã¾÷¾¹¥iŪ«»sª«¡A¨Ã¨Ì«ez²Ä¤@¡B¤G±ø³W©w¦b¸g±`¥Î¥H§@¬°³nÅé¥æ´«ªº´C¤¶ª«¤W´²¥¬¸Ó«»sª«¡F©Î - - (c) - ªþ¤W±z©Ò¦¬¨ü¦³Ãö´²¥¬¬Û¦P·½½Xªº³ø»ù¸ê°T¡C¡]¥»¶µ¿ï¾Ü¶È¦b«DÀç§Q´²¥¬¡B¥B¶È¦b±z¨Ì«ezb¶µ¤è¦¡¦Û¸Ó®Ñ±³ø»ù¤å¥ó¦¬¨üµ{¦¡¥Øªº½X©Î¥i°õ¦æ§Î¦¡®É¡A©l¦³¾A¥Î¡C¡^ - - µÛ§@ªº·½½X¡A¬O«ü¹ïµÛ§@¶i¦æקï®É¾A¥Îªº§Î¦¡¡C¹ï©ó¤@Ó¥i°õ¦æªºµÛ§@¦Ó¨¥¡A§¹¾ãªº·½½X¬O«üµÛ§@¤¤©Ò¥]§t©Ò¦³¼Ò²Õªº¥þ³¡·½½X¡A¥[¤W¬ÛÃö¤¶±ªº©w¸qÀÉ¡AÁÙ¥[¤W¥Î¥H±±¨î¸ÓµÛ§@½sö»P¦w¸Ëªº´yz¡CµM¦Ó¡A¯S§Oªº¨Ò¥~±¡ªp¬O¡A©Ò´²¥¬ªº·½½X¨Ã¤£»Ý¥]§t¥ô¦ó³q±`·|ÀHµÛ©Ò°õ¦æ§@·~¨t²Îªº¥Dn²Õ¦¨³¡¤À¡]½sĶ¾¹¡B®Ö¤ßµ¥µ¥¡^¦Ó´²¥¬ªº³nÅé¡]µL½×¥H·½½X©Î¤G¶i¦ì®æ¦¡¡^¡A°£«D¸Ó³¡¤À¥»¨§Yªþ¥[¦b¥i°õ¦æµ{¦¡¤¤¡C - - Y¥i°õ¦æ½X©Î¥Øªº½Xªº´²¥¬¤è¦¡¡A¬O¥H«ü©wªº¦aÂI´£¨Ñ¦s¨ú¦ì¸m¨Ñ¤H½Æ»s¡A«h´£¨Ñ¥i¦Û¬Û¦P¦aÂI½Æ»s·½½Xªº¨Ï¥Î¾÷·|¡Aµø¦P¹ï©ó·½½Xªº´²¥¬¡AµM¦Ó²Ä¤T¤H¨Ã¤£¦]¦¹¦Ót¦³±N¥Øªº½X³s¦P·½½X¤@¨Ö½Æ»sªº¸q°È¡C - - 4. - °£¥»±ÂÅv©Ò©ú¥Üªº¤è¦¡¥~¡A±z¤£±o¹ï¥»µ{¦¡¥[¥H½Æ»s¡Bקï¡B¦A±ÂÅv©Î´²¥¬¡C¥ô¦ó¸Õ¹Ï¥H¨ä¥L¤è¦¡¶i¦æ½Æ»s¡Bקï¡B¦A±ÂÅv©ÎªÌ´²¥¬¥»µ{¦¡ªº¦æ¬°§¡¬°µL®Ä¡A¨Ã¥B±N¦Û°Ê²×¤î±z°ò©ó¥»±ÂÅv©Ò±o¨É¦³ªºÅv§Q¡CµM¦Ó¡A¨Ì¥»±ÂÅv³W©w¦Û±z¤â¤¤¦¬¨ü«»sª«©ÎÅv§Q¤§¤H¡A¥un¿í¦u¥»±ÂÅv³W©w¡A¥LÌ©ÒÀò±oªº±ÂÅv¨Ã¤£·|¦]¦¹²×¤î¡C - - 5. - ¦]¬°±z¨Ã¥¼¦b¥»±ÂÅv¤Wñ¦W¡A©Ò¥H±zµL¶·±µ¨ü¥»±ÂÅv¡CµM¦Ó¡A°£¦¹¤§¥~±z§OµL¨ä¥Lקï©Î´²¥¬¥»µ{¦¡©Î¨äl¥ÍµÛ§@ªº±ÂÅv³\¥i¡CY±z¤£±µ¨ü¥»±ÂÅv¡A«h³o¨Ç¦æ¬°¦bªk«ß¤W³£¬O³Q¸T¤îªº¡C¦]¦¹¡AÂǥѹ糧µ{¦¡¡]©Î¥ô¦ó°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^ªº×§ï©Î´²¥¬¦æ¬°¡A±zªí¥Ü¤F¹ï©ó¥»±ÂÅvªº±µ¨ü¡A¥H¤Î±µ¨ü©Ò¦³Ãö©ó½Æ»s¡B´²¥¬©Îק糧µ{¦¡©Î°ò©ó¥»µ{¦¡©Ò¥ÍµÛ§@ªº±ø´Ú»P±ø¥ó¡C - - 6. - ¨C·í±z¦A´²¥¬¥»µ{¦¡¡]©Î¥ô¦ó°ò©ó¥»µ{¦¡©Ò¥ÍªºµÛ§@¡^®É¡A¦¬¨üªÌ§Y¦Û°ÊÀò±oì±ÂÅv¤H©Ò±Â¤©¨Ì¥»±ÂÅv±ø´Ú»P±ø¥ó½Æ»s¡B´²¥¬©Îק糧µ{¦¡ªºÅv§Q¡C±z¤£±o´N¥»±ÂÅv©Ò½á¤©¦¬¨üªÌ¦æ¨ÏªºÅv§Qªþ¥[¥ô¦ó¶i¤@¨Bªº¨î¡C±z¹ï©ó²Ä¤T¤H¬O§_¼i¦æ¥»±ÂÅv¤@¨Æ¡AµL¶·t³d¡C - - 7. - Yªk°|§P¨M¡B±M§Q«IÅv¥D±i©ÎªÌ¨ä¥L¥ô¦ó²z¥Ñ¡]¤£©ó±M§Qª§Ä³¡^ªºµ²ªG¡A¨Ï±o¥[½Ñ©ó±zªº±ø¥ó¡]µL½×¬O¥Ñªk°|©R¥O¡B¨óij©Î¨ä¥L¤è¦¡³y¦¨¡^»P¥»±ÂÅv³W©w¦³©Ò½Ä¬ð¡A¥L̨䣧K°£±z¹ï©ó¥»±ÂÅv³W©wªº¿í¦u¡CY±zµLªk¦P®É²Å¦X¨Ì¥»±ÂÅv©Ò¥Í¸q°È¤Î¨ä¥L¬ÛÃö¸q°È¦Ó¶i¦æ´²¥¬¡A¨º»ò¨äµ²ªG«K¬O±z¤£±o´²¥¬¸Óµ{¦¡¡C¨Ò¦p¡AY±M§Q±ÂÅv¤£¤¹³\ª½±µ©Î¶¡±µ³z¹L±z¦Ó¨ú±o«»sª«¤§¤H¡A¥H§K¥IÅv§Qª÷ªº¤è¦¡¦A´²¥¬¸Óµ{¦¡®É¡A±z°ß¤@¯à¦P®Éº¡¨¬¸Ó¸q°È¤Î¥»±ÂÅvªº¤è¦¡´N¬O¹ý©³ÁקK¶i¦æ¸Óµ{¦¡ªº´²¥¬¡C - - Y¥»±ø¥ô¤@³¡¥÷¦b¯S®í±¡ªp¤U³Q»{©wµL®Ä©ÎµLªk°õ¦æ®É¡A¥»±ø¨ä¾l³¡¤À¤´À³¾A¥Î¡A¥B¥»±ø¥þ³¡©ó¨ä¥L±¡ªp¤U¤´À³¾A¥Î¡C - - ¥»±øªº¥Øªº¨Ã¤£¦b»¤¨Ï±z«I®`±M§Q©Î¨ä¥L°]²£ÅvªºÅv§Q¥D±i¡A©Î´N¦¹Ãþ¥D±iªº¦³®Ä©Ê¥[¥Hª§°õ¡F¥»±øªº°ß¤@¥Øªº¡A¬O¦b«O»ÙÂǥѤ½¦@±ÂÅvºD¨Ò©Ò°õ¦æ¦Û¥Ñ³nÅé´²¥¬¨t²Îªº§¹¾ã©Ê¡C³\¦h¤H«H¿à¸Ó¨t²Î¤@³e¨Ï¥ÎªºÀ³¥Îµ{¦¡¡A¦Ó¹ï¸g¥Ñ¦¹¨t²Î´²¥¬ªº¤j¶q³nÅ馳¬Û·í¦hªº°^Äm¡F§@ªÌ¡þ°^ÄmªÌ¦³Åv¨M©w¥L©Î¦o¬O§_§Æ±æ¸g¥Ñ¨ä¥Lªº¨t²Î´²¥¬³nÅé¡A¦Ó³Q±ÂÅv¤H«hµL¸ÓºØ¿ï¾ÜÅv¡C - - ¥»±øªº¥Î·N¦b©ó±N¥»±ÂÅv¨ä¥L¤£½T©wªº³¡¤À¹ý©³¸ÑÄÀ²M·¡¡C - - 8. - Y¦]¬°±M§Q©Î¨É¦³µÛ§@Åv«OÅ@ªº¤¶±°ÝÃD¡A¦Ó¨Ï±o¥»µ{¦¡ªº´²¥¬»P¡þ©Î¨Ï¥Î«]©ó¬Y¨Ç°ê®a®É¡A«h±N¥»µ{¦¡¸m©ó¥»±ÂÅv³W½d¤§¤UªºìµÛ§@Åv¤H±o¼W¦C©ú½Tªº´²¥¬¦a°Ï¨î±ø´Ú¡A±N¸Óµ¥°ê®a±Æ°£¦b¥~¡A¦Ó¨Ï´²¥¬ªº³\¥i¥u¦b¥¼¨ü±Æ°£ªº°ê®a¤§¤º©Î¤§¤¤¡C¦b¸Óµ¥±¡ªp¤U¡A¸Ó¨î±ø´Ú¦p¦P¥H®Ñ±¤è¦¡q©w©ó¥»±ÂÅv¤º®e¤¤¡A¦Ó¦¨¬°¥»±ÂÅvªº±ø´Ú¡C - - 9. - ¦Û¥Ñ³nÅé°òª÷·|±oÀH®Éµoªí³q¥Î¤½¦@±ÂÅvªº×¥¿ª©»P¡þ©Î·sª©¥»¡C·sª©¥»¦bºë¯«¤W±Nªñ¦ü©ó¥Ø«eªºª©¥»¡AµM¦Ó¦b²Ó¸`¤W©Î©Ò¤£¦P¥H¦]À³·sªº°ÝÃD©Îª¬ªp¡C - - ¨C¤@Óª©¥»³£¦³Ó§Oªºª©¥»¸¹½X¡CY¥»µ{¦¡«ü©w¦³±ÂÅvª©¥»¸¹½X¡Aªí¥Ü¨ä¾A¥Î¸Óª©¥»©Î¬O¡u¥ô¦ó·sª©¥»¡v®É¡A±z±o¿ï¾Ü¿í´`¸Óª©¥»©Î¥ô¦ó¥Ñ¦Û¥Ñ³nÅé°òª÷·|¤é«á©Òµoªí·sª©¥»ªº±ø´Ú»P±ø¥ó¡CY¥»µ{¦¡¨Ã¥¼«ü©w±ÂÅvª©¥»¸¹½X®É¡A±z«K±o¿ï¾Ü¥ô¤@¦Û¥Ñ³nÅé°òª÷·|©Òµoªíªºª©¥»¡C - - 10. - Y±z·Q±N³¡¤À¥»µ{¦¡¯Ç¤J¨ä¥L¦Û¥Ñµ{¦¡¡A¦Ó¨ä´²¥¬ªº±ø¥ó¦³©Ò¤£¦P®É¡A½Ð¼g«H¨ú±o§@ªÌªº³\¥i¡CY¬°¦Û¥Ñ³nÅé°òª÷·|¨É¦³µÛ§@Åvªº³nÅé¡A½Ð¼g«H¦Ü¦Û¥Ñ³nÅé°òª÷·|¡F§Ú̦³®É·|¥H¨Ò¥~¤è¦¡¤©¥H³B²z¡C§Ú̪º¨M©w¨ú¨M©ó¨â¶µ¥Ø¼Ð¡G½T«O§Ú̦ۥѳnÅ骺©Ò¦³l¥ÍµÛ§@§¡ºû«ù¦b¦Û¥Ñªºª¬ºA¡A¨Ã¼sªx¦a«P¶i³nÅ骺¤À¨É»P¦A§Q¥Î¡C - - µL¾á«OÁn©ú - - 11. - ¥Ñ©ó¥»µ{¦¡«YµLÀv±ÂÅv¡A¦]¦¹¦bªk«ß³\¥i½d³ò¤º¡A¥»±ÂÅv¹ï¥»µ{¦¡¨Ã¤£t¾á«O³d¥ô¡C«D¸g®Ñ±Án©ú¡AµÛ§@Åv¤H»P¡þ©Î¨ä¥L´£¨Ñµ{¦¡¤§¤H¡AµL½×©ú¥Ü©ÎÀq¥Ü¡A§¡«Y¨Ì¡u²{ªp¡v´£¨Ñ¥»µ{¦¡¦Ó¨ÃµL¥ô¦ó§Î¦¡ªº¾á«O³d¥ô¡A¨ä¥]¬A¦ý¤£©ó¡A´N¾A°â©Ê¥H¤Î¯S©w¥Øªºªº¾A¥Î©Ê¬°Àq¥Ü©Ê¾á«O¡C¦³Ãö¥»µ{¦¡«~½è»P®Ä¯àªº¥þ³¡·ÀI±x¥Ñ±z©Ó¾á¡C¦p¥»µ{¦¡³QÃÒ©ú¦³·å²«¡A±zÀ³©Ó¾á©Ò¦³ªA°È¡B×´_©Î§ï¥¿ªº¶O¥Î¡C - - 12. - «D¸gªk«ßn¨D©Î®Ñ±¦P·N¡A¥ô¦óµÛ§@Åv¤H©Î¥ô¦ó¥i¯à¨Ì«ez¤è¦¡×§ï»P¡þ©Î´²¥¬¥»µ{¦¡ªÌ¡A¹ï©ó±z¦]¬°¨Ï¥Î©Î¤£¯à¨Ï¥Î¥»µ{¦¡©Ò³y¦¨ªº¤@¯ë©Ê¡B¯S®í©Ê¡B·N¥~©Ê©Î¶¡±µ©Ê·l¥¢¡A¤£t¥ô¦ó³d¥ô¡]¥]¬A¦ý¤£©ó¡A¸ê®Æ·l¥¢¡A¸ê®Æ°õ¦æ¤£ºë½T¡A©ÎÀ³¥Ñ±z©Î²Ä¤T¤H©Ó¾áªº·l¥¢¡A©Î¥»µ{¦¡µLªk»P¨ä¥Lµ{¦¡¹B§@µ¥¡^¡A§Y«K«ezªºµÛ§@Åv¤H©Î¨ä¥L¤H¤w³Q§iª¾¸Óµ¥·l¥¢ªº¥i¯à©Ê®É¡A¥ç¦P¡C - - ¡X±ø¤åµ²§ô¡X - -±zªº·sµ{¦¡¸Ó¦p¦ó±Ä¥Î³o¨Ç±ø´Ú¡H - - ¦pªG±z¶}µo¤F¤@Ó·sµ{¦¡¡A¨Ã¥B§Æ±æ¯à°÷Åý¥¦ºÉ¥i¯à¦a³Q¤j²³¨Ï¥Î¡A¹F¦¨¦¹¥Øªºªº³Ì¦n¤è¦¡´N¬OÅý¥¦¦¨¬°¦Û¥Ñ³nÅé¡A¥ô¦ó¤H¨Ì³o¨Ç±ø´Ú³W©w³£¯à´N¸Ó³nÅé¦A¬°´²¥¬¤Îקï¡C - - ¬°¤F°µ¨ì³o¤@ÂI¡A½Ð±N¥H¤UÁn©úªþ¥[¨ìµ{¦¡¤W¡C³Ì¦w¥þªº§@ªk¡A¬O±NÁn©ú©ñ¦b¨C¥÷·½½XÀɮתº°_©l³B¡A¥H¦³®Ä¶Ç¹FµL¾á«O³d¥ôªº°T®§¡F¥B¨C¥÷ÀɮצܤÖÀ³¦³¡uµÛ§@Åv¡v¦C¥H¤Î¥»¥÷Án©ú¥þ¤å¦ì¸mªº´£¥Ü¡C - - ¡q¥Î¤@¦æ´yzµ{¦¡ªº¦WºÙ»P¨ä¥Î³~²z¡r - - µÛ§@Åv©Ò¦³(c) ¡q¦~¥÷¡r¡q§@ªÌ©m¦W¡r - - ¥»µ{¦¡¬°¦Û¥Ñ³nÅé¡F±z¥i¨Ì¾Ú¦Û¥Ñ³nÅé°òª÷·|©ÒµoªíªºGNU³q¥Î¤½¦@±ÂÅv±ø´Ú³W©w¡A´N¥»µ{¦¡¦A¬°´²¥¬»P¡þ©Îקï¡FµL½×±z¨Ì¾Úªº¬O¥»±ÂÅvªº²Ä¤Gª©©Î¡]±z¦Û¦æ¿ï¾Üªº¡^¥ô¤@¤é«áµo¦æªºª©¥»¡C - - ¥»µ{¦¡«Y°ò©ó¨Ï¥Î¥Øªº¦Ó¥[¥H´²¥¬¡AµM¦Ó¤£t¥ô¦ó¾á«O³d¥ô¡F¥çµL¹ï¾A°â©Ê©Î¯S©w¥Øªº¾A¥Î©Ê©Ò¬°ªºÀq¥Ü©Ê¾á«O¡C¸Ô±¡½Ð°Ñ·ÓGNU³q¥Î¤½¦@±ÂÅv¡C - - ±zÀ³¤w¦¬¨ìªþÀH©ó¥»µ{¦¡ªºGNU³q¥Î¤½¦@±ÂÅvªº°Æ¥»¡F¦pµL¡A½Ð¼g«H¦Ü¦Û¥Ñ³nÅé°òª÷·|¡G59 - Temple Place ¡V Suite 330, Boston, Ma 02111-1307, USA¡C - - ¦P®Éªþ¤W¦p¦ó¥H¹q¤l¤Î®Ñ±«H¥ó»P±zÁpµ¸ªº¸ê°T¡C - - Yµ{¦¡¬O¥H¤¬°Ê¤è¦¡¹B§@®É¡A½Ð¦b¤¬°Ê¦¡¼Ò¦¡¶}©l®É¡A¿é¥X²µu´£¥Ü¦p¤U¡G - - Gnomovision ²Ä69ª©¡AµÛ§@Åv©Ò¦³ (c) ¦~¥÷ §@ªÌ©m¦W - - Gnomovision¤£t¾á«O³d¥ô¡A±ýª¾¸Ô±¡½ÐÁä¤J¡ushow - w¡v¡C³o¬O¤@ӦۥѳnÅé¡AÅwªï±z¦b¯S©w±ø¥ó¤U¦A´²¥¬¥»µ{¦¡¡F±ýª¾¸Ô±¡½ÐÁä¤J¡ushow - c¡v¡C - - ©Ò°²³]ªº«ü¥O¡ushow w¡v»P¡ushow - c¡vÀ³Åã¥Ü³q¥Î¤½¦@±ÂÅvªº¬Û¹ïÀ³±ø´Ú¡C·íµM¡A±z¥i¥H¨Ï¥Î¡ushow w¡v»P¡ushow - c¡v¥H¥~ªº«ü¥O¦WºÙ¡F¬Æ¦Ü¥H·Æ¹«ÁäÀ»©Î¿ï³æ¤è¦¡¶i¦æ¡X¥un¬O¦X©ó±zµ{¦¡»Ýnªº¤è¦¡³£¥i¥H¡C - - ¦p¦³»Ýn¡A±z¥çÀ³¨ú±o±zªº¶±¥D¡]Y±zªº¤u§@¬°µ{¦¡³]p®v¡^©Î¾Ç®Õ´N¥»µ{¦¡©Òñ¸pªº¡uµÛ§@Åv©ñ±ó©Ó¿Õ®Ñ¡v¡C¨ä½d¨Ò¦p¤U¡A±z¥unקï©m¦W§Y¥i¡G - - Yoyodyne¤½¥q¡A¯÷¦¹©ñ±óJames - Hacker©Ò¼g¤§¡¨Gnomovision¡¨µ{¦¡¡]¸Óµ{¦¡²£¥X½sĶ¾¹©Ò»Ý¸ê°T¡^©Ò¦³ªºµÛ§@Åv§Q¯q¡C - - ¡qTy Coon¤½¥qñ³¹¡r¡A1989¦~¥|¤ë¤@¤é - - Ty Coon¤½¥q°ÆÁ`µô - - ¥»³q¥Î¤½¦@±ÂÅv¨Ã¤£¤¹³\±z±N¥»µ{¦¡¨Ö¤J±M¦³µ{¦¡¤¤¡CY±zªºµ{¦¡¬O¤@¤lµ{¦¡¨ç¦¡®w®É¡A±z¥i¯à»{¬°¤¹³\±M¦³À³¥Îµ{¦¡»P¸Ó¨ç¦¡®w¬Û³sµ²·|§ó¦³À°§U¡CY³o¬O±z©Ò·Q°µªº¡A½Ð¨Ï¥ÎGNU¨ç¦¡®w³q¥Î¤½¦@±ÂÅv¥N´À¥»±ÂÅv¡C - - ---------------------------------------------------------------------- - - ĶªÌ : ¤è©Éªâ +GNU通用公共授權合約 +第二版，1991年6月 +版權所有（C）1989, 1991 自由軟體基金會 +51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA +任何人皆可複製和發佈本協議的完整副本，但不得修改 +【譯者聲明】 +　　This is an unofficial translation of the GNU General Public License into Chinese. It was not published by the Free Software Foundation, and does not legally state the distribution terms for software that uses the GNU GPL--only the original English text of the GNU GPL does that. However, we hope that this translation will help Chinese speakers understand the GNU GPL better. You may publish this translation, modified or unmodified, only under the terms at http://www.gnu.org/licenses/translations.html +　　這是GNU通用公共授權合約的一份非官方中文翻譯，並非自由軟體基金會所發表，不適用於使用GNU通用公共授權合約發佈的軟體的法律聲明——只有GNU通用公共授權合約英文原版才具有法律效力。不過我們希望本翻譯能夠幫助中文讀者更好地理解GNU通用公共授權合約。 您可以僅根據http://www.gnu.org/licenses/translations.html中的條款發布此修改或未修改的翻譯。 + +【引言】 +　　就多數軟體而言，授權合約被設計用於剝奪你分享和修改軟體的自由。相反，GNU通用公共授權合約力圖保障你分享和修改自由軟體的權利——確保自由軟體對其使用者來說是自由的。本GNU通用公共授權合約用於自由軟體基金會的大多數軟體（自由軟體基金會的有些軟體受GNU寬鬆通用公共授權合約保護），以及那些作者聲明使用此協定的軟體。你也可以將本協定用於你的程式。 +　　所謂自由軟體，強調自由，而非免費。本GNU通用公共授權合約設計用於確保你享有分發自由軟體的自由（你可以為此服務收費），確保你可以在需要的時候獲得這些軟體的源碼，確保你可以修改這些軟體或者在新的自由軟體中複用其中某些片段，並且確保你在這方面享有知情權。 +　　為保障你的權益，我們需要作一些限定：禁止任何人否認你的上述權利，或者要求你放棄它們。當你分發或修改這些軟體時，這種限定就變成你的義務。如果你分發這種程式的副本，無論收費還是免費，你必須給予與你同等的權利。你還要確保他們也能收到源碼並瞭解他們的權利。 +　　我們通過兩步保障你的權益：其一，賦予軟體著作權；其二，通過本協議使你可以合法地複製、分發和修改該軟體。同時，為了保護每一位作者以及我們自己，我們向所有人指明如下一點：自由軟體並不提供品質擔保。如果軟體被修改並繼續傳播，我們希望接收者知道獲得的不是原版，後來引入的任何問題不應該影響原作者的聲譽。 +　　最後，自由軟體還持續受到軟體專利的威脅。我們希望避免再發佈者以個人名義取得專利，即將程式據為己有。為防止此類情況發生，我們需要澄清：專利必須為保障每個人的自由使用而申請，否則不應該存在。 + +　　下文是關於複製、分發和修改的嚴謹描述和實施條件。 + +【關於複製、分發和修改的術語和條件】 +　　〇、但凡版權持有人在他的程式或其他作品中聲明該作品可在GNU通用公共授權合約約束下發佈，本協議便對之適用。下文中所說的“程式”指任何程式或作品，而“程式的派生作品”指該程式或者版權法認定的派生作品，即全部或部分包含了該程式的作品，無論是原樣包含或做了修改，乃至翻譯成了其他語言（後文中“修改”涵蓋翻譯）。每個許可獲得者稱作“你”。 +　　除複製、分發和修改外的行為超出了本協議的約束範圍。執行程式的行為並不受限，程式的輸出一般不在約束之內，除非其內容構成了本程式的派生作品（並非單純地作為本程式的運行結果），判別取決於此程式的具體用途。 +　　一、只要你做到為每一個副本醒目而恰當地發佈版權與免責聲明，原封不動地保留本協議及免責聲明，並將本協議連同程式發予接收者，你可以通過任何媒介完整地複製和分發你收到的本程式的源碼。 +　　你可以就傳輸副本的具體行為收費，也可以選擇提供品質擔保以換取收入。 + +　　二、你可以修改你的程式副本的任意部分，以構成本程式的派生作品，並在滿足上述條款及以下三點要求的前提下複製和分發該修改版： +　　a)你必須在你修改了的檔中醒目地聲明你的修改及標注修改日期。 +　　b)你必須使你分發或發佈的作品，部分或全部包含本程式或其派生作品，允許協力廠商在本協定約束下使用，並不得就授權收費。 +　　c)如果修改後的程式通常在運行時通過對話模式獲取命令，你應該讓它進入交互模式時顯示簡要的版權聲明和免責聲明（抑或者你的品質擔保聲明），以及告訴使用者可以在本協議約束下再發佈該程式並提供查閱本協定的途徑。（例外：如果本程式有互動式執行卻通常不顯示任何聲明，則對你的派生作品也不作此要求。） +　　上述要求對修改後的作品整體有效。如果該作品中某些可劃定的部分並非派生自本程式，並可以被合理地看作是從中分離的獨立作品，則當你將它們分開發佈時，這種獨立部分可以不受本協定約束。但是，在你將這些部分和你修改後的作品一起發佈時，整個套件將受本協定約束，本協定對其他許可獲得者的授權將延伸至整個作品，即套件的每一部分，不管是誰寫的。 + +　　三、你可以在上述條款約束下以目的碼或可執行檔的形式複製和分發本程式（或條款二所說的派生作品），不過你還要滿足以下要求之一： +　　a)附上相應的源碼。源碼要求完整且機器可讀，並在條款一、二的約束下通過常用的軟體交換媒介分發。 +　　b)附上至少三年有效的書面報價表以供協力廠商付費獲取相應的源碼。源碼要求完整且機器可讀，並在條款一、二的約束下通過常用的軟體交換媒介分發，費用不得超過實際的分發成本。 +　　c)附上你所收到的獲取源碼途徑的資訊。（該選擇只適用於非商業分發,並且你只收到目的碼或可執行檔以及滿足b項要求的報價單的情況下。） +　　作品的源碼指其可修改的首選形式。對可執行的作品而言，完整的源碼指其包含的所有模組的源碼、相關介面定義文檔以及編譯和安裝所需腳本。然而，有一種例外情況，分發的源碼不必包含那些通常會隨會目標運行環境的作業系統的主要部件（編譯器、內核等）發佈的內容（以源碼或二進位形式），除非這些部件自身是本程式的一部分。 +　　如果以指定特定複製地點的形式分發可執行檔或目的碼，則在同一地點提供對等源碼複製途徑也算一種源碼分發手段，即便不強求協力廠商在複製目的碼的同時複製源碼。 + +　　四、在本協議授權之外，你不能複製、修改、再授權或分發本程式。任何用其他方法複製、修改、再授權或分發本程式的企圖都是無效的，並使你從本協議獲得的權利自動終止。然而從你那按本協議獲得副本和許可的人，只要繼續遵守協議，他們獲得的許可並不會終止。 + +　　五、你沒有在此協議上簽字，也不是非要接受它不可。但是，此外沒人可授權你去修改或分發本程式或其派生作品。此種行為為法律所不容，除非你接受本協議。因此，修改或發佈本程式（或本程式的任何派生作品），就表明你已經接受本協議，即接受它的所有關於複製、分發和修改本程式及其派生的條款。 + +　　六、每當你再發佈本程式（或本程式的任何派生作品），接收者自動從原始權利人獲得本許可，以複製、分發和修改本程式。你不可以對他們獲得的權利加以進一步的限制，你也沒有要求協力廠商遵守該協議的義務。 + +　　七、如果因為法庭裁決或專利侵權指控或其他原因（不限於專利事宜），你面臨與本協議條款衝突的條件（來自於法庭要求、協議或其他），那也不能成為你違背本協議的理由。倘若你不能在發佈本程式時同時滿足本協議和其他檔的要求，你就不能發佈本程式。例如某專利授權不允許通過你直接或間接地獲得本程式的人在不付授權費的前提下再發佈本程式，唯一能同時滿足它和本協議要求的做法便是不發佈本程式。 +　　如果本條款在特定環境下無效或無法實施，本條款的其他部分仍適用且本條款整體在其他環境下仍適用。 +　　本條款的目的不在於誘使你去侵犯專利或其他產權要求，抑或者對之抗辯。本條款的根本目的是保護自由軟體發佈系統的完整性，而這要通過應用公共許可證實現。借助同樣出自該系統的應用程式，許多人已經對在該系統上發佈的軟體作出了廣泛而慷慨的貢獻。作者/捐贈人有權確定是否通過其他管道發佈軟體，被授權人不得干預其選擇。 +　　本條款旨在徹底闡明其餘條款所帶來的當然結果。 + +　　八、如果由於專利或受版權保護的介面的問題，分發或使用本程式在某些國家受到限制，原始版權持有人在其程式中使用本協定時可以附加明確的區域分發限制以排除那些國家，以支援此外地區的分發。在此情況下，這種限制條款將納入協議之中。 + +　　九、自由軟體聯盟可能會不定時發佈GNU通用公共授權合約的修訂版或新版。新版將秉承當前版本的精神，但對問題或事項的描述細節不盡相同。 +　　每一版都會有不同的版本號，如果本程式指定其使用的協議版本以及“任何更新的版本”，你可以選擇遵守該版本或者任何更新的版本的條款。如果本程式沒有指定協議版本，你可以選用自由軟體聯盟發佈的任意版本。 + +　　十、如果你希望將本程式的某部分併入採取不同發佈條件的自由軟體中，應書面請求其作者的許可。對於自由軟體聯盟持有版權的軟體，還應向聯盟提出書面請求，我們有時會作例外處理。在處理這種事情時我們秉承兩大宗旨：保持所有自由軟體派生作品的自由屬性，以及在整體上促進軟體的共用和複用。 + +不提供品質擔保 +　　十一、本程式為免費授權，故在適用法律範圍內不提供品質擔保。除非另作書面聲明，版權持有人及其他程式提供者“概”不提供任何顯式或隱式的品質擔保，品質擔保所指包括而不僅限於有經濟價值和適合特定用途的保證。全部風險，如程式的品質和性能問題，皆由你承擔。若程式出現缺陷，你將承擔所有必要的修復和更正服務的費用。 + +　　十二、除非適用法律或書面協議要求，任何版權持有人或本程式按本協議可能存在的協力廠商修改和再發佈者，都不對你的損失負有責任，包括由於使用或者不能使用本程式造成的任何一般的、特殊的、偶發的或重大的損失（包括而不僅限於資料丟失、資料失真、你或協力廠商的後續損失、其他程式無法與本程式協同運作），即使那些人聲稱會對此負責。 + +【附錄：如何將上述條款應用到你的新程式】 +　　如果你開發了一個新程式，並希望它能最大限度地為公眾所使用，最好的辦法是將其作為自由軟體，以使每個人都能在本協定約束下對其再發佈及修改。 +　　為此，請在附上以下聲明。最安全的做法是將其附在每份源碼的開頭，以便於最有效地傳遞免責資訊。同時，每個檔至少包含一處“版權”聲明和一個協定全文的連結。 + +　　用一行來標明程式名及其作用。 + +　　版權所有（C）年份 姓名 +　　本程式為自由軟體，在自由軟體聯盟發佈的GNU通用公共授權合約的約束下，你可以對其進行再發佈及修改。協議版本為第二版或（隨你）更新的版本。 +　　我們希望發佈的這款程式有用，但不保證，甚至不保證它有經濟價值和適合特定用途。詳情參見GNU通用公共授權合約。 +　　你理當已收到一份GNU通用公共授權合約的副本，如果沒有，請致信自由軟體基金會：51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA + +　　同時提供你的電子郵寄地址或傳統的郵件聯繫方式。 + +　　如果該程式是互動式的，讓它在交互模式下輸出類似下面的一段聲明： + +　　Gnomovision 第69版，版權所有（C）年份 姓名 +　　Gnomovision從未提供品質擔保，輸入'show w'可查看詳情。這是款自由軟體，歡迎你在滿足一定條件後對其再發佈，輸入'show c'可查看詳情。 + +　　例子中的命令'show w'和'show c'應用於顯示GNU通用公共授權合約相應的部分。當然你也可以因地制宜地選用別的命令乃至點擊操作。 + +　　如果你之上存在雇主（你是碼農）或校方，你還應當讓他們在必要時為此程式簽署放棄版權聲明。以下有例子： + +　　Yoyodyne公司，在此放棄對James Hacker所寫的'Gnomovision'程式所享有的版權利益。 +　　Ty Coon 簽字，1989年4月1日 +　　Ty Coon 副總裁 + +　　本GNU通用公共授權合約不允許把你的程式併入私有程式。如果你的程式是某種庫，且你想允許它被私有程式連結而使之更有用，請使用GNU較寬鬆通用公共授權合約。 + + +聯絡我們：Samuel Chong + +譯注： +[1] distribute既譯作分發也譯作發佈，前者強調轉發，後者強調公佈。 +[2] license既譯作協議也譯作許可，前者強調此文本，後者強調內容。 +[3] 首字母大寫的Program譯作程式，首字母小寫的program譯作程式。 + +參考： +[繁體中文譯本] https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html \ No newline at end of file diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index a2d9d8a21..c56467700 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -87,47 +87,47 @@ Name: "afr"; MessagesFile: "compiler:Languages\Afrikaans.isl" Name: "alb"; MessagesFile: "compiler:Languages\Albanian.isl" Name: "ara"; MessagesFile: "compiler:Languages\Arabic.isl" Name: "arm"; MessagesFile: "compiler:Languages\Armenian.isl" -Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl" +Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-es-COPIADO.txt" Name: "baq"; MessagesFile: "compiler:Languages\Basque.isl" -Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl" +Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-be.txt" Name: "ben"; MessagesFile: "compiler:Languages\Bengali.islu" Name: "bos"; MessagesFile: "compiler:Languages\Bosnian.isl" -Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" -Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl" -Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl" -Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" -Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl" +Name: "bra"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING_pt_BR.txt" +Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-bg.txt" +Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ca.txt" +Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_cn.txt" +Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_tw_GNU_GPL_Chinese.txt" Name: "cnr"; MessagesFile: "compiler:Languages\Montenegrin.isl" Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" -Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl" -Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl" -Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-cs.txt" +Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-da.txt" +Name: "dut"; MessagesFile: "compiler:Languages\Dutch.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-nl.txt" Name: "enb"; MessagesFile: "compiler:Languages\EnglishBritish.isl" Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "epo"; MessagesFile: "compiler:Languages\Esperanto.isl" -Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "esp"; MessagesFile: "compiler:Languages\Spanish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-es-COPIADO.txt" Name: "est"; MessagesFile: "compiler:Languages\Estonian.isl" Name: "fas"; MessagesFile: "compiler:Languages\Farsi.isl" -Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl" -Name: "fre"; MessagesFile: "compiler:Languages\French.isl" +Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fi.txt" +Name: "fre"; MessagesFile: "compiler:Languages\French.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fr-COPIER.txt" Name: "gal"; MessagesFile: "compiler:Languages\Galician.isl" Name: "geo"; MessagesFile: "compiler:Languages\Georgian.isl" -Name: "ger"; MessagesFile: "compiler:Languages\German.isl" +Name: "ger"; MessagesFile: "compiler:Languages\German.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-de-KOPIE.txt" Name: "gla"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" -Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl" -Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl" +Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-el.txt" +Name: "heb"; MessagesFile: "compiler:Languages\Hebrew.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-he.txt" Name: "hin"; MessagesFile: "compiler:Languages\Hindi.islu" Name: "hun"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "ice"; MessagesFile: "compiler:Languages\Icelandic.isl" -Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl" -Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl" -Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "ind"; MessagesFile: "compiler:Languages\Indonesian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-id.txt" +Name: "ita"; MessagesFile: "compiler:Languages\Italian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-it-COPIATURA.txt" +Name: "jpn"; MessagesFile: "compiler:Languages\Japanese.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ja.txt" Name: "kaz"; MessagesFile: "compiler:Languages\Kazakh.islu" -Name: "kor"; MessagesFile: "compiler:Languages\Korean.isl" +Name: "kor"; MessagesFile: "compiler:Languages\Korean.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ko.txt" Name: "kur"; MessagesFile: "compiler:Languages\Kurdish.isl" Name: "lav"; MessagesFile: "compiler:Languages\Latvian.isl" Name: "lij"; MessagesFile: "compiler:Languages\Ligurian.isl" -Name: "lit"; MessagesFile: "compiler:Languages\Lithuanian.isl" +Name: "lit"; MessagesFile: "compiler:Languages\Lithuanian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-lt.txt" Name: "ltz"; MessagesFile: "compiler:Languages\Luxemburgish.isl" Name: "mac"; MessagesFile: "compiler:Languages\Macedonian.isl" Name: "mar"; MessagesFile: "compiler:Languages\Marathi.islu" @@ -137,20 +137,20 @@ Name: "nep"; MessagesFile: "compiler:Languages\Nepali.islu" Name: "nno"; MessagesFile: "compiler:Languages\NorwegianNynorsk.isl" Name: "nor"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "occ"; MessagesFile: "compiler:Languages\Occitan.isl" -Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "pol"; MessagesFile: "compiler:Languages\Polish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-pl-LICENCJA-GNU.txt" Name: "por"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "rum"; MessagesFile: "compiler:Languages\Romanian.isl" -Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" -Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl" +Name: "rus"; MessagesFile: "compiler:Languages\Russian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ro.txt" +Name: "scc"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sr.txt" +Name: "scl"; MessagesFile: "compiler:Languages\SerbianLatin.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sr.txt" Name: "scr"; MessagesFile: "compiler:Languages\Croatian.isl" Name: "sin"; MessagesFile: "compiler:Languages\Sinhala.islu" Name: "slo"; MessagesFile: "compiler:Languages\Slovak.isl" Name: "slv"; MessagesFile: "compiler:Languages\Slovenian.isl" -Name: "swe"; MessagesFile: "compiler:Languages\Swedish.isl" +Name: "swe"; MessagesFile: "compiler:Languages\Swedish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-sv.txt" Name: "tai"; MessagesFile: "compiler:Languages\Thai.isl" Name: "tat"; MessagesFile: "compiler:Languages\Tatar.isl" -Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl" +Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-tr.txt" Name: "uig"; MessagesFile: "compiler:Languages\Uyghur.islu" Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" Name: "urd"; MessagesFile: "compiler:Languages\Urdu.isl" From b403a53f3e5e763833ceacf9ae2182f259f3b69b Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sat, 24 Oct 2020 11:03:18 +0900 Subject: [PATCH 18/41] Added notation about licenses for Truetype fonts to chinese COPYING text. --- docs/COPYING/COPYING-zh_cn.txt | 19 ++++++++++++++++++- .../COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt | 19 ++++++++++++++++++- win32/tuxpaint.iss | 1 - 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/docs/COPYING/COPYING-zh_cn.txt b/docs/COPYING/COPYING-zh_cn.txt index fcd12b0de..68154d447 100644 --- a/docs/COPYING/COPYING-zh_cn.txt +++ b/docs/COPYING/COPYING-zh_cn.txt @@ -1,4 +1,21 @@ -GNU通用公共许可协议 +COPYING.txt for Tux Paint + +Tux Paint - A simple drawing program for children. + +Copyright (c) 2005 by Bill Kendrick and others +bill@newbreedsoftware.com +http://www.newbreedsoftware.com/tuxpaint/ + + +Note: Also see the respective "COPYING.txt" license documentation +included with the TrueType Fonts that come with Tux Paint. +See: ../fonts/locale/LL_docs/, where "LL" corresponds to a font filename. + +Bill Kendrick, 2005.October.10 +$Id$ + +---------------------------------------- +GNU通用公共许可协议 第二版，1991年6月 版权所有（C）1989, 1991 自由软件基金会 51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA diff --git a/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt b/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt index 7d5076910..3b78eae69 100644 --- a/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt +++ b/docs/COPYING/COPYING-zh_tw_GNU_GPL_Chinese.txt @@ -1,4 +1,21 @@ -GNU通用公共授權合約 +COPYING.txt for Tux Paint + +Tux Paint - A simple drawing program for children. + +Copyright (c) 2005 by Bill Kendrick and others +bill@newbreedsoftware.com +http://www.newbreedsoftware.com/tuxpaint/ + + +Note: Also see the respective "COPYING.txt" license documentation +included with the TrueType Fonts that come with Tux Paint. +See: ../fonts/locale/LL_docs/, where "LL" corresponds to a font filename. + +Bill Kendrick, 2005.October.10 +$Id$ + +---------------------------------------- +GNU通用公共授權合約 第二版，1991年6月 版權所有（C）1989, 1991 自由軟體基金會 51 Franklin Street, Fifth Floor, Boston, MA 02110‐1301, USA diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index c56467700..43de5bc8e 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -68,7 +68,6 @@ AppUpdatesURL={#PublisherURL} DefaultDirName={pf}\{#AppDirName} DefaultGroupName={#AppGroupName} OutputDir=.\ -;FIXME - It would be good if we showed the localized license -bjk 2011.06.15 #ifdef OpenCandy LicenseFile={#BdistDir}\docs\COPYING-OC.txt OutputBaseFilename={#AppPrefix}-{#AppVersion}-win32-installer-opencandy From 0af138568ee43f166d4528d2fc23e055a1148a0a Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 23 Oct 2020 23:21:26 -0700 Subject: [PATCH 19/41] Doc'ing some recent changes by Shin-Ichi & Pere --- docs/CHANGES.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 646d5603a..9e4c0a929 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.October.14 (0.9.25) +2020.October.23 (0.9.25) * New Features ------------ * Export drawings: @@ -66,6 +66,7 @@ $Id$ * Windows build changes * Enabling PowerTools repositry to install additional SDL* packages * Corrected README launcher for English, after install completes + * Updated translation files and ensure license text appears * Support for Mingw64 for 64-bit builds * Ability to find Mingw DLLs by examining EXEs (new shell script replaces hard-coded list in Makefile) @@ -89,6 +90,12 @@ $Id$ (https://openclipart.org/artist/Tavin) Creative Commons Zero 1.0 Public Domain License + * Starter & Template updates + -------------------------- + * Added margins to elephant, fish_icon and frame_hearts + starters, to avoid smearing on edges in Tux Paint. + Pere Pujal i Carabantes + * Documentation updates --------------------- * Cleaned up HTML code of HTML-based documentation. From 0e5adbcfaaf3fd914810593e9ddb807a953a21ef Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 25 Oct 2020 10:28:31 +0900 Subject: [PATCH 20/41] Placed document about how to build tuxpaint on windows. --- win32/buildwin.html | 257 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 257 insertions(+) create mode 100644 win32/buildwin.html diff --git a/win32/buildwin.html b/win32/buildwin.html new file mode 100644 index 000000000..8632be051 --- /dev/null +++ b/win32/buildwin.html @@ -0,0 +1,257 @@ + + + + +Compiling Tux Paint using MinGW/MSYS2 + + + + + +
+ +

Compiling Tux Paint using MinGW/MSYS2

+

This document provides how to compile Tux Paint with MinGW/MSYS2 on Microsoft Windows.

+ +
+

MinGW/MSYS2 toolchains and required libraries

+

So many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies.

+
+ +
+

MSYS2

+

First of all, you have to install latest MSYS2 as follows.

+
    +
  • Download the installer "msys2-x86_64-xxxxxxxx.exe from Sourceforge.net
    • +
  • Install MSYS2 into your favorite directory (default to "C:\msys64")
    • +
+

Open the msys2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command.

+
+$ pacman -Syu
+# (press <ENTER> for all inquiry)
+
+

This will update core system and the window will close automatically.

+

Open the msys2 shell again and execute following command to finish remaining updating process.

+
+$ pacman -Syu
+# (press <ENTER> for all inquiry)
+
+

Install basic development tools as follows. +

+$ pacman -S base-devel msys2-devel git
+# (press <ENTER> for all inquiry)
+
+

Proceed to the next "MinGW 64bit (x86_64) toolchains" section or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment.

+ +
+

MinGW 64bit (x86_64) toolchains

+

Open the msys2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and install basic 64bit development tools as follows.

+
+$ pacman -S mingw-w64-x86_64-toolchain
+# (press <ENTER> for all inquiry)
+
+ +

64bit (x86_64) dependency libraries for Tux Paint

+

You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "pacman" except for SDL_Pango.

+

"ntldd" is a small tool which examine windows executable files to list dynamic link library (.dll) files they depends on. Tux Paint's packaging process for binary distribution uses it to find required .dll files.

+
+$ pacman -S mingw-w64-x86_64-SDL_{image,mixer,ttf}
+$ pacman -S mingw-w64-x86_64-librsvg
+$ pacman -S mingw-w64-x86_64-fribidi
+$ pacman -S mingw-w64-x86_64-libimagequant
+$ pacman -S mingw-w64-x86_64-fltk
+$ pacman -S mingw64/mingw-w64-x86_64-ntldd-git
+
+

Close the shell before proceeding to the remaining process.

+ +

Install SDL_Pango and re-install SDL on the 64bit environment.

+

SDL_Pango should be installed manually. In addition, you have to re-install SDL from the source code or you will see unnecessary blank window opens when starting Tux Paint.

+

This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit -> "MSYS2 MinGW 64-bit"

+ +
+

SDL_Pango

+

At first, you have to prepare source tar-ball and a patch required in the same directory.

+ +

Build and install SDL_Pango as follows.

+
+$ tar zxvf SDL_Pango-0.1.2.tar.gz
+$ cd SDL_Pango-0.1.2/
+$ patch -p0 < ../SDL_Pango-configure-extra-api.patch
+$ ./configure --prefix=/mingw64 && make && make install
+
+ +

SDL

+

Download source tar-ball from "libsdl.org" and re-install SDL as follows. +

+$ tar zxvf SDL-1.2.15.tar.gz
+$ cd SDL-1.2.15
+$ ./configure --prefix=/mingw64 && make && make install
+
+
+

Proceed to the next "MinGW 32bit (i686) toolchains" section or skip to the "ImageMagick" section if you need only a 64bit build environment.

+ +
+

MinGW 32bit (i686) toolchains

+

Open the msys2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and install basic 32bit development tools as follows.

+
+$ pacman -S mingw-w64-i686-toolchain
+# (press <ENTER> for all inquiry)
+
+ +

32bit (i686) dependency libraries for Tux Paint

+

You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "pacman" except for SDL_Pango.

+

"ntldd" is a small tool which examin windows executable files to list dynamic link library (.dll) files they depends on. Tux Paint's packaging process for binary distribution uses it to find required .dll files.

+
+$ pacman -S mingw-w64-i686-SDL_{image,mixer,ttf}
+$ pacman -S mingw-w64-i686-librsvg
+$ pacman -S mingw-w64-i686-fribidi
+$ pacman -S mingw-w64-i686-libimagequant
+$ pacman -S mingw-w64-i686-fltk
+$ pacman -S mingw-w64-i686-ntldd-git
+
+

Close the shell before proceeding to the remaining process.

+ +

Install SDL_Pango and re-install SDL on the 32bit environment.

+

SDL_Pango should be installed manually. In addition, you have to re-install SDL from the source code or you will see unnecessary blank window opens when starting Tux Paint.

+

This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit -> "MSYS2 MinGW 32-bit"

+ +
+

SDL_Pango

+

At first, you have to prepare source tar-ball and a patch required in the same directory.

+ +

Build and install SDL_Pango as follows.

+
+$ tar zxvf SDL_Pango-0.1.2.tar.gz
+$ cd SDL_Pango-0.1.2/
+$ patch -p0 < ../SDL_Pango-configure-extra-api.patch
+$ ./configure --prefix=/mingw32 && make && make install
+
+ +

SDL

+

Download source tar-ball from "libsdl.org" and re-install SDL as follows. +

+$ tar zxvf SDL-1.2.15.tar.gz
+$ cd SDL-1.2.15
+$ ./configure --prefix=/mingw32 && make && make install
+
+
+

Proceed to the next ImageMagick section.

+
+ +
+

ImageMagick

+

ImageMagick is a compilation of command line tools to create, edit, compose, or convert bitmap images supporting quite a large number of image formats. Tux Paint uses two functions ("convert" and "composite") in it to generate thumbnails for startar images and templates in the build process.

+

Using official binary release available from "Windows Binary Release" is recommended because its commands installed using "pacman" on MinGW/MSYS do not work as expected.

+

Do not forget to enable "Install legacy utilities (e.g. convert)" while installing it because Tux Paint's build process uses them.

+

Add the path to the directory in which ImageMagick is installed at the top of the "PATH" environment variable. For example;

+
+$ export PATH=/c/Program\ Files/ImageMagick-7.0.10-Q16-HDRI:$PATH
+

You make it default by describing above in the bash configuration file "~/.bash_profile".

+
+

Tux Paint

+

You are able to compile 64bit binaries using MSYS2 64bit shell and 32bit binaries using 32bit shell respectively.

+
    +
  • Select "MSYS2 64bit -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell.
    • +
  • Select "MSYS2 64bit -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell.
    • +
+ +
+
+

Tux Paint Config

+

"Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

You can use any of [a] stable tar-ball release or [b] developing source tree.

+

+

[a] Using stable tar-ball release.

+
+ +

Expand the tar-ball and change the directory name so that the final packaging process can find related files.

+
+$ tar zxvf tuxpaint-config-0.0.16.tar.gz
+$ mv tuxpaint-config-0.0.16 tuxpaint-config
+
+
+

[b] Using developing source tree

+
+

Fetch the developing source tree from git repository.

+
+$ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config
+
+
+
+

Now you can build tuxpaint-config as follows.

+
+$ cd tuxpaint-config
+$ make win32
+
+ +
+

Tux Paint

+

You can use any of [a] stable tar-ball release or [b] developing source tree.

+

+

[a] Using stable tar-ball release.

+
+ +

Expand the tar-ball and enter to the top of the source tree.

+
+$ tar zxvf tuxpaint-0.9.25.tar.gz
+$ cd tuxpaint-0.9.25
+
+
+

[b] Using developing source tree

+
+

Fetch the developing source tree from git repository and enter to the top of the source tree.

+
+$ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint
+$ cd tuxpaint
+
+
+
+

Now you can build Tux Paint as follows.

+
+$ make bdist-win32
+
+

All the files needed for starting Tux Paint and Tux Paint Config are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking .exe files in the "bdist" directory.

+ +
+

Tux Paint installer

+

Inno Setup is used to build executable installer for Tux Paint. Therefore you have to install it in the first place.

+

Inno Setup officially supports translations for only about 20 languages. However, one of the great points of Tux Paint is it supports so many languages. Therefore, the set up script "tuxpaint.iss" to build the installer is written to use much more translations including unofficial one which are available on "Inno Setup Translations". You have to download translation files (.isl) required and put them in "Languages" directory under the directory in which Inno Setup is installed.

+

Then, you can easily build an executable installer just as follows.

+
    +
  • Right-click on the "tuxpaint.iss" icon in the "win32" directory and select "Compile" on the list.
    • +
+

It takes for a while and you will find tuxpaint-x.x.xx-win32-installer.exe in the same directory.

+
+ +
+
+Oct. 25, 2020
+Shin-ichi TOYAMA shin1@wmail.plala.or.jp +
+
+ + \ No newline at end of file From 4c80d9d0cc1d6a4156e47ab4225fde87359b0da2 Mon Sep 17 00:00:00 2001 From: prasantahembram Date: Sun, 25 Oct 2020 15:45:23 +0530 Subject: [PATCH 21/41] Signed-off-by: prasantahembram --- docs/CHANGES.txt | 3 +- src/po/is.po | 22 +- src/po/it.po | 942 ++++++++++++++++++++++---------------------- src/po/ru.po | 942 ++++++++++++++++++++++---------------------- src/po/si.po | 942 ++++++++++++++++++++++---------------------- src/po/tuxpaint.pot | 12 +- 6 files changed, 1430 insertions(+), 1433 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 9e4c0a929..f7cf848a4 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.October.23 (0.9.25) +2020.October.25 (0.9.25) * New Features ------------ * Export drawings: @@ -132,6 +132,7 @@ $Id$ TOYAMA Shin-ichi * Santali translation (Ol-Chiki) + Updated Santali Traslation, corrected some spelling mistakes. Prasanta Hembram * Misc diff --git a/src/po/is.po b/src/po/is.po index 476e8506f..0a9a50a5b 100644 --- a/src/po/is.po +++ b/src/po/is.po @@ -2,7 +2,7 @@ # Íslensk þýðing á TuxPaint # Copyright (C) 2002-2017. # This file is distributed under the same license as the tuxpaint package. -# +# # Pjetur G. Hjaltason , 2002, 2003, 2004, 2014. # Sveinn í Felli , 2015, 2017, 2020. msgid "" @@ -110,19 +110,19 @@ msgstr "Fölbrúnt!" #. they have both uppercase and lowercase letters. Note that we do not #. test for "Aa", because it is OK if uppercase and lowercase are the #. same (but not nice -- such fonts get a low score later). -#. +#. #. Most locales leave the blacklist strings alone: "QX" and "qx" #. (it is less destructive to use the scoring strings instead) -#. +#. #. Locales that absolutely require all fonts to have some #. extra characters should use "QX..." and "qx...", where "..." #. are some characters you absolutely require in all fonts. -#. +#. #. Locales with absolutely NO use for ASCII may use "..." and "...", #. where "..." are some characters you absolutely require in #. all fonts. This would be the case for a locale in which it is #. impossible for a user to type ASCII letters. -#. +#. #. Most translators should use scoring instead. #: ../dirwalk.c:177 msgid "qx" @@ -474,17 +474,13 @@ msgid "Click to start drawing a line. Let go to complete it." msgstr "Smelltu til að byrja línu. Slepptu til að enda línuna." #: ../tools.h:125 -#| 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 "" -"Veldu form. Smelltu til að byrja að teikna, dragðu músina til, slepptu þegar" -" það " -"er af réttri stærð. Hreyfðu til að snúa forminu, og smelltu til að teikna " -"það." +"Veldu form. Smelltu til að byrja að teikna, dragðu músina til, slepptu þegar " +"það er af réttri stærð. Hreyfðu til að snúa forminu, og smelltu til að " +"teikna það." #: ../tools.h:129 msgid "" @@ -780,7 +776,7 @@ msgstr "Veldu teikningu, og smelltu svo á '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 msgid "Select 2 or more drawings to turn into an animated GIF." msgstr "Veldu 2 eða fleiri teikningar sem á að breyta í GIF-hreyfimynd." diff --git a/src/po/it.po b/src/po/it.po index 381bd3135..d7e82d40d 100644 --- a/src/po/it.po +++ b/src/po/it.po @@ -21,88 +21,88 @@ msgstr "" "X-Generator: Loco - https://localise.biz/\n" "X-Loco-Parser: loco_parse_po\n" -#. Response to Black (0, 0, 0) color selected -#: ../colors.h:86 +#. Response to Black (0, 0, 0) color selected +#: ../colors.h:86 msgid "Black!" msgstr "Nero!" -#. Response to Dark grey (128, 128, 128) color selected -#: ../colors.h:89 +#. Response to Dark grey (128, 128, 128) color selected +#: ../colors.h:89 msgid "Dark grey! Some people spell it “dark gray”." msgstr "Grigio scuro!" -#. Response to Light grey (192, 192, 192) color selected -#: ../colors.h:92 +#. Response to Light grey (192, 192, 192) color selected +#: ../colors.h:92 msgid "Light grey! Some people spell it “light gray”." msgstr "Grigio chiaro!" -#. Response to White (255, 255, 255) color selected -#: ../colors.h:95 +#. Response to White (255, 255, 255) color selected +#: ../colors.h:95 msgid "White!" msgstr "Bianco!" -#. Response to Red (255, 0, 0) color selected -#: ../colors.h:98 +#. Response to Red (255, 0, 0) color selected +#: ../colors.h:98 msgid "Red!" msgstr "Rosso!" -#. Response to Orange (255, 128, 0) color selected -#: ../colors.h:101 +#. Response to Orange (255, 128, 0) color selected +#: ../colors.h:101 msgid "Orange!" msgstr "Arancione!" -#. Response to Yellow (255, 255, 0) color selected -#: ../colors.h:104 +#. Response to Yellow (255, 255, 0) color selected +#: ../colors.h:104 msgid "Yellow!" msgstr "Giallo!" -#. Response to Light green (160, 228, 128) color selected -#: ../colors.h:107 +#. Response to Light green (160, 228, 128) color selected +#: ../colors.h:107 msgid "Light green!" msgstr "Verde chiaro!" -#. Response to Dark green (33, 148, 70) color selected -#: ../colors.h:110 +#. Response to Dark green (33, 148, 70) color selected +#: ../colors.h:110 msgid "Dark green!" msgstr "Verde scuro!" -#. Response to "Sky" blue (138, 168, 205) color selected -#: ../colors.h:113 +#. Response to "Sky" blue (138, 168, 205) color selected +#: ../colors.h:113 msgid "Sky blue!" msgstr "Azzurro!" -#. Response to Blue (50, 100, 255) color selected -#: ../colors.h:116 +#. Response to Blue (50, 100, 255) color selected +#: ../colors.h:116 msgid "Blue!" msgstr "Blu!" -#. Response to Lavender (186, 157, 255) color selected -#: ../colors.h:119 +#. Response to Lavender (186, 157, 255) color selected +#: ../colors.h:119 msgid "Lavender!" msgstr "Lavanda!" -#. Response to Purple (128, 0, 128) color selected -#: ../colors.h:122 +#. Response to Purple (128, 0, 128) color selected +#: ../colors.h:122 msgid "Purple!" msgstr "Viola!" -#. Response to Pink (255, 165, 211) color selected -#: ../colors.h:125 +#. Response to Pink (255, 165, 211) color selected +#: ../colors.h:125 msgid "Pink!" msgstr "Rosa!" -#. Response to Brown (128, 80, 0) color selected -#: ../colors.h:128 +#. Response to Brown (128, 80, 0) color selected +#: ../colors.h:128 msgid "Brown!" msgstr "Marrone!" -#. Response to Tan (226, 189, 166) color selected -#: ../colors.h:131 +#. Response to Tan (226, 189, 166) color selected +#: ../colors.h:131 msgid "Tan!" msgstr "Rossiccio!" -#. Response to Beige (247, 228, 219) color selected -#: ../colors.h:134 +#. Response to Beige (247, 228, 219) color selected +#: ../colors.h:134 msgid "Beige!" msgstr "Beige!" @@ -116,30 +116,30 @@ msgstr "Beige!" # translated. Otherwise, only Line X should be translated and the # ASCII-only fonts should be given bad scores in the scoring code below. # (the best scores going to fonts that support both) -#. First, the blacklist. We list font families that can crash Tux Paint -#. via bugs in the SDL_ttf library. We also test fonts to be sure that -#. they have both uppercase and lowercase letters. Note that we do not -#. test for "Aa", because it is OK if uppercase and lowercase are the -#. same (but not nice -- such fonts get a low score later). -#. -#. Most locales leave the blacklist strings alone: "QX" and "qx" -#. (it is less destructive to use the scoring strings instead) -#. -#. Locales that absolutely require all fonts to have some -#. extra characters should use "QX..." and "qx...", where "..." -#. are some characters you absolutely require in all fonts. -#. -#. Locales with absolutely NO use for ASCII may use "..." and "...", -#. where "..." are some characters you absolutely require in -#. all fonts. This would be the case for a locale in which it is -#. impossible for a user to type ASCII letters. -#. -#. Most translators should use scoring instead. -#: ../dirwalk.c:177 +#. First, the blacklist. We list font families that can crash Tux Paint +#. via bugs in the SDL_ttf library. We also test fonts to be sure that +#. they have both uppercase and lowercase letters. Note that we do not +#. test for "Aa", because it is OK if uppercase and lowercase are the +#. same (but not nice -- such fonts get a low score later). +#. +#. Most locales leave the blacklist strings alone: "QX" and "qx" +#. (it is less destructive to use the scoring strings instead) +#. +#. Locales that absolutely require all fonts to have some +#. extra characters should use "QX..." and "qx...", where "..." +#. are some characters you absolutely require in all fonts. +#. +#. Locales with absolutely NO use for ASCII may use "..." and "...", +#. where "..." are some characters you absolutely require in +#. all fonts. This would be the case for a locale in which it is +#. impossible for a user to type ASCII letters. +#. +#. Most translators should use scoring instead. +#: ../dirwalk.c:177 msgid "qx" msgstr "qx" -#: ../dirwalk.c:177 +#: ../dirwalk.c:177 msgid "QX" msgstr "QX" @@ -147,356 +147,356 @@ msgstr "QX" # the top of the list. The user will see them first. This sorting is # especially important for users who have scroll buttons disabled. # Translators should do whatever is needed to put crummy fonts last. -#. TODO: weight specification -#. Now we score fonts to ensure that the best ones will be placed at -#. the top of the list. The user will see them first. This sorting is -#. especially important for users who have scroll buttons disabled. -#. Translators should do whatever is needed to put crummy fonts last. -#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') -#: ../dirwalk.c:202 +#. TODO: weight specification +#. Now we score fonts to ensure that the best ones will be placed at +#. the top of the list. The user will see them first. This sorting is +#. especially important for users who have scroll buttons disabled. +#. Translators should do whatever is needed to put crummy fonts last. +#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') +#: ../dirwalk.c:202 msgid "oO" msgstr "oO" # uncommon punctuation -#. common punctuation (e.g., '?', '!', '.', ',', etc.) -#: ../dirwalk.c:205 +#. common punctuation (e.g., '?', '!', '.', ',', etc.) +#: ../dirwalk.c:205 msgid ",.?!" msgstr ",.?!" # distinct uppercase and lowercase -#. uncommon punctuation (e.g., '@', '#', '*', etc.) -#: ../dirwalk.c:208 +#. uncommon punctuation (e.g., '@', '#', '*', etc.) +#: ../dirwalk.c:208 msgid "`%_@$~#{<(^&*" msgstr "`%_@$~#{<(^&*" # common punctuation -#. digits (e.g., '0', '1' and '7') -#: ../dirwalk.c:211 +#. digits (e.g., '0', '1' and '7') +#: ../dirwalk.c:211 msgid "017" msgstr "017" # digits -#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) -#: ../dirwalk.c:214 +#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) +#: ../dirwalk.c:214 msgid "O0" msgstr "O0" # distinct circle-like characters -#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) -#: ../dirwalk.c:217 +#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) +#: ../dirwalk.c:217 msgid "1Il|" msgstr "1Il|" -#: ../dirwalk.c:221 +#: ../dirwalk.c:221 msgid "<1>spare-1a" msgstr "aa" -#: ../dirwalk.c:222 +#: ../dirwalk.c:222 msgid "<1>spare-1b" msgstr "aa" -#: ../dirwalk.c:223 +#: ../dirwalk.c:223 msgid "<9>spare-9a" msgstr "èòàì" -#: ../dirwalk.c:224 +#: ../dirwalk.c:224 msgid "<9>spare-9b" msgstr "ÈÒÀÌ" -#. Congratulations #1 -#: ../great.h:37 +#. Congratulations #1 +#: ../great.h:37 msgid "Great!" msgstr "Grandioso!" -#. Congratulations #2 -#: ../great.h:40 +#. Congratulations #2 +#: ../great.h:40 msgid "Cool!" msgstr "Forte!" -#. Congratulations #3 -#: ../great.h:43 +#. Congratulations #3 +#: ../great.h:43 msgid "Keep it up!" msgstr "Continua così!" -#. Congratulations #4 -#: ../great.h:46 +#. Congratulations #4 +#: ../great.h:46 msgid "Good job!" msgstr "Ottimo lavoro!" -#. Input Method: English mode -#: ../im.c:74 +#. Input Method: English mode +#: ../im.c:74 msgid "English" msgstr "Inglese" -#. Input Method: Japanese Romanized Hiragana mode -#: ../im.c:77 +#. Input Method: Japanese Romanized Hiragana mode +#: ../im.c:77 msgid "Hiragana" msgstr "Hiragana" -#. Input Method: Japanese Romanized Katakana mode -#: ../im.c:80 +#. Input Method: Japanese Romanized Katakana mode +#: ../im.c:80 msgid "Katakana" msgstr "Katakana" -#. Input Method: Korean Hangul 2-Bul mode -#: ../im.c:83 +#. Input Method: Korean Hangul 2-Bul mode +#: ../im.c:83 msgid "Hangul" msgstr "Hangul" -#. Input Method: Thai mode -#: ../im.c:86 +#. Input Method: Thai mode +#: ../im.c:86 msgid "Thai" msgstr "Tailandese" -#. Input Method: Traditional Chinese mode -#: ../im.c:89 +#. Input Method: Traditional Chinese mode +#: ../im.c:89 msgid "ZH_TW" msgstr "ZH_TW" -#. Square shape tool (4 equally-lengthed sides at right angles) -#: ../shapes.h:234 ../shapes.h:235 +#. Square shape tool (4 equally-lengthed sides at right angles) +#: ../shapes.h:234 ../shapes.h:235 msgid "Square" msgstr "Quadrato" -#. Rectangle shape tool (4 sides at right angles) -#: ../shapes.h:238 ../shapes.h:239 +#. Rectangle shape tool (4 sides at right angles) +#: ../shapes.h:238 ../shapes.h:239 msgid "Rectangle" msgstr "Rettangolo" -#. Circle shape tool (X radius and Y radius are the same) -#: ../shapes.h:242 ../shapes.h:243 +#. Circle shape tool (X radius and Y radius are the same) +#: ../shapes.h:242 ../shapes.h:243 msgid "Circle" msgstr "Cerchio" -#. Ellipse shape tool (X radius and Y radius may differ) -#: ../shapes.h:246 ../shapes.h:247 +#. Ellipse shape tool (X radius and Y radius may differ) +#: ../shapes.h:246 ../shapes.h:247 msgid "Ellipse" msgstr "Ellisse" -#. Triangle shape tool (3 sides) -#: ../shapes.h:250 ../shapes.h:251 +#. Triangle shape tool (3 sides) +#: ../shapes.h:250 ../shapes.h:251 msgid "Triangle" msgstr "Triangolo" -#. Pentagone shape tool (5 sides) -#: ../shapes.h:254 ../shapes.h:255 +#. Pentagone shape tool (5 sides) +#: ../shapes.h:254 ../shapes.h:255 msgid "Pentagon" msgstr "Pentagono" -#. Rhombus shape tool (4 sides, not at right angles) -#: ../shapes.h:258 ../shapes.h:259 +#. Rhombus shape tool (4 sides, not at right angles) +#: ../shapes.h:258 ../shapes.h:259 msgid "Rhombus" msgstr "Rombo" -#. Octagon shape tool (8 sides) -#: ../shapes.h:262 ../shapes.h:263 +#. Octagon shape tool (8 sides) +#: ../shapes.h:262 ../shapes.h:263 msgid "Octagon" msgstr "Ottagono" -#. Triangle star (3 points star) -#. Rhombus star (4 points star) -#. Pentagone star (5 points star) -#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 -#: ../shapes.h:278 ../shapes.h:281 +#. Triangle star (3 points star) +#. Rhombus star (4 points star) +#. Pentagone star (5 points star) +#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 +#: ../shapes.h:278 ../shapes.h:281 msgid "Star" msgstr "Stella" -#. Description of a square -#: ../shapes.h:289 ../shapes.h:290 +#. Description of a square +#: ../shapes.h:289 ../shapes.h:290 msgid "A square is a rectangle with four equal sides." msgstr "Un quadrato è un rettangolo con tutti i lati uguali." -#. Description of a rectangle -#: ../shapes.h:293 ../shapes.h:294 +#. Description of a rectangle +#: ../shapes.h:293 ../shapes.h:294 msgid "A rectangle has four sides and four right angles." msgstr "Un rettangolo ha quattro lati e quatto angoli retti." -#. Description of a circle -#: ../shapes.h:297 ../shapes.h:298 +#. Description of a circle +#: ../shapes.h:297 ../shapes.h:298 msgid "" "A circle is a curve where all points have the same distance from the center." msgstr "" "Un cerchio è una curva in cui tutti i punti hanno la stessa distanza dal " "centro." -#. Description of an ellipse -#: ../shapes.h:301 ../shapes.h:302 +#. Description of an ellipse +#: ../shapes.h:301 ../shapes.h:302 msgid "An ellipse is a stretched circle." msgstr "Un'ellisse è un cerchio allungato." -#. Description of a triangle -#: ../shapes.h:305 ../shapes.h:306 +#. Description of a triangle +#: ../shapes.h:305 ../shapes.h:306 msgid "A triangle has three sides." msgstr "Un triangolo ha tre lati." -#. Description of a pentagon -#: ../shapes.h:309 ../shapes.h:310 +#. Description of a pentagon +#: ../shapes.h:309 ../shapes.h:310 msgid "A pentagon has five sides." msgstr "Un pentagono ha cinque lati." -#. Description of a rhombus -#: ../shapes.h:313 ../shapes.h:314 +#. Description of a rhombus +#: ../shapes.h:313 ../shapes.h:314 msgid "A rhombus has four equal sides, and opposite sides are parallel." msgstr "Un rombo ha quattro lati uguali e i lati opposti sono paralleli." -#. Description of an octagon -#: ../shapes.h:317 ../shapes.h:318 +#. Description of an octagon +#: ../shapes.h:317 ../shapes.h:318 msgid "An octagon has eight equal sides." msgstr "Un ottagono ha otto lati uguali." -#: ../shapes.h:320 ../shapes.h:321 +#: ../shapes.h:320 ../shapes.h:321 msgid "A star with 3 points." msgstr "Una stella con 3 punte." -#: ../shapes.h:322 ../shapes.h:323 +#: ../shapes.h:322 ../shapes.h:323 msgid "A star with 4 points." msgstr "Una stella con 4 punte." -#: ../shapes.h:324 ../shapes.h:325 +#: ../shapes.h:324 ../shapes.h:325 msgid "A star with 5 points." msgstr "Una stella con 5 punte." -#: ../shapes.h:372 +#: ../shapes.h:372 msgid "Draw shapes from the center." msgstr "" -#: ../shapes.h:373 +#: ../shapes.h:373 msgid "Draw shapes from a corner." msgstr "" -#. Title of tool selector (buttons down the left) -#: ../titles.h:56 +#. Title of tool selector (buttons down the left) +#: ../titles.h:56 msgid "Tools" msgstr "Strumenti" -#. Title of color palette (buttons across the bottom) -#: ../titles.h:59 +#. Title of color palette (buttons across the bottom) +#: ../titles.h:59 msgid "Colors" msgstr "Colori" -#. Title of brush selector (buttons down the right for paint and line tools) -#: ../titles.h:62 +#. Title of brush selector (buttons down the right for paint and line tools) +#: ../titles.h:62 msgid "Brushes" msgstr "Pennelli" -#. Title of eraser selector (buttons down the right for eraser tool) -#: ../titles.h:65 +#. Title of eraser selector (buttons down the right for eraser tool) +#: ../titles.h:65 msgid "Erasers" msgstr "Gomme" -#. Title of stamp selector (buttons down the right for stamps tool) -#: ../titles.h:68 +#. Title of stamp selector (buttons down the right for stamps tool) +#: ../titles.h:68 msgid "Stamps" msgstr "Timbri" -#. Title of shape selector (buttons down the right for shapes tool) -#. Shape creation tool (square, circle, etc.) -#: ../titles.h:71 ../tools.h:71 +#. Title of shape selector (buttons down the right for shapes tool) +#. Shape creation tool (square, circle, etc.) +#: ../titles.h:71 ../tools.h:71 msgid "Shapes" msgstr "Forme" -#. Title of font selector (buttons down the right for text and label tools) -#: ../titles.h:74 +#. Title of font selector (buttons down the right for text and label tools) +#: ../titles.h:74 msgid "Letters" msgstr "Lettere" -#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) -#. "Magic" effects tools (blur, flip image, etc.) -#: ../titles.h:77 ../tools.h:83 +#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) +#. "Magic" effects tools (blur, flip image, etc.) +#: ../titles.h:77 ../tools.h:83 msgid "Magic" msgstr "Magie" -#. Freehand painting tool -#: ../tools.h:62 +#. Freehand painting tool +#: ../tools.h:62 msgid "Paint" msgstr "Disegno" -#. Stamp tool (aka Rubber Stamps) -#: ../tools.h:65 +#. Stamp tool (aka Rubber Stamps) +#: ../tools.h:65 msgid "Stamp" msgstr "Timbro" -#. Line drawing tool -#: ../tools.h:68 +#. Line drawing tool +#: ../tools.h:68 msgid "Lines" msgstr "Linee" -#. Text tool -#: ../tools.h:74 +#. Text tool +#: ../tools.h:74 msgid "Text" msgstr "Testo" -#. Label tool -#: ../tools.h:77 +#. Label tool +#: ../tools.h:77 msgid "Label" msgstr "Etichetta" -#. Fill tool -#: ../tools.h:80 +#. Fill tool +#: ../tools.h:80 msgid "Fill" msgstr "Riempi" -#. Undo last action -#: ../tools.h:86 +#. Undo last action +#: ../tools.h:86 msgid "Undo" msgstr "Annulla" -#. Redo undone action -#: ../tools.h:89 +#. Redo undone action +#: ../tools.h:89 msgid "Redo" msgstr "Ripeti" -#. Eraser tool -#: ../tools.h:92 +#. Eraser tool +#: ../tools.h:92 msgid "Eraser" msgstr "Gomma" -#. Start a new picture -#: ../tools.h:95 +#. Start a new picture +#: ../tools.h:95 msgid "New" msgstr "Nuovo" # buttons for the file open dialog # buttons for the file open dialog -#. 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 +#. 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 msgid "Open" msgstr "Apri" -#. Save the current picture -#: ../tools.h:101 +#. Save the current picture +#: ../tools.h:101 msgid "Save" msgstr "Salva" -#. Print the current picture -#: ../tools.h:104 +#. Print the current picture +#: ../tools.h:104 msgid "Print" msgstr "Stampa" -#. Quit/exit Tux Paint application -#: ../tools.h:107 +#. Quit/exit Tux Paint application +#: ../tools.h:107 msgid "Quit" msgstr "Esci" -#. Paint tool instructions -#: ../tools.h:115 +#. Paint tool instructions +#: ../tools.h:115 msgid "Pick a color and a brush shape to draw with." msgstr "Scegli un colore e una forma di pennello con cui disegnare." -#. Stamp tool instructions -#: ../tools.h:118 +#. Stamp tool instructions +#: ../tools.h:118 msgid "Pick a picture to stamp around your drawing." msgstr "Scegli un'immagine da timbrare sul disegno." -#. Line tool instructions -#: ../tools.h:121 +#. Line tool instructions +#: ../tools.h:121 msgid "Click to start drawing a line. Let go to complete it." msgstr "" "Fai clic per iniziare una linea. Lascia andare il tasto per completarla." -#: ../tools.h:125 +#: ../tools.h:125 #, fuzzy #| msgid "" #| "Pick a shape. Click to pick the center, drag, then let go when it is the " @@ -509,7 +509,7 @@ msgstr "" "il tasto del mouse quando è grande quanto desideri. Muovi il mouse per " "ruotare la forma e fai clic per completare." -#: ../tools.h:129 +#: ../tools.h:129 msgid "" "Choose a style of text. Click on your drawing and you can start typing. " "Press [Enter] or [Tab] to complete the text." @@ -517,7 +517,7 @@ msgstr "" "Scegli uno stile per il testo. Fai clic sul disegno per iniziare a scrivere. " "Premi [Invio] o [Tab] per completare." -#: ../tools.h:133 +#: ../tools.h:133 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 " @@ -529,352 +529,352 @@ msgstr "" "un'etichetta esistente, la puoi spostare, modificare e puoi cambiare il suo " "stile di testo." -#. Fill tool instructions -#: ../tools.h:136 +#. Fill tool instructions +#: ../tools.h:136 msgid "Click in the picture to fill that area with color." msgstr "Fai clic per riempire l'area di colore." -#. Magic tool instruction -#: ../tools.h:139 +#. Magic tool instruction +#: ../tools.h:139 msgid "Pick a magical effect to use on your drawing!" msgstr "Scegli un effetto magico da usare nel tuo disegno!" # Undo # Undo -#. Response to 'undo' action -#: ../tools.h:142 +#. Response to 'undo' action +#: ../tools.h:142 msgid "Undo!" msgstr "Annulla!" # Redo # Redo -#. Response to 'redo' action -#: ../tools.h:145 +#. Response to 'redo' action +#: ../tools.h:145 msgid "Redo!" msgstr "Ripeti!" # Eraser # Eraser -#. Eraser tool -#: ../tools.h:148 +#. Eraser tool +#: ../tools.h:148 msgid "Eraser!" msgstr "Gomma!" -#. Response to 'start a new image' action -#: ../tools.h:151 +#. Response to 'start a new image' action +#: ../tools.h:151 msgid "Pick a color or picture with which to start a new drawing." msgstr "Scegli un colore o un'immagine con cui iniziare un nuovo disegno." # Open # Open -#. Response to 'open' action (while file dialog is being constructed) -#: ../tools.h:154 +#. Response to 'open' action (while file dialog is being constructed) +#: ../tools.h:154 msgid "Open…" msgstr "Apri…" # Save # Save -#. Response to 'save' action -#: ../tools.h:157 +#. Response to 'save' action +#: ../tools.h:157 msgid "Your image has been saved!" msgstr "Il tuo disegno è stato salvato!" # Print # Print -#. Response to 'print' action (while printing, or print dialog is being used) -#: ../tools.h:160 +#. Response to 'print' action (while printing, or print dialog is being used) +#: ../tools.h:160 msgid "Printing…" msgstr "Sto stampando…" # Quit # Quit -#. Response to 'quit' (exit) action -#: ../tools.h:163 +#. Response to 'quit' (exit) action +#: ../tools.h:163 msgid "Bye bye!" msgstr "Arrivederci!" -#. Instruction while using Line tool (after click, before release) -#: ../tools.h:167 +#. Instruction while using Line tool (after click, before release) +#: ../tools.h:167 msgid "Let go of the button to complete the line." msgstr "Lascia andare il pulsante per completare la linea." -#. Instruction while using Shape tool (after first click, before release) -#: ../tools.h:170 +#. Instruction while using Shape tool (after first click, before release) +#: ../tools.h:170 msgid "Hold the button to stretch the shape." msgstr "Tieni premuto il pulsante per allungare la forma." -#. Instruction while finishing Shape tool (after release, during rotation step before second click) -#: ../tools.h:173 +#. Instruction while finishing Shape tool (after release, during rotation step before second click) +#: ../tools.h:173 msgid "Move the mouse to rotate the shape. Click to draw it." msgstr "Muovi il mouse per ruotare la forma. Fai clic per completare." -#. Notification that 'New' action was aborted (current image would have been lost) -#: ../tools.h:176 +#. Notification that 'New' action was aborted (current image would have been lost) +#: ../tools.h:176 msgid "OK then… Let’s keep drawing this one!" msgstr "Allora ok… continuiamo a disegnare questo!" # FIXME: Move elsewhere!!! # FIXME: Move elsewhere!!! -#. Prompt to confirm user wishes to quit -#: ../tuxpaint.c:2134 +#. Prompt to confirm user wishes to quit +#: ../tuxpaint.c:2134 msgid "Do you really want to quit?" msgstr "Vuoi veramente uscire?" -#. Quit prompt positive response (quit) -#: ../tuxpaint.c:2137 +#. Quit prompt positive response (quit) +#: ../tuxpaint.c:2137 msgid "Yes, I’m done!" msgstr "Sì, ho finito!" -#. Quit prompt negative response (don't quit) -#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 +#. Quit prompt negative response (don't quit) +#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 msgid "No, take me back!" msgstr "No, torna indietro!" -#. Current picture is not saved; user is quitting -#: ../tuxpaint.c:2144 +#. Current picture is not saved; user is quitting +#: ../tuxpaint.c:2144 msgid "If you quit, you’ll lose your picture! Save it?" msgstr "Uscendo adesso, il disegno verrà perso! Vuoi salvarlo?" -#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 +#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 msgid "Yes, save it!" msgstr "Sì, salva!" -#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 +#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 msgid "No, don’t bother saving!" msgstr "No, non voglio salvare!" -#. Current picture is not saved; user is opening another picture -#: ../tuxpaint.c:2149 +#. Current picture is not saved; user is opening another picture +#: ../tuxpaint.c:2149 msgid "Save your picture first?" msgstr "Vuoi salvare il disegno, prima?" -#. Error opening picture -#: ../tuxpaint.c:2154 +#. Error opening picture +#: ../tuxpaint.c:2154 msgid "Can’t open that picture!" msgstr "Non è possibile aprire quel disegno!" -#. Generic dialog dismissal -#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 -#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 +#. Generic dialog dismissal +#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 +#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 msgid "OK" msgstr "OK" -#. Notification that 'Open' dialog has nothing to show -#: ../tuxpaint.c:2161 +#. Notification that 'Open' dialog has nothing to show +#: ../tuxpaint.c:2161 msgid "There are no saved files!" msgstr "Non ci sono file salvati!" -#. Verification of print action -#: ../tuxpaint.c:2165 +#. Verification of print action +#: ../tuxpaint.c:2165 msgid "Print your picture now?" msgstr "Vuoi stampare il disegno adesso?" -#: ../tuxpaint.c:2166 +#: ../tuxpaint.c:2166 msgid "Yes, print it!" msgstr "Sì, stampa!" -#. Confirmation of successful (we hope) printing -#: ../tuxpaint.c:2170 +#. Confirmation of successful (we hope) printing +#: ../tuxpaint.c:2170 msgid "Your picture has been printed!" msgstr "Il tuo disegno è stato stampato!" -#. We got an error printing -#: ../tuxpaint.c:2174 +#. We got an error printing +#: ../tuxpaint.c:2174 msgid "Sorry! Your picture could not be printed!" msgstr "Non è possibile stampare il tuo disegno!" -#. Notification that it's too soon to print again (--printdelay option is in effect) -#: ../tuxpaint.c:2177 +#. Notification that it's too soon to print again (--printdelay option is in effect) +#: ../tuxpaint.c:2177 msgid "You can’t print yet!" msgstr "Non puoi ancora stampare!" -#. Prompt to confirm erasing a picture in the Open dialog -#: ../tuxpaint.c:2181 +#. Prompt to confirm erasing a picture in the Open dialog +#: ../tuxpaint.c:2181 msgid "Erase this picture?" msgstr "Vuoi cancellare il disegno?" -#: ../tuxpaint.c:2182 +#: ../tuxpaint.c:2182 msgid "Yes, erase it!" msgstr "Sì, cancella!" -#: ../tuxpaint.c:2183 +#: ../tuxpaint.c:2183 msgid "No, don’t erase it!" msgstr "No, non cancellare!" -#. Reminder that Mouse Button 1 is the button to use in Tux Paint -#: ../tuxpaint.c:2186 +#. Reminder that Mouse Button 1 is the button to use in Tux Paint +#: ../tuxpaint.c:2186 msgid "Remember to use the left mouse button!" msgstr "Ricorda di usare il pulsante sinistro del mouse!" -#. Confirmation of successful (we hope) image export -#: ../tuxpaint.c:2190 +#. Confirmation of successful (we hope) image export +#: ../tuxpaint.c:2190 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your picture has been exported!" msgstr "Il tuo disegno è stato stampato!" -#: ../tuxpaint.c:2191 +#: ../tuxpaint.c:2191 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your slideshow GIF has been exported!" msgstr "Il tuo disegno è stato stampato!" -#. We got an error exporting -#: ../tuxpaint.c:2195 +#. 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 "Non è possibile stampare il tuo disegno!" -#: ../tuxpaint.c:2196 +#: ../tuxpaint.c:2196 #, fuzzy #| msgid "Sorry! Your picture could not be printed!" msgid "Sorry! Your slideshow GIF could not be exported!" msgstr "Non è possibile stampare il tuo disegno!" # Let user choose images: -#. Slideshow instructions -#: ../tuxpaint.c:2200 +#. Slideshow instructions +#: ../tuxpaint.c:2200 msgid "Choose the pictures you want, then click “Play”." msgstr "Scegli i disegni che desideri e fai clic su «Mostra»." -#. Sound has been muted (silenced) via keyboard shortcut -#: ../tuxpaint.c:2407 +#. Sound has been muted (silenced) via keyboard shortcut +#: ../tuxpaint.c:2407 msgid "Sound muted." msgstr "Audio disattivato." -#. Sound has been unmuted (unsilenced) via keyboard shortcut -#: ../tuxpaint.c:2412 +#. Sound has been unmuted (unsilenced) via keyboard shortcut +#: ../tuxpaint.c:2412 msgid "Sound unmuted." msgstr "Audio attivato." -#. Wait while Text tool finishes loading fonts -#: ../tuxpaint.c:3167 +#. Wait while Text tool finishes loading fonts +#: ../tuxpaint.c:3167 msgid "Please wait…" msgstr "Attendi…" -#. Open dialog: 'Erase' button, to erase/deleted the selected picture -#: ../tuxpaint.c:7923 +#. Open dialog: 'Erase' button, to erase/deleted the selected picture +#: ../tuxpaint.c:7923 msgid "Erase" msgstr "Cancella" -#. Open dialog: 'Slides' button, to switch to slide show mode -#: ../tuxpaint.c:7926 +#. Open dialog: 'Slides' button, to switch to slide show mode +#: ../tuxpaint.c:7926 msgid "Slides" msgstr "Diapositive" -#. Open dialog: 'Export' button, to copy an image to an easily-accessible location -#: ../tuxpaint.c:7929 +#. Open dialog: 'Export' button, to copy an image to an easily-accessible location +#: ../tuxpaint.c:7929 msgid "Export" msgstr "" -#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture -#: ../tuxpaint.c:7932 +#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture +#: ../tuxpaint.c:7932 msgid "Back" msgstr "Indietro" -#. Slideshow: 'Play' button, to begin a slideshow sequence -#: ../tuxpaint.c:7935 +#. Slideshow: 'Play' button, to begin a slideshow sequence +#: ../tuxpaint.c:7935 msgid "Play" msgstr "Mostra" -#. Slideshow: 'GIF Export' button, to create an animated GIF -#: ../tuxpaint.c:7938 +#. Slideshow: 'GIF Export' button, to create an animated GIF +#: ../tuxpaint.c:7938 msgid "GIF Export" msgstr "" -#. Slideshow: 'Next' button, to load next slide (image) -#: ../tuxpaint.c:7941 +#. Slideshow: 'Next' button, to load next slide (image) +#: ../tuxpaint.c:7941 msgid "Next" msgstr "Avanti" -#. 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 +#. 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 msgid "Aa" msgstr "Aa" # FIXME: Move elsewhere! Or not?! # FIXME: Move elsewhere! Or not?! -#. 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 +#. 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 msgid "Yes" msgstr "Sì" -#: ../tuxpaint.c:12073 +#: ../tuxpaint.c:12073 msgid "No" msgstr "No" # FIXME: Move elsewhere!!! # #define PROMPT_SAVE_OVER_TXT gettext_noop("Save over the older version of this picture?") -#. Prompt to ask whether user wishes to save over old version of their file -#: ../tuxpaint.c:13190 +#. Prompt to ask whether user wishes to save over old version of their file +#: ../tuxpaint.c:13190 msgid "Replace the picture with your changes?" msgstr "Vuoi sostituire il disegno precedente?" -#. Positive response to saving over old version -#. (like a 'File:Save' action in other applications) -#: ../tuxpaint.c:13194 +#. Positive response to saving over old version +#. (like a 'File:Save' action in other applications) +#: ../tuxpaint.c:13194 msgid "Yes, replace the old one!" msgstr "Sì, sostituisci il vecchio disegno!" -#. Negative response to saving over old version (saves a new image) -#. (like a 'File:Save As...' action in other applications) -#: ../tuxpaint.c:13198 +#. Negative response to saving over old version (saves a new image) +#. (like a 'File:Save As...' action in other applications) +#: ../tuxpaint.c:13198 msgid "No, save a new file!" msgstr "No, crea un nuovo file!" -#. Let user choose an image: -#. Instructions for 'Open' file dialog -#: ../tuxpaint.c:14454 +#. Let user choose an image: +#. Instructions for 'Open' file dialog +#: ../tuxpaint.c:14454 msgid "Choose the picture you want, then click “Open”." msgstr "Scegli il disegno che desideri e fai clic su «Apri»." -#. 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 +#. 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 "" -#: ../tuxpaint.c:23539 +#: ../tuxpaint.c:23539 msgid "Select a color from your drawing." msgstr "Seleziona un colore dal tuo disegno." -#: ../tuxpaint.c:23551 +#: ../tuxpaint.c:23551 msgid "Pick a color." msgstr "Scegli un colore." -#: ../tuxpaint.desktop.in.h:1 +#: ../tuxpaint.desktop.in.h:1 msgid "Tux Paint" msgstr "Tux Paint" -#: ../tuxpaint.desktop.in.h:2 +#: ../tuxpaint.desktop.in.h:2 msgid "Drawing program" msgstr "Programma di disegno" -#: ../tuxpaint.desktop.in.h:3 +#: ../tuxpaint.desktop.in.h:3 msgid "A drawing program for children." msgstr "Un programma di disegno per bambini." -#: ../../magic/src/alien.c:68 +#: ../../magic/src/alien.c:68 msgid "Color Shift" msgstr "Cambia colore" -#: ../../magic/src/alien.c:72 +#: ../../magic/src/alien.c:72 msgid "Click and drag the mouse to change the colors in parts of your picture." msgstr "" "Fai clic e trascina il mouse per cambiare i colori di parti del tuo disegno." -#: ../../magic/src/alien.c:73 +#: ../../magic/src/alien.c:73 msgid "Click to change the colors in your entire picture." msgstr "Fai clic per cambiare i colori di tutto il disegno." -#: ../../magic/src/blind.c:116 +#: ../../magic/src/blind.c:116 msgid "Blind" msgstr "Tendine" -#: ../../magic/src/blind.c:123 +#: ../../magic/src/blind.c:123 msgid "" "Click towards the edge of your picture to pull window blinds over it. Move " "perpendicularly to open or close the blinds." @@ -882,226 +882,226 @@ msgstr "" "Fai clic verso il bordo del tuo disegno per far scendere delle tendine su di " "esso. Spostati perpendicolarmente per aprirle o chiuderle." -#: ../../magic/src/blocks_chalk_drip.c:129 +#: ../../magic/src/blocks_chalk_drip.c:129 msgid "Blocks" msgstr "Blocchi" -#: ../../magic/src/blocks_chalk_drip.c:131 +#: ../../magic/src/blocks_chalk_drip.c:131 msgid "Chalk" msgstr "Gesso" -#: ../../magic/src/blocks_chalk_drip.c:133 +#: ../../magic/src/blocks_chalk_drip.c:133 msgid "Drip" msgstr "Gocciola" -#: ../../magic/src/blocks_chalk_drip.c:142 +#: ../../magic/src/blocks_chalk_drip.c:142 msgid "Click and drag the mouse around to make the picture blocky." msgstr "Fai clic e trascina il mouse per per rendere il disegno a blocchi." -#: ../../magic/src/blocks_chalk_drip.c:144 +#: ../../magic/src/blocks_chalk_drip.c:144 msgid "" "Click and drag the mouse around to turn the picture into a chalk drawing." msgstr "" "Fai clic e trascina il mouse per trasformare il disegno in uno fatto a " "gessetto." -#: ../../magic/src/blocks_chalk_drip.c:146 +#: ../../magic/src/blocks_chalk_drip.c:146 msgid "Click and drag the mouse around to make the picture drip." msgstr "Fai clic e trascina il mouse per far gocciolare il disegno." -#: ../../magic/src/blur.c:80 +#: ../../magic/src/blur.c:80 msgid "Blur" msgstr "Sfoca" -#: ../../magic/src/blur.c:84 +#: ../../magic/src/blur.c:84 msgid "Click and drag the mouse around to blur the image." msgstr "Fai clic e trascina il mouse per rendere sfocata l'immagine." -#: ../../magic/src/blur.c:85 +#: ../../magic/src/blur.c:85 msgid "Click to blur the entire image." msgstr "Fai clic per rendere sfocato tutto il disegno." -#. Both are named "Bricks", at the moment: -#: ../../magic/src/bricks.c:120 +#. Both are named "Bricks", at the moment: +#: ../../magic/src/bricks.c:120 msgid "Bricks" msgstr "Mattoni" -#: ../../magic/src/bricks.c:127 +#: ../../magic/src/bricks.c:127 msgid "Click and drag to draw large bricks." msgstr "Fai clic e trascina per disegnare dei mattoni grandi." -#: ../../magic/src/bricks.c:129 +#: ../../magic/src/bricks.c:129 msgid "Click and drag to draw small bricks." msgstr "Fai clic e trascina per disegnare dei mattoni piccoli." -#: ../../magic/src/calligraphy.c:124 +#: ../../magic/src/calligraphy.c:124 msgid "Calligraphy" msgstr "Calligrafia" -#: ../../magic/src/calligraphy.c:131 +#: ../../magic/src/calligraphy.c:131 msgid "Click and drag the mouse around to draw in calligraphy." msgstr "Fai clic e trascina il mouse per disegnare con un pennino." -#: ../../magic/src/cartoon.c:103 +#: ../../magic/src/cartoon.c:103 msgid "Cartoon" msgstr "Fumetto" -#: ../../magic/src/cartoon.c:109 +#: ../../magic/src/cartoon.c:109 msgid "Click and drag the mouse around to turn the picture into a cartoon." msgstr "Fai clic e trascina il mouse per trasformare il disegno in un fumetto." -#: ../../magic/src/confetti.c:83 +#: ../../magic/src/confetti.c:83 msgid "Confetti" msgstr "Coriandoli" -#: ../../magic/src/confetti.c:88 +#: ../../magic/src/confetti.c:88 msgid "Click to throw confetti!" msgstr "Fai clic per lanciare i coriandoli!" -#: ../../magic/src/distortion.c:134 +#: ../../magic/src/distortion.c:134 msgid "Distortion" msgstr "Distorsione" -#: ../../magic/src/distortion.c:143 +#: ../../magic/src/distortion.c:143 msgid "Click and drag the mouse to cause distortion in your picture." msgstr "" "Fai clic e trascina il mouse per creare una distorsione nel tuo disegno." -#: ../../magic/src/emboss.c:101 +#: ../../magic/src/emboss.c:101 msgid "Emboss" msgstr "Rilievo" -#: ../../magic/src/emboss.c:107 +#: ../../magic/src/emboss.c:107 msgid "Click and drag the mouse to emboss the picture." msgstr "Fai clic e trascina il mouse per rendere il disegno in rilievo." -#: ../../magic/src/fade_darken.c:114 +#: ../../magic/src/fade_darken.c:114 msgid "Lighten" msgstr "Schiarisci" -#: ../../magic/src/fade_darken.c:116 +#: ../../magic/src/fade_darken.c:116 msgid "Darken" msgstr "Scurisci" -#: ../../magic/src/fade_darken.c:127 +#: ../../magic/src/fade_darken.c:127 msgid "Click and drag the mouse to lighten parts of your picture." msgstr "Fai clic e trascina il mouse per schiarire parti del tuo disegno." -#: ../../magic/src/fade_darken.c:129 +#: ../../magic/src/fade_darken.c:129 msgid "Click to lighten your entire picture." msgstr "Fai clic per schiarire tutto il disegno." -#: ../../magic/src/fade_darken.c:134 +#: ../../magic/src/fade_darken.c:134 msgid "Click and drag the mouse to darken parts of your picture." msgstr "Fai clic e trascina il mouse per scurire parti del tuo disegno." -#: ../../magic/src/fade_darken.c:136 +#: ../../magic/src/fade_darken.c:136 msgid "Click to darken your entire picture." msgstr "Fai clic per scurire tutto il disegno." -#: ../../magic/src/fisheye.c:101 +#: ../../magic/src/fisheye.c:101 msgid "Fisheye" msgstr "Ultragrandangolo" -#: ../../magic/src/fisheye.c:106 +#: ../../magic/src/fisheye.c:106 msgid "Click on part of your picture to create a fisheye effect." msgstr "" "Fai clic su una parte del disegno per aggiungere un effetto ultragrandangolo." -#: ../../magic/src/flower.c:144 +#: ../../magic/src/flower.c:144 msgid "Flower" msgstr "Fiore" -#: ../../magic/src/flower.c:150 +#: ../../magic/src/flower.c:150 msgid "Click and drag to draw a flower stalk. Let go to finish the flower." msgstr "" "Fai clic e trascina il mouse per disegnare il gambo di un fiore. Lascia " "andare il tasto per completarlo." -#: ../../magic/src/foam.c:114 +#: ../../magic/src/foam.c:114 msgid "Foam" msgstr "Schiuma" -#: ../../magic/src/foam.c:120 +#: ../../magic/src/foam.c:120 msgid "Click and drag the mouse to cover an area with foamy bubbles." msgstr "Fai clic e trascina il mouse per coprire un'area con bolle di schiuma." -#: ../../magic/src/fold.c:103 +#: ../../magic/src/fold.c:103 msgid "Fold" msgstr "Piega" -#: ../../magic/src/fold.c:108 +#: ../../magic/src/fold.c:108 msgid "" "Choose a background color and click to turn the corner of the page over." msgstr "" "Scegli un colore per lo sfondo e fai clic e trascina per girare l'angolo " "della pagina." -#: ../../magic/src/fretwork.c:176 +#: ../../magic/src/fretwork.c:176 msgid "Fretwork" msgstr "Intarsio" -#: ../../magic/src/fretwork.c:182 +#: ../../magic/src/fretwork.c:182 msgid "Click and drag to draw repetitive patterns. " msgstr "Fai clic e trascina per disegnare modelli ripetitivi." -#: ../../magic/src/fretwork.c:184 +#: ../../magic/src/fretwork.c:184 msgid "Click to surround your picture with repetitive patterns." msgstr "Fai clic per contornare il tuo disegno con modelli ripetitivi." -#: ../../magic/src/glasstile.c:104 +#: ../../magic/src/glasstile.c:104 msgid "Glass Tile" msgstr "Mattonella di vetro" -#: ../../magic/src/glasstile.c:111 +#: ../../magic/src/glasstile.c:111 msgid "Click and drag the mouse to put glass tile over your picture." msgstr "" "Fai clic e trascina il mouse per posizionare mattonelle di vetro sopra il " "tuo disegno." -#: ../../magic/src/glasstile.c:113 +#: ../../magic/src/glasstile.c:113 msgid "Click to cover your entire picture in glass tiles." msgstr "Fai clic per coprire con mattonelle di vetro tutto il tuo disegno." -#: ../../magic/src/grass.c:107 +#: ../../magic/src/grass.c:107 msgid "Grass" msgstr "Erba" -#: ../../magic/src/grass.c:113 +#: ../../magic/src/grass.c:113 msgid "Click and drag to draw grass. Don’t forget the dirt!" msgstr "" "Fai clic e trascina per disegnare dell'erba. Non dimenticare il terreno!" -#: ../../magic/src/halftone.c:35 +#: ../../magic/src/halftone.c:35 msgid "Halftone" msgstr "Mezzatinta" -#: ../../magic/src/halftone.c:39 +#: ../../magic/src/halftone.c:39 msgid "Click and drag to turn your drawing into a newspaper." msgstr "Fai clic e trascina per trasformare il tuo disegno in un quotidiano." -#: ../../magic/src/kalidescope.c:119 +#: ../../magic/src/kalidescope.c:119 msgid "Symmetric Left/Right" msgstr "Simmetrico sinistra/destra" -#: ../../magic/src/kalidescope.c:123 +#: ../../magic/src/kalidescope.c:123 msgid "Symmetric Up/Down" msgstr "Simmetrico sopra/sotto" -#: ../../magic/src/kalidescope.c:127 +#: ../../magic/src/kalidescope.c:127 msgid "Pattern" msgstr "Modello" -#: ../../magic/src/kalidescope.c:131 +#: ../../magic/src/kalidescope.c:131 msgid "Tiles" msgstr "Tessere" -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:135 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:135 msgid "Kaleidoscope" msgstr "Caleidoscopio" -#: ../../magic/src/kalidescope.c:146 +#: ../../magic/src/kalidescope.c:146 msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the left and right of your picture." @@ -1109,7 +1109,7 @@ msgstr "" "Fai clic e trascina il mouse per disegnare con due pennelli che sono " "simmetrici nel lato destro e sinistro del tuo disegno." -#: ../../magic/src/kalidescope.c:152 +#: ../../magic/src/kalidescope.c:152 msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the top and bottom of your picture." @@ -1117,11 +1117,11 @@ msgstr "" "Fai clic e trascina il mouse per disegnare con due pennelli che sono " "simmetrici in alto e in basso nel tuo disegno." -#: ../../magic/src/kalidescope.c:156 +#: ../../magic/src/kalidescope.c:156 msgid "Click and drag the mouse to draw a pattern across the picture." msgstr "Fai clic e trascina il mouse per disegnare un modello nel tuo disegno." -#: ../../magic/src/kalidescope.c:160 +#: ../../magic/src/kalidescope.c:160 msgid "" "Click and drag the mouse to draw a pattern that is symmetric across the " "picture." @@ -1129,199 +1129,199 @@ msgstr "" "Fai clic e trascina il mouse per disegnare un modello che è simmetrico nel " "tuo disegno." -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:164 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:164 msgid "" "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." msgstr "" "Fai clic e trascina il mouse per disegnare con pennelli simmetrici (un " "caleidoscopio)." -#: ../../magic/src/light.c:103 +#: ../../magic/src/light.c:103 msgid "Light" msgstr "Luce" -#: ../../magic/src/light.c:109 +#: ../../magic/src/light.c:109 msgid "Click and drag to draw a beam of light on your picture." msgstr "Fai clic e trascina per disegnare un fascio di luce nel tuo disegno." -#: ../../magic/src/metalpaint.c:98 +#: ../../magic/src/metalpaint.c:98 msgid "Metal Paint" msgstr "Tinta metallizzata" -#: ../../magic/src/metalpaint.c:105 +#: ../../magic/src/metalpaint.c:105 msgid "Click and drag the mouse to paint with a metallic color." msgstr "Fai clic e trascina il mouse per pitturare con una tinta metallizzata." -#: ../../magic/src/mirror_flip.c:110 +#: ../../magic/src/mirror_flip.c:110 msgid "Mirror" msgstr "Specchio" -#: ../../magic/src/mirror_flip.c:112 +#: ../../magic/src/mirror_flip.c:112 msgid "Flip" msgstr "Ribalta" -#: ../../magic/src/mirror_flip.c:121 +#: ../../magic/src/mirror_flip.c:121 msgid "Click to make a mirror image." msgstr "Fai clic per creare un'immagine speculare." -#: ../../magic/src/mirror_flip.c:123 +#: ../../magic/src/mirror_flip.c:123 msgid "Click to flip the picture upside-down." msgstr "Fai clic per ribaltare il disegno sotto-sopra." -#: ../../magic/src/mosaic.c:96 +#: ../../magic/src/mosaic.c:96 msgid "Mosaic" msgstr "Mosaico" -#: ../../magic/src/mosaic.c:100 +#: ../../magic/src/mosaic.c:100 msgid "" "Click and drag the mouse to add a mosaic effect to parts of your picture." msgstr "" "Fai clic e trascina il mouse per aggiungere un effetto mosaico a parti del " "tuo disegno." -#: ../../magic/src/mosaic.c:101 +#: ../../magic/src/mosaic.c:101 msgid "Click to add a mosaic effect to your entire picture." msgstr "Fai clic per aggiungere un effetto mosaico a tutto il tuo disegno." -#: ../../magic/src/mosaic_shaped.c:132 +#: ../../magic/src/mosaic_shaped.c:132 msgid "Square Mosaic" msgstr "Mosaico con quadrati" -#: ../../magic/src/mosaic_shaped.c:133 +#: ../../magic/src/mosaic_shaped.c:133 msgid "Hexagon Mosaic" msgstr "Mosaico con esagoni" -#: ../../magic/src/mosaic_shaped.c:134 +#: ../../magic/src/mosaic_shaped.c:134 msgid "Irregular Mosaic" msgstr "Mosaico irregolare" -#: ../../magic/src/mosaic_shaped.c:140 +#: ../../magic/src/mosaic_shaped.c:140 msgid "" "Click and drag the mouse to add a square mosaic to parts of your picture." msgstr "" "Fai clic e trascina il mouse per aggiungere un mosaico a quadrati in parti " "del tuo disegno." -#: ../../magic/src/mosaic_shaped.c:141 +#: ../../magic/src/mosaic_shaped.c:141 msgid "Click to add a square mosaic to your entire picture." msgstr "Fai clic per aggiungere un mosaico a quadrati a tutto il tuo disegno." -#: ../../magic/src/mosaic_shaped.c:145 +#: ../../magic/src/mosaic_shaped.c:145 msgid "" "Click and drag the mouse to add a hexagonal mosaic to parts of your picture." msgstr "" "Fai clic e trascina il mouse per aggiungere un mosaico ad esagoni a parti " "del tuo disegno." -#: ../../magic/src/mosaic_shaped.c:146 +#: ../../magic/src/mosaic_shaped.c:146 msgid "Click to add a hexagonal mosaic to your entire picture." msgstr "Fai clic per aggiungere un mosaico a esagoni a tutto il tuo disegno." -#: ../../magic/src/mosaic_shaped.c:150 +#: ../../magic/src/mosaic_shaped.c:150 msgid "" "Click and drag the mouse to add an irregular mosaic to parts of your picture." msgstr "" "Fai clic e trascina il mouse per aggiungere un mosaico irregolare a parti " "del tuo disegno." -#: ../../magic/src/mosaic_shaped.c:151 +#: ../../magic/src/mosaic_shaped.c:151 msgid "Click to add an irregular mosaic to your entire picture." msgstr "Fai clic per aggiungere un mosaico irregolare a tutto il tuo disegno." -#: ../../magic/src/negative.c:94 +#: ../../magic/src/negative.c:94 msgid "Negative" msgstr "Negativo" -#: ../../magic/src/negative.c:101 +#: ../../magic/src/negative.c:101 msgid "Click and drag the mouse around to make your painting negative." msgstr "" "Fai clic e trascina il mouse per trasformare il tuo disegno in negativo." -#: ../../magic/src/negative.c:103 +#: ../../magic/src/negative.c:103 msgid "Click to turn your painting into its negative." msgstr "Fai clic per trasformare il tuo disegno nel suo negativo." -#: ../../magic/src/noise.c:66 +#: ../../magic/src/noise.c:66 msgid "Noise" msgstr "Rumore" -#: ../../magic/src/noise.c:70 +#: ../../magic/src/noise.c:70 msgid "Click and drag the mouse to add noise to parts of your picture." msgstr "" "Fai clic e trascina il mouse per aggiungere rumore a parti del tuo disegno." -#: ../../magic/src/noise.c:71 +#: ../../magic/src/noise.c:71 msgid "Click to add noise to your entire picture." msgstr "Fai clic per aggiungere rumore a tutto il disegno." -#: ../../magic/src/perspective.c:147 +#: ../../magic/src/perspective.c:147 msgid "Perspective" msgstr "Prospettiva" -#: ../../magic/src/perspective.c:148 +#: ../../magic/src/perspective.c:148 msgid "Zoom" msgstr "Zoom" -#: ../../magic/src/perspective.c:153 +#: ../../magic/src/perspective.c:153 msgid "Click on the corners and drag where you want to stretch the picture." msgstr "Fai clic sugli angoli e trascina dove vuoi allungare il disegno." -#: ../../magic/src/perspective.c:156 +#: ../../magic/src/perspective.c:156 msgid "Click and drag up to zoom in or drag down to zoom out the picture." msgstr "" "Fai clic e trascina in alto per ingrandire o in basso per rimpicciolire il " "disegno." -#: ../../magic/src/puzzle.c:103 +#: ../../magic/src/puzzle.c:103 msgid "Puzzle" msgstr "Puzzle" -#: ../../magic/src/puzzle.c:110 +#: ../../magic/src/puzzle.c:110 msgid "Click the part of your picture where would you like a puzzle." msgstr "Fai clic nella parte del disegno dove desideri un puzzle." -#: ../../magic/src/puzzle.c:111 +#: ../../magic/src/puzzle.c:111 msgid "Click to make a puzzle in fullscreen mode." msgstr "Fai clic per creare un puzzle a tutto schermo." -#: ../../magic/src/rails.c:129 +#: ../../magic/src/rails.c:129 msgid "Rails" msgstr "Rotaie" -#: ../../magic/src/rails.c:134 +#: ../../magic/src/rails.c:134 msgid "Click and drag to draw train track rails on your picture." msgstr "Fai clic e trascina per disegnare le rotaie del treno nel tuo disegno." -#: ../../magic/src/rainbow.c:133 +#: ../../magic/src/rainbow.c:133 msgid "Rainbow" msgstr "Arcobaleno" -#: ../../magic/src/rainbow.c:139 +#: ../../magic/src/rainbow.c:139 msgid "You can draw in rainbow colors!" msgstr "Puoi disegnare con i colori dell'arcobaleno!" -#: ../../magic/src/rain.c:68 +#: ../../magic/src/rain.c:68 msgid "Rain" msgstr "Pioggia" -#: ../../magic/src/rain.c:72 +#: ../../magic/src/rain.c:72 msgid "Click to place a rain drop onto your picture." msgstr "Fai clic per mettere una goccia di pioggia sul tuo disegno." -#: ../../magic/src/rain.c:73 +#: ../../magic/src/rain.c:73 msgid "Click to cover your picture with rain drops." msgstr "Fai clic per ricoprire di gocce di pioggia il tuo disegno." -#: ../../magic/src/realrainbow.c:98 +#: ../../magic/src/realrainbow.c:98 msgid "Real Rainbow" msgstr "Arcobaleno vero" -#: ../../magic/src/realrainbow.c:100 +#: ../../magic/src/realrainbow.c:100 msgid "ROYGBIV Rainbow" msgstr "Arcobaleno coi colori dell'iride" -#: ../../magic/src/realrainbow.c:108 +#: ../../magic/src/realrainbow.c:108 msgid "" "Click where you want your rainbow to start, drag to where you want it to " "end, and then let go to draw a rainbow." @@ -1329,125 +1329,125 @@ msgstr "" "Fai clic dove vuoi fare iniziare l'arcobaleno, trascina fino al punto finale " "e lascia andare il tasto per disegnare un arcobaleno." -#: ../../magic/src/ripples.c:102 +#: ../../magic/src/ripples.c:102 msgid "Ripples" msgstr "Increspature" -#: ../../magic/src/ripples.c:108 +#: ../../magic/src/ripples.c:108 msgid "Click to make ripples appear over your picture." msgstr "Fai clic per fare apparire increspature sul tuo disegno." -#: ../../magic/src/rosette.c:115 +#: ../../magic/src/rosette.c:115 msgid "Rosette" msgstr "Roselline" -#: ../../magic/src/rosette.c:117 +#: ../../magic/src/rosette.c:117 msgid "Picasso" msgstr "Picasso" -#: ../../magic/src/rosette.c:123 +#: ../../magic/src/rosette.c:123 msgid "Click and start drawing your rosette." msgstr "Fai clic per disegnare la tua rosellina." -#: ../../magic/src/rosette.c:125 +#: ../../magic/src/rosette.c:125 msgid "You can draw just like Picasso!" msgstr "Puoi dipingere proprio come Picasso!" -#: ../../magic/src/sharpen.c:76 +#: ../../magic/src/sharpen.c:76 msgid "Edges" msgstr "Contorni" -#: ../../magic/src/sharpen.c:77 +#: ../../magic/src/sharpen.c:77 msgid "Sharpen" msgstr "Risalta" -#: ../../magic/src/sharpen.c:78 +#: ../../magic/src/sharpen.c:78 msgid "Silhouette" msgstr "Sagoma" -#: ../../magic/src/sharpen.c:82 +#: ../../magic/src/sharpen.c:82 msgid "Click and drag the mouse to trace edges in parts of your picture." msgstr "" "Fai clic e trascina il mouse per disegnare i contorni in parti del tuo " "disegno." -#: ../../magic/src/sharpen.c:83 +#: ../../magic/src/sharpen.c:83 msgid "Click to trace edges in your entire picture." msgstr "Fai clic per disegnare i contorni delle forme in tutto il disegno." -#: ../../magic/src/sharpen.c:84 +#: ../../magic/src/sharpen.c:84 msgid "Click and drag the mouse to sharpen parts of your picture." msgstr "Fai clic e trascina per far risaltare parti del tuo disegno." -#: ../../magic/src/sharpen.c:85 +#: ../../magic/src/sharpen.c:85 msgid "Click to sharpen the entire picture." msgstr "Fai clic per far risaltare tutto il disegno." -#: ../../magic/src/sharpen.c:86 +#: ../../magic/src/sharpen.c:86 msgid "Click and drag the mouse to create a black and white silhouette." msgstr "Fai clic e trascina il mouse per creare una sagoma in bianco e nero." -#: ../../magic/src/sharpen.c:87 +#: ../../magic/src/sharpen.c:87 msgid "Click to create a black and white silhouette of your entire picture." msgstr "" "Fai click per creare una sagoma in bianco e nero di tutto il tuo disegno." -#: ../../magic/src/shift.c:106 +#: ../../magic/src/shift.c:106 msgid "Shift" msgstr "Sposta" -#: ../../magic/src/shift.c:112 +#: ../../magic/src/shift.c:112 msgid "Click and drag to shift your picture around on the canvas." msgstr "Fai clic e trascina per spostare il disegno sulla tela." -#: ../../magic/src/smudge.c:102 +#: ../../magic/src/smudge.c:102 msgid "Smudge" msgstr "Sfuma" -#. if (which == 1) -#: ../../magic/src/smudge.c:104 +#. if (which == 1) +#: ../../magic/src/smudge.c:104 msgid "Wet Paint" msgstr "Tinta bagnata" -#: ../../magic/src/smudge.c:111 +#: ../../magic/src/smudge.c:111 msgid "Click and drag the mouse around to smudge the picture." msgstr "Fai clic e trascina il mouse per sfumare il disegno." -#. if (which == 1) -#: ../../magic/src/smudge.c:113 +#. if (which == 1) +#: ../../magic/src/smudge.c:113 msgid "Click and drag the mouse around to draw with wet, smudgy paint." msgstr "" "Fai clic e trascina il mouse per disegnare con una pittura liquida che cola." -#: ../../magic/src/snow.c:71 +#: ../../magic/src/snow.c:71 msgid "Snow Ball" msgstr "Palle di neve" -#: ../../magic/src/snow.c:72 +#: ../../magic/src/snow.c:72 msgid "Snow Flake" msgstr "Fiocchi di neve" -#: ../../magic/src/snow.c:76 +#: ../../magic/src/snow.c:76 msgid "Click to add snow balls to your picture." msgstr "Fai clic per aggiungere palle di neve al tuo disegno." -#: ../../magic/src/snow.c:77 +#: ../../magic/src/snow.c:77 msgid "Click to add snow flakes to your picture." msgstr "Fai clic per aggiungere fiocchi di neve al tuo disegno." -#: ../../magic/src/string.c:129 +#: ../../magic/src/string.c:129 msgid "String edges" msgstr "Bordi di fili" -#: ../../magic/src/string.c:132 +#: ../../magic/src/string.c:132 msgid "String corner" msgstr "Angolo di fili" -#: ../../magic/src/string.c:135 +#: ../../magic/src/string.c:135 msgid "String 'V'" msgstr "\"V\" di fili" -#: ../../magic/src/string.c:147 +#: ../../magic/src/string.c:147 msgid "" "Click and drag to draw string art. Drag top-bottom to draw less or more " "lines, left or right to make a bigger hole." @@ -1456,33 +1456,33 @@ msgstr "" "in alto per disegnare più o meno linee, a sinistra o destra per creare un " "foro centrale più piccolo o grande." -#: ../../magic/src/string.c:150 +#: ../../magic/src/string.c:150 msgid "Click and drag to draw arrows made of string art." msgstr "Fai clic e trascina per disegnare frecce con arte fatta con i fili." -#: ../../magic/src/string.c:153 +#: ../../magic/src/string.c:153 msgid "Draw string art arrows with free angles." msgstr "Disegna frecce ad angolo libero con arte fatta con i fili." -#: ../../magic/src/tint.c:74 +#: ../../magic/src/tint.c:74 msgid "Tint" msgstr "Tinta" -#: ../../magic/src/tint.c:75 +#: ../../magic/src/tint.c:75 msgid "Color & White" msgstr "Colore e bianco" -#: ../../magic/src/tint.c:79 +#: ../../magic/src/tint.c:79 msgid "" "Click and drag the mouse around to change the color of parts of your picture." msgstr "" "Fai clic e trascina il mouse per cambiare i colori di parte del tuo disegno." -#: ../../magic/src/tint.c:80 +#: ../../magic/src/tint.c:80 msgid "Click to change the color of your entire picture." msgstr "Fai clic per cambiare il colore di tutto il tuo disegno." -#: ../../magic/src/tint.c:81 +#: ../../magic/src/tint.c:81 msgid "" "Click and drag the mouse around to turn parts of your picture into white and " "a color you choose." @@ -1490,34 +1490,34 @@ msgstr "" "Fai clic e trascina il mouse per trasformare parti del tuo disegno in bianco " "e in un colore a tua scelta." -#: ../../magic/src/tint.c:82 +#: ../../magic/src/tint.c:82 msgid "Click to turn your entire picture into white and a color you choose." msgstr "" "Fai clic per trasformare tutto il tuo disegno in bianco e in un colore a tua " "scelta." -#: ../../magic/src/toothpaste.c:68 +#: ../../magic/src/toothpaste.c:68 msgid "Toothpaste" msgstr "Dentifricio" -#: ../../magic/src/toothpaste.c:72 +#: ../../magic/src/toothpaste.c:72 msgid "Click and drag to squirt toothpaste onto your picture." msgstr "Fai clic e trascina per spruzzare dentifricio sul tuo disegno." -#: ../../magic/src/tornado.c:153 +#: ../../magic/src/tornado.c:153 msgid "Tornado" msgstr "Tornado" -#: ../../magic/src/tornado.c:159 +#: ../../magic/src/tornado.c:159 msgid "Click and drag to draw a tornado funnel on your picture." msgstr "" "Fai clic e trascina per disegnare il vortice di un tornado sul tuo disegno." -#: ../../magic/src/tv.c:96 +#: ../../magic/src/tv.c:96 msgid "TV" msgstr "TV" -#: ../../magic/src/tv.c:102 +#: ../../magic/src/tv.c:102 msgid "" "Click and drag to make parts of your picture look like they are on " "television." @@ -1525,19 +1525,19 @@ msgstr "" "Fai clic e trascina per far sembrare parti del tuo disegno come se fossero " "in televisione." -#: ../../magic/src/tv.c:105 +#: ../../magic/src/tv.c:105 msgid "Click to make your picture look like it's on television." msgstr "Fai clic per far sembrare il tuo disegno in televisione." -#: ../../magic/src/waves.c:104 +#: ../../magic/src/waves.c:104 msgid "Waves" msgstr "Onde" -#: ../../magic/src/waves.c:106 +#: ../../magic/src/waves.c:106 msgid "Wavelets" msgstr "Increspature" -#: ../../magic/src/waves.c:115 +#: ../../magic/src/waves.c:115 msgid "" "Click to make the picture horizontally wavy. Click toward the top for " "shorter waves, the bottom for taller waves, the left for small waves, and " @@ -1547,7 +1547,7 @@ msgstr "" "per onde corte, verso il basso per onde alte, verso sinistra per onde " "piccole e verso destra per onde lunghe." -#: ../../magic/src/waves.c:118 +#: ../../magic/src/waves.c:118 msgid "" "Click to make the picture vertically wavy. Click toward the top for shorter " "waves, the bottom for taller waves, the left for small waves, and the right " @@ -1557,14 +1557,14 @@ msgstr "" "per onde corte, verso il basso per onde alte, verso sinistra per onde " "piccole e verso destra per onde lunghe." -#: ../../magic/src/xor.c:93 +#: ../../magic/src/xor.c:93 msgid "Xor Colors" msgstr "Colori XOR" -#: ../../magic/src/xor.c:99 +#: ../../magic/src/xor.c:99 msgid "Click and drag to draw a XOR effect" msgstr "Fai clic e trascina per disegnare un effetto XOR." -#: ../../magic/src/xor.c:101 +#: ../../magic/src/xor.c:101 msgid "Click to draw a XOR effect on the whole picture" msgstr "Fai clic per disegnare un effetto XOR su tutto il disegno." diff --git a/src/po/ru.po b/src/po/ru.po index 5b33165a4..2717d30a1 100644 --- a/src/po/ru.po +++ b/src/po/ru.po @@ -22,489 +22,489 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" # При выборе чёрного (0, 0, 0) цвета -#. Response to Black (0, 0, 0) color selected -#: ../colors.h:86 +#. Response to Black (0, 0, 0) color selected +#: ../colors.h:86 msgid "Black!" msgstr "Чёрный!" # При выборе тёмно-серого (128, 128, 128) цвета -#. Response to Dark grey (128, 128, 128) color selected -#: ../colors.h:89 +#. Response to Dark grey (128, 128, 128) color selected +#: ../colors.h:89 msgid "Dark grey! Some people spell it “dark gray”." msgstr "Тёмно-серый!" # При выборе светло-серого (192, 192, 192) цвета -#. Response to Light grey (192, 192, 192) color selected -#: ../colors.h:92 +#. Response to Light grey (192, 192, 192) color selected +#: ../colors.h:92 msgid "Light grey! Some people spell it “light gray”." msgstr "Светло-серый!" # При выборе белого (255, 255, 255) цвета -#. Response to White (255, 255, 255) color selected -#: ../colors.h:95 +#. Response to White (255, 255, 255) color selected +#: ../colors.h:95 msgid "White!" msgstr "Белый!" # При выборе красного (255, 0, 0) цвета -#. Response to Red (255, 0, 0) color selected -#: ../colors.h:98 +#. Response to Red (255, 0, 0) color selected +#: ../colors.h:98 msgid "Red!" msgstr "Красный!" # При выборе оранжевого (255, 128, 0) цвета -#. Response to Orange (255, 128, 0) color selected -#: ../colors.h:101 +#. Response to Orange (255, 128, 0) color selected +#: ../colors.h:101 msgid "Orange!" msgstr "Оранжевый!" # При выборе жёлтого (255, 255, 0) цвета -#. Response to Yellow (255, 255, 0) color selected -#: ../colors.h:104 +#. Response to Yellow (255, 255, 0) color selected +#: ../colors.h:104 msgid "Yellow!" msgstr "Жёлтый!" # При выборе светло-зелёного (160, 228, 128) цвета -#. Response to Light green (160, 228, 128) color selected -#: ../colors.h:107 +#. Response to Light green (160, 228, 128) color selected +#: ../colors.h:107 msgid "Light green!" msgstr "Светло-зелёный!" # При выборе тёмно-зелёного (33, 148, 70) цвета -#. Response to Dark green (33, 148, 70) color selected -#: ../colors.h:110 +#. Response to Dark green (33, 148, 70) color selected +#: ../colors.h:110 msgid "Dark green!" msgstr "Тёмно-зелёный!" # При выборе голубого (138, 168, 205) цвета -#. Response to "Sky" blue (138, 168, 205) color selected -#: ../colors.h:113 +#. Response to "Sky" blue (138, 168, 205) color selected +#: ../colors.h:113 msgid "Sky blue!" msgstr "Голубой!" # При выборе синего (50, 100, 255) цвета -#. Response to Blue (50, 100, 255) color selected -#: ../colors.h:116 +#. Response to Blue (50, 100, 255) color selected +#: ../colors.h:116 msgid "Blue!" msgstr "Синий!" # При выборе сиреневого (186, 157, 255) цвета -#. Response to Lavender (186, 157, 255) color selected -#: ../colors.h:119 +#. Response to Lavender (186, 157, 255) color selected +#: ../colors.h:119 msgid "Lavender!" msgstr "Сиреневый!" # При выборе пурпурного (128, 0, 128) цвета -#. Response to Purple (128, 0, 128) color selected -#: ../colors.h:122 +#. Response to Purple (128, 0, 128) color selected +#: ../colors.h:122 msgid "Purple!" msgstr "Пурпурный!" # При выборе розового (255, 165, 211) цвета -#. Response to Pink (255, 165, 211) color selected -#: ../colors.h:125 +#. Response to Pink (255, 165, 211) color selected +#: ../colors.h:125 msgid "Pink!" msgstr "Розовый!" # При выборе коричневого (128, 80, 0) цвета -#. Response to Brown (128, 80, 0) color selected -#: ../colors.h:128 +#. Response to Brown (128, 80, 0) color selected +#: ../colors.h:128 msgid "Brown!" msgstr "Коричневый!" # При выборе цвета загара (226, 189, 166) -#. Response to Tan (226, 189, 166) color selected -#: ../colors.h:131 +#. Response to Tan (226, 189, 166) color selected +#: ../colors.h:131 msgid "Tan!" msgstr "Загар!" # При выборе бежевого (247, 228, 219) цвета -#. Response to Beige (247, 228, 219) color selected -#: ../colors.h:134 +#. Response to Beige (247, 228, 219) color selected +#: ../colors.h:134 msgid "Beige!" msgstr "Бежевый!" -#. First, the blacklist. We list font families that can crash Tux Paint -#. via bugs in the SDL_ttf library. We also test fonts to be sure that -#. they have both uppercase and lowercase letters. Note that we do not -#. test for "Aa", because it is OK if uppercase and lowercase are the -#. same (but not nice -- such fonts get a low score later). -#. -#. Most locales leave the blacklist strings alone: "QX" and "qx" -#. (it is less destructive to use the scoring strings instead) -#. -#. Locales that absolutely require all fonts to have some -#. extra characters should use "QX..." and "qx...", where "..." -#. are some characters you absolutely require in all fonts. -#. -#. Locales with absolutely NO use for ASCII may use "..." and "...", -#. where "..." are some characters you absolutely require in -#. all fonts. This would be the case for a locale in which it is -#. impossible for a user to type ASCII letters. -#. -#. Most translators should use scoring instead. -#: ../dirwalk.c:177 +#. First, the blacklist. We list font families that can crash Tux Paint +#. via bugs in the SDL_ttf library. We also test fonts to be sure that +#. they have both uppercase and lowercase letters. Note that we do not +#. test for "Aa", because it is OK if uppercase and lowercase are the +#. same (but not nice -- such fonts get a low score later). +#. +#. Most locales leave the blacklist strings alone: "QX" and "qx" +#. (it is less destructive to use the scoring strings instead) +#. +#. Locales that absolutely require all fonts to have some +#. extra characters should use "QX..." and "qx...", where "..." +#. are some characters you absolutely require in all fonts. +#. +#. Locales with absolutely NO use for ASCII may use "..." and "...", +#. where "..." are some characters you absolutely require in +#. all fonts. This would be the case for a locale in which it is +#. impossible for a user to type ASCII letters. +#. +#. Most translators should use scoring instead. +#: ../dirwalk.c:177 msgid "qx" msgstr "qx" -#: ../dirwalk.c:177 +#: ../dirwalk.c:177 msgid "QX" msgstr "QX" -#. TODO: weight specification -#. Now we score fonts to ensure that the best ones will be placed at -#. the top of the list. The user will see them first. This sorting is -#. especially important for users who have scroll buttons disabled. -#. Translators should do whatever is needed to put crummy fonts last. -#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') -#: ../dirwalk.c:202 +#. TODO: weight specification +#. Now we score fonts to ensure that the best ones will be placed at +#. the top of the list. The user will see them first. This sorting is +#. especially important for users who have scroll buttons disabled. +#. Translators should do whatever is needed to put crummy fonts last. +#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') +#: ../dirwalk.c:202 msgid "oO" msgstr "оО" -#. common punctuation (e.g., '?', '!', '.', ',', etc.) -#: ../dirwalk.c:205 +#. common punctuation (e.g., '?', '!', '.', ',', etc.) +#: ../dirwalk.c:205 msgid ",.?!" msgstr ",.?!" # msgid "`\\%_@$~#{}<>^&*" -#. uncommon punctuation (e.g., '@', '#', '*', etc.) -#: ../dirwalk.c:208 +#. uncommon punctuation (e.g., '@', '#', '*', etc.) +#: ../dirwalk.c:208 msgid "`%_@$~#{<(^&*" msgstr "`%_@$~#{<(^&*" -#. digits (e.g., '0', '1' and '7') -#: ../dirwalk.c:211 +#. digits (e.g., '0', '1' and '7') +#: ../dirwalk.c:211 msgid "017" msgstr "017" -#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) -#: ../dirwalk.c:214 +#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) +#: ../dirwalk.c:214 msgid "O0" msgstr "О0" -#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) -#: ../dirwalk.c:217 +#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) +#: ../dirwalk.c:217 msgid "1Il|" msgstr "1Il|" -#: ../dirwalk.c:221 +#: ../dirwalk.c:221 msgid "<1>spare-1a" msgstr "<1>дополнительная-1a" -#: ../dirwalk.c:222 +#: ../dirwalk.c:222 msgid "<1>spare-1b" msgstr "<1>дополнительная-1b" -#: ../dirwalk.c:223 +#: ../dirwalk.c:223 msgid "<9>spare-9a" msgstr "<9>дополнительная-9a" -#: ../dirwalk.c:224 +#: ../dirwalk.c:224 msgid "<9>spare-9b" msgstr "<9>дополнительная-9b" # Поздравление №1 -#. Congratulations #1 -#: ../great.h:37 +#. Congratulations #1 +#: ../great.h:37 msgid "Great!" msgstr "Прекрасно!" # Поздравление №2 -#. Congratulations #2 -#: ../great.h:40 +#. Congratulations #2 +#: ../great.h:40 msgid "Cool!" msgstr "Здорово!" # Поздравление №3 -#. Congratulations #3 -#: ../great.h:43 +#. Congratulations #3 +#: ../great.h:43 msgid "Keep it up!" msgstr "Так и продолжай!" # Поздравление №4 -#. Congratulations #4 -#: ../great.h:46 +#. Congratulations #4 +#: ../great.h:46 msgid "Good job!" msgstr "Хорошая работа!" # Метод ввода: английский -#. Input Method: English mode -#: ../im.c:74 +#. Input Method: English mode +#: ../im.c:74 msgid "English" msgstr "Английский" # Метод ввода: японская романизированная хирагана -#. Input Method: Japanese Romanized Hiragana mode -#: ../im.c:77 +#. Input Method: Japanese Romanized Hiragana mode +#: ../im.c:77 msgid "Hiragana" msgstr "Хирагана" # Метод ввода: японская романизированная катакана -#. Input Method: Japanese Romanized Katakana mode -#: ../im.c:80 +#. Input Method: Japanese Romanized Katakana mode +#: ../im.c:80 msgid "Katakana" msgstr "Катакана" # Метод ввода: корейский хангыль -#. Input Method: Korean Hangul 2-Bul mode -#: ../im.c:83 +#. Input Method: Korean Hangul 2-Bul mode +#: ../im.c:83 msgid "Hangul" msgstr "Хангыль" # Метод ввода: тайский -#. Input Method: Thai mode -#: ../im.c:86 +#. Input Method: Thai mode +#: ../im.c:86 msgid "Thai" msgstr "Тайский" # Метод ввода: традиционный китайский -#. Input Method: Traditional Chinese mode -#: ../im.c:89 +#. Input Method: Traditional Chinese mode +#: ../im.c:89 msgid "ZH_TW" msgstr "Традиционный китайский" -#. Square shape tool (4 equally-lengthed sides at right angles) -#: ../shapes.h:234 ../shapes.h:235 +#. Square shape tool (4 equally-lengthed sides at right angles) +#: ../shapes.h:234 ../shapes.h:235 msgid "Square" msgstr "Квадрат" -#. Rectangle shape tool (4 sides at right angles) -#: ../shapes.h:238 ../shapes.h:239 +#. Rectangle shape tool (4 sides at right angles) +#: ../shapes.h:238 ../shapes.h:239 msgid "Rectangle" msgstr "Прямоугольник" -#. Circle shape tool (X radius and Y radius are the same) -#: ../shapes.h:242 ../shapes.h:243 +#. Circle shape tool (X radius and Y radius are the same) +#: ../shapes.h:242 ../shapes.h:243 msgid "Circle" msgstr "Круг" -#. Ellipse shape tool (X radius and Y radius may differ) -#: ../shapes.h:246 ../shapes.h:247 +#. Ellipse shape tool (X radius and Y radius may differ) +#: ../shapes.h:246 ../shapes.h:247 msgid "Ellipse" msgstr "Эллипс" -#. Triangle shape tool (3 sides) -#: ../shapes.h:250 ../shapes.h:251 +#. Triangle shape tool (3 sides) +#: ../shapes.h:250 ../shapes.h:251 msgid "Triangle" msgstr "Треугольник" -#. Pentagone shape tool (5 sides) -#: ../shapes.h:254 ../shapes.h:255 +#. Pentagone shape tool (5 sides) +#: ../shapes.h:254 ../shapes.h:255 msgid "Pentagon" msgstr "Пятиугольник" -#. Rhombus shape tool (4 sides, not at right angles) -#: ../shapes.h:258 ../shapes.h:259 +#. Rhombus shape tool (4 sides, not at right angles) +#: ../shapes.h:258 ../shapes.h:259 msgid "Rhombus" msgstr "Ромб" -#. Octagon shape tool (8 sides) -#: ../shapes.h:262 ../shapes.h:263 +#. Octagon shape tool (8 sides) +#: ../shapes.h:262 ../shapes.h:263 msgid "Octagon" msgstr "Восьмиугольник" -#. Triangle star (3 points star) -#. Rhombus star (4 points star) -#. Pentagone star (5 points star) -#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 -#: ../shapes.h:278 ../shapes.h:281 +#. Triangle star (3 points star) +#. Rhombus star (4 points star) +#. Pentagone star (5 points star) +#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 +#: ../shapes.h:278 ../shapes.h:281 msgid "Star" msgstr "Звезда" -#. Description of a square -#: ../shapes.h:289 ../shapes.h:290 +#. Description of a square +#: ../shapes.h:289 ../shapes.h:290 msgid "A square is a rectangle with four equal sides." msgstr "Квадрат - прямоугольник с четырьмя равными сторонами." -#. Description of a rectangle -#: ../shapes.h:293 ../shapes.h:294 +#. Description of a rectangle +#: ../shapes.h:293 ../shapes.h:294 msgid "A rectangle has four sides and four right angles." msgstr "У прямоугольника четыре стороны и четыре прямых угла." -#. Description of a circle -#: ../shapes.h:297 ../shapes.h:298 +#. Description of a circle +#: ../shapes.h:297 ../shapes.h:298 msgid "" "A circle is a curve where all points have the same distance from the center." msgstr "" "Окружность - это кривая, все точки которой удалены на равное расстояние от " "центра." -#. Description of an ellipse -#: ../shapes.h:301 ../shapes.h:302 +#. Description of an ellipse +#: ../shapes.h:301 ../shapes.h:302 msgid "An ellipse is a stretched circle." msgstr "Эллипс - это вытянутая окружность." -#. Description of a triangle -#: ../shapes.h:305 ../shapes.h:306 +#. Description of a triangle +#: ../shapes.h:305 ../shapes.h:306 msgid "A triangle has three sides." msgstr "У треугольника три стороны (и угла!)" -#. Description of a pentagon -#: ../shapes.h:309 ../shapes.h:310 +#. Description of a pentagon +#: ../shapes.h:309 ../shapes.h:310 msgid "A pentagon has five sides." msgstr "А у пятиугольника пять сторон (и углов!)" -#. Description of a rhombus -#: ../shapes.h:313 ../shapes.h:314 +#. Description of a rhombus +#: ../shapes.h:313 ../shapes.h:314 msgid "A rhombus has four equal sides, and opposite sides are parallel." msgstr "" "У ромба все четыре стороны равны и противоположные стороны параллельны." -#. Description of an octagon -#: ../shapes.h:317 ../shapes.h:318 +#. Description of an octagon +#: ../shapes.h:317 ../shapes.h:318 msgid "An octagon has eight equal sides." msgstr "А у восьмиугольника восемь сторон." -#: ../shapes.h:320 ../shapes.h:321 +#: ../shapes.h:320 ../shapes.h:321 msgid "A star with 3 points." msgstr "Звезда с 3 лучами." -#: ../shapes.h:322 ../shapes.h:323 +#: ../shapes.h:322 ../shapes.h:323 msgid "A star with 4 points." msgstr "Звезда с 4 лучами." -#: ../shapes.h:324 ../shapes.h:325 +#: ../shapes.h:324 ../shapes.h:325 msgid "A star with 5 points." msgstr "Звезда с 5 лучами." -#: ../shapes.h:372 +#: ../shapes.h:372 msgid "Draw shapes from the center." msgstr "" -#: ../shapes.h:373 +#: ../shapes.h:373 msgid "Draw shapes from a corner." msgstr "" -#. Title of tool selector (buttons down the left) -#: ../titles.h:56 +#. Title of tool selector (buttons down the left) +#: ../titles.h:56 msgid "Tools" msgstr "Инструменты" -#. Title of color palette (buttons across the bottom) -#: ../titles.h:59 +#. Title of color palette (buttons across the bottom) +#: ../titles.h:59 msgid "Colors" msgstr "Цвета" -#. Title of brush selector (buttons down the right for paint and line tools) -#: ../titles.h:62 +#. Title of brush selector (buttons down the right for paint and line tools) +#: ../titles.h:62 msgid "Brushes" msgstr "Кисти" -#. Title of eraser selector (buttons down the right for eraser tool) -#: ../titles.h:65 +#. Title of eraser selector (buttons down the right for eraser tool) +#: ../titles.h:65 msgid "Erasers" msgstr "Ластики" -#. Title of stamp selector (buttons down the right for stamps tool) -#: ../titles.h:68 +#. Title of stamp selector (buttons down the right for stamps tool) +#: ../titles.h:68 msgid "Stamps" msgstr "Штампы" -#. Title of shape selector (buttons down the right for shapes tool) -#. Shape creation tool (square, circle, etc.) -#: ../titles.h:71 ../tools.h:71 +#. Title of shape selector (buttons down the right for shapes tool) +#. Shape creation tool (square, circle, etc.) +#: ../titles.h:71 ../tools.h:71 msgid "Shapes" msgstr "Формы" -#. Title of font selector (buttons down the right for text and label tools) -#: ../titles.h:74 +#. Title of font selector (buttons down the right for text and label tools) +#: ../titles.h:74 msgid "Letters" msgstr "Буквы" -#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) -#. "Magic" effects tools (blur, flip image, etc.) -#: ../titles.h:77 ../tools.h:83 +#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) +#. "Magic" effects tools (blur, flip image, etc.) +#: ../titles.h:77 ../tools.h:83 msgid "Magic" msgstr "Магия" -#. Freehand painting tool -#: ../tools.h:62 +#. Freehand painting tool +#: ../tools.h:62 msgid "Paint" msgstr "Краска" -#. Stamp tool (aka Rubber Stamps) -#: ../tools.h:65 +#. Stamp tool (aka Rubber Stamps) +#: ../tools.h:65 msgid "Stamp" msgstr "Штамп" -#. Line drawing tool -#: ../tools.h:68 +#. Line drawing tool +#: ../tools.h:68 msgid "Lines" msgstr "Линии" -#. Text tool -#: ../tools.h:74 +#. Text tool +#: ../tools.h:74 msgid "Text" msgstr "Текст" -#. Label tool -#: ../tools.h:77 +#. Label tool +#: ../tools.h:77 msgid "Label" msgstr "Метка" -#. Fill tool -#: ../tools.h:80 +#. Fill tool +#: ../tools.h:80 msgid "Fill" msgstr "Заполнить" -#. Undo last action -#: ../tools.h:86 +#. Undo last action +#: ../tools.h:86 msgid "Undo" msgstr "Откат" -#. Redo undone action -#: ../tools.h:89 +#. Redo undone action +#: ../tools.h:89 msgid "Redo" msgstr "Возврат" -#. Eraser tool -#: ../tools.h:92 +#. Eraser tool +#: ../tools.h:92 msgid "Eraser" msgstr "Ластик" -#. Start a new picture -#: ../tools.h:95 +#. Start a new picture +#: ../tools.h:95 msgid "New" msgstr "Новая" -#. 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 +#. 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 msgid "Open" msgstr "Открыть" -#. Save the current picture -#: ../tools.h:101 +#. Save the current picture +#: ../tools.h:101 msgid "Save" msgstr "Сохранить" -#. Print the current picture -#: ../tools.h:104 +#. Print the current picture +#: ../tools.h:104 msgid "Print" msgstr "Печать" -#. Quit/exit Tux Paint application -#: ../tools.h:107 +#. Quit/exit Tux Paint application +#: ../tools.h:107 msgid "Quit" msgstr "Выйти" -#. Paint tool instructions -#: ../tools.h:115 +#. Paint tool instructions +#: ../tools.h:115 msgid "Pick a color and a brush shape to draw with." msgstr "Выберите цвет и форму кисточки, которой вы хотите рисовать." -#. Stamp tool instructions -#: ../tools.h:118 +#. Stamp tool instructions +#: ../tools.h:118 msgid "Pick a picture to stamp around your drawing." msgstr "Выберите картинку для копирования на рисунок." -#. Line tool instructions -#: ../tools.h:121 +#. Line tool instructions +#: ../tools.h:121 msgid "Click to start drawing a line. Let go to complete it." msgstr "" "Щёлкните, чтобы начать рисовать линию. Отпустите кнопку, чтобы закончить." -#: ../tools.h:125 +#: ../tools.h:125 #, fuzzy #| msgid "" #| "Pick a shape. Click to pick the center, drag, then let go when it is the " @@ -516,7 +516,7 @@ msgstr "" "Выберите форму. Щёлкните для выбора центра, растяните до нужного размера, " "отпустите. Покрутите форму, затем щёлкните, чтобы нарисовать её." -#: ../tools.h:129 +#: ../tools.h:129 msgid "" "Choose a style of text. Click on your drawing and you can start typing. " "Press [Enter] or [Tab] to complete the text." @@ -524,7 +524,7 @@ msgstr "" "Выберите стиль текста. Щёлкните на вашем рисунке, и печатайте. Нажмите " "[Enter] или [Tab] для завершения." -#: ../tools.h:133 +#: ../tools.h:133 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 " @@ -536,332 +536,332 @@ msgstr "" "существующие метки, вы можете переместить, отредактировать его и изменить " "стиль текста." -#. Fill tool instructions -#: ../tools.h:136 +#. Fill tool instructions +#: ../tools.h:136 msgid "Click in the picture to fill that area with color." msgstr "Щёлкните, чтобы заполнить эту область цветом." -#. Magic tool instruction -#: ../tools.h:139 +#. Magic tool instruction +#: ../tools.h:139 msgid "Pick a magical effect to use on your drawing!" msgstr "Выберите волшебный эффект для своего рисунка!" -#. Response to 'undo' action -#: ../tools.h:142 +#. Response to 'undo' action +#: ../tools.h:142 msgid "Undo!" msgstr "Откат!" -#. Response to 'redo' action -#: ../tools.h:145 +#. Response to 'redo' action +#: ../tools.h:145 msgid "Redo!" msgstr "Переделать!" -#. Eraser tool -#: ../tools.h:148 +#. Eraser tool +#: ../tools.h:148 msgid "Eraser!" msgstr "Стереть!" -#. Response to 'start a new image' action -#: ../tools.h:151 +#. Response to 'start a new image' action +#: ../tools.h:151 msgid "Pick a color or picture with which to start a new drawing." msgstr "Выберите цвет или картинку, чтобы начать новый рисунок." -#. Response to 'open' action (while file dialog is being constructed) -#: ../tools.h:154 +#. Response to 'open' action (while file dialog is being constructed) +#: ../tools.h:154 msgid "Open…" msgstr "Открыть…" -#. Response to 'save' action -#: ../tools.h:157 +#. Response to 'save' action +#: ../tools.h:157 msgid "Your image has been saved!" msgstr "Ваше картинка сохранена!" -#. Response to 'print' action (while printing, or print dialog is being used) -#: ../tools.h:160 +#. Response to 'print' action (while printing, or print dialog is being used) +#: ../tools.h:160 msgid "Printing…" msgstr "Печатаю…" -#. Response to 'quit' (exit) action -#: ../tools.h:163 +#. Response to 'quit' (exit) action +#: ../tools.h:163 msgid "Bye bye!" msgstr "Пока!" -#. Instruction while using Line tool (after click, before release) -#: ../tools.h:167 +#. Instruction while using Line tool (after click, before release) +#: ../tools.h:167 msgid "Let go of the button to complete the line." msgstr "Отпустите кнопку, чтобы закончить линию." -#. Instruction while using Shape tool (after first click, before release) -#: ../tools.h:170 +#. Instruction while using Shape tool (after first click, before release) +#: ../tools.h:170 msgid "Hold the button to stretch the shape." msgstr "Держите кнопку, чтобы растянуть форму." -#. Instruction while finishing Shape tool (after release, during rotation step before second click) -#: ../tools.h:173 +#. Instruction while finishing Shape tool (after release, during rotation step before second click) +#: ../tools.h:173 msgid "Move the mouse to rotate the shape. Click to draw it." msgstr "Покрутите форму, затем щёлкните, чтобы нарисовать её." -#. Notification that 'New' action was aborted (current image would have been lost) -#: ../tools.h:176 +#. Notification that 'New' action was aborted (current image would have been lost) +#: ../tools.h:176 msgid "OK then… Let’s keep drawing this one!" msgstr "Хорошо, продолжаем рисовать!" -#. Prompt to confirm user wishes to quit -#: ../tuxpaint.c:2134 +#. Prompt to confirm user wishes to quit +#: ../tuxpaint.c:2134 msgid "Do you really want to quit?" msgstr "Вы действительно хотите выйти?" -#. Quit prompt positive response (quit) -#: ../tuxpaint.c:2137 +#. Quit prompt positive response (quit) +#: ../tuxpaint.c:2137 msgid "Yes, I’m done!" msgstr "Да, я закончил!" -#. Quit prompt negative response (don't quit) -#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 +#. Quit prompt negative response (don't quit) +#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 msgid "No, take me back!" msgstr "Нет, хочу обратно!" -#. Current picture is not saved; user is quitting -#: ../tuxpaint.c:2144 +#. Current picture is not saved; user is quitting +#: ../tuxpaint.c:2144 msgid "If you quit, you’ll lose your picture! Save it?" msgstr "Если вы выйдите, вы потеряете вашу картинку! Сохранить?" -#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 +#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 msgid "Yes, save it!" msgstr "Да, сохранить!" -#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 +#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 msgid "No, don’t bother saving!" msgstr "Нет, не нужно сохранять!" -#. Current picture is not saved; user is opening another picture -#: ../tuxpaint.c:2149 +#. Current picture is not saved; user is opening another picture +#: ../tuxpaint.c:2149 msgid "Save your picture first?" msgstr "Сохранить вначале вашу картинку?" -#. Error opening picture -#: ../tuxpaint.c:2154 +#. Error opening picture +#: ../tuxpaint.c:2154 msgid "Can’t open that picture!" msgstr "Не могу открыть эту картинку!" -#. Generic dialog dismissal -#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 -#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 +#. Generic dialog dismissal +#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 +#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 msgid "OK" msgstr "Хорошо" -#. Notification that 'Open' dialog has nothing to show -#: ../tuxpaint.c:2161 +#. Notification that 'Open' dialog has nothing to show +#: ../tuxpaint.c:2161 msgid "There are no saved files!" msgstr "Нет сохранённых картинок!" -#. Verification of print action -#: ../tuxpaint.c:2165 +#. Verification of print action +#: ../tuxpaint.c:2165 msgid "Print your picture now?" msgstr "Напечатать вашу картинку?" -#: ../tuxpaint.c:2166 +#: ../tuxpaint.c:2166 msgid "Yes, print it!" msgstr "Да, распечатать!" -#. Confirmation of successful (we hope) printing -#: ../tuxpaint.c:2170 +#. Confirmation of successful (we hope) printing +#: ../tuxpaint.c:2170 msgid "Your picture has been printed!" msgstr "Ваша картинка распечатана!" -#. We got an error printing -#: ../tuxpaint.c:2174 +#. We got an error printing +#: ../tuxpaint.c:2174 msgid "Sorry! Your picture could not be printed!" msgstr "Извините! Ваша картинка не может быть распечатана!" -#. Notification that it's too soon to print again (--printdelay option is in effect) -#: ../tuxpaint.c:2177 +#. Notification that it's too soon to print again (--printdelay option is in effect) +#: ../tuxpaint.c:2177 msgid "You can’t print yet!" msgstr "Вы пока не можете печатать!" -#. Prompt to confirm erasing a picture in the Open dialog -#: ../tuxpaint.c:2181 +#. Prompt to confirm erasing a picture in the Open dialog +#: ../tuxpaint.c:2181 msgid "Erase this picture?" msgstr "Удалить эту картинку?" -#: ../tuxpaint.c:2182 +#: ../tuxpaint.c:2182 msgid "Yes, erase it!" msgstr "Да, удалить!" -#: ../tuxpaint.c:2183 +#: ../tuxpaint.c:2183 msgid "No, don’t erase it!" msgstr "Нет, не удалять!" -#. Reminder that Mouse Button 1 is the button to use in Tux Paint -#: ../tuxpaint.c:2186 +#. Reminder that Mouse Button 1 is the button to use in Tux Paint +#: ../tuxpaint.c:2186 msgid "Remember to use the left mouse button!" msgstr "Используйте только левую кнопку мыши!" -#. Confirmation of successful (we hope) image export -#: ../tuxpaint.c:2190 +#. Confirmation of successful (we hope) image export +#: ../tuxpaint.c:2190 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your picture has been exported!" msgstr "Ваша картинка распечатана!" -#: ../tuxpaint.c:2191 +#: ../tuxpaint.c:2191 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your slideshow GIF has been exported!" msgstr "Ваша картинка распечатана!" -#. We got an error exporting -#: ../tuxpaint.c:2195 +#. 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 "Извините! Ваша картинка не может быть распечатана!" -#: ../tuxpaint.c:2196 +#: ../tuxpaint.c:2196 #, fuzzy #| msgid "Sorry! Your picture could not be printed!" msgid "Sorry! Your slideshow GIF could not be exported!" msgstr "Извините! Ваша картинка не может быть распечатана!" -#. Slideshow instructions -#: ../tuxpaint.c:2200 +#. Slideshow instructions +#: ../tuxpaint.c:2200 msgid "Choose the pictures you want, then click “Play”." msgstr "Выберите картинку, а потом нажмите \"Запуск\"." # Звук можно заглушить, используя клавиатурное сокращение. -#. Sound has been muted (silenced) via keyboard shortcut -#: ../tuxpaint.c:2407 +#. Sound has been muted (silenced) via keyboard shortcut +#: ../tuxpaint.c:2407 msgid "Sound muted." msgstr "Звук отключен." # Звук можно включить, используя клавиатурное сокращение. -#. Sound has been unmuted (unsilenced) via keyboard shortcut -#: ../tuxpaint.c:2412 +#. Sound has been unmuted (unsilenced) via keyboard shortcut +#: ../tuxpaint.c:2412 msgid "Sound unmuted." msgstr "Звук включён." -#. Wait while Text tool finishes loading fonts -#: ../tuxpaint.c:3167 +#. Wait while Text tool finishes loading fonts +#: ../tuxpaint.c:3167 msgid "Please wait…" msgstr "Пожалуйста, подождите..." -#. Open dialog: 'Erase' button, to erase/deleted the selected picture -#: ../tuxpaint.c:7923 +#. Open dialog: 'Erase' button, to erase/deleted the selected picture +#: ../tuxpaint.c:7923 msgid "Erase" msgstr "Удалить" -#. Open dialog: 'Slides' button, to switch to slide show mode -#: ../tuxpaint.c:7926 +#. Open dialog: 'Slides' button, to switch to slide show mode +#: ../tuxpaint.c:7926 msgid "Slides" msgstr "Слайды" -#. Open dialog: 'Export' button, to copy an image to an easily-accessible location -#: ../tuxpaint.c:7929 +#. Open dialog: 'Export' button, to copy an image to an easily-accessible location +#: ../tuxpaint.c:7929 msgid "Export" msgstr "" -#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture -#: ../tuxpaint.c:7932 +#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture +#: ../tuxpaint.c:7932 msgid "Back" msgstr "Назад" -#. Slideshow: 'Play' button, to begin a slideshow sequence -#: ../tuxpaint.c:7935 +#. Slideshow: 'Play' button, to begin a slideshow sequence +#: ../tuxpaint.c:7935 msgid "Play" msgstr "Запуск" -#. Slideshow: 'GIF Export' button, to create an animated GIF -#: ../tuxpaint.c:7938 +#. Slideshow: 'GIF Export' button, to create an animated GIF +#: ../tuxpaint.c:7938 msgid "GIF Export" msgstr "" -#. Slideshow: 'Next' button, to load next slide (image) -#: ../tuxpaint.c:7941 +#. Slideshow: 'Next' button, to load next slide (image) +#: ../tuxpaint.c:7941 msgid "Next" msgstr "Далее" -#. 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 +#. 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 msgid "Aa" msgstr "Аа" -#. 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 +#. 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 msgid "Yes" msgstr "Да" -#: ../tuxpaint.c:12073 +#: ../tuxpaint.c:12073 msgid "No" msgstr "Нет" -#. Prompt to ask whether user wishes to save over old version of their file -#: ../tuxpaint.c:13190 +#. Prompt to ask whether user wishes to save over old version of their file +#: ../tuxpaint.c:13190 msgid "Replace the picture with your changes?" msgstr "Заменить старую картинку?" -#. Positive response to saving over old version -#. (like a 'File:Save' action in other applications) -#: ../tuxpaint.c:13194 +#. Positive response to saving over old version +#. (like a 'File:Save' action in other applications) +#: ../tuxpaint.c:13194 msgid "Yes, replace the old one!" msgstr "Да, заменить старую картинку!" -#. Negative response to saving over old version (saves a new image) -#. (like a 'File:Save As...' action in other applications) -#: ../tuxpaint.c:13198 +#. Negative response to saving over old version (saves a new image) +#. (like a 'File:Save As...' action in other applications) +#: ../tuxpaint.c:13198 msgid "No, save a new file!" msgstr "Нет, сохранить в новый файл!" -#. Let user choose an image: -#. Instructions for 'Open' file dialog -#: ../tuxpaint.c:14454 +#. Let user choose an image: +#. Instructions for 'Open' file dialog +#: ../tuxpaint.c:14454 msgid "Choose the picture you want, then click “Open”." msgstr "Выберите картинку, а потом щёлкните «Открыть»." -#. 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 +#. 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 "" -#: ../tuxpaint.c:23539 +#: ../tuxpaint.c:23539 msgid "Select a color from your drawing." msgstr "Выберите цвет для рисования." -#: ../tuxpaint.c:23551 +#: ../tuxpaint.c:23551 msgid "Pick a color." msgstr "Выберите цвет." -#: ../tuxpaint.desktop.in.h:1 +#: ../tuxpaint.desktop.in.h:1 msgid "Tux Paint" msgstr "Рисуй вместе с Tux!" -#: ../tuxpaint.desktop.in.h:2 +#: ../tuxpaint.desktop.in.h:2 msgid "Drawing program" msgstr "Программа для рисования" -#: ../tuxpaint.desktop.in.h:3 +#: ../tuxpaint.desktop.in.h:3 msgid "A drawing program for children." msgstr "Детская программа для рисования." -#: ../../magic/src/alien.c:68 +#: ../../magic/src/alien.c:68 msgid "Color Shift" msgstr "Сдвиг цвета" -#: ../../magic/src/alien.c:72 +#: ../../magic/src/alien.c:72 msgid "Click and drag the mouse to change the colors in parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы изменить цвета её части." -#: ../../magic/src/alien.c:73 +#: ../../magic/src/alien.c:73 msgid "Click to change the colors in your entire picture." msgstr "Щёлкните, чтобы изменить цвета всего рисунка." -#: ../../magic/src/blind.c:116 +#: ../../magic/src/blind.c:116 msgid "Blind" msgstr "Штора" -#: ../../magic/src/blind.c:123 +#: ../../magic/src/blind.c:123 msgid "" "Click towards the edge of your picture to pull window blinds over it. Move " "perpendicularly to open or close the blinds." @@ -869,229 +869,229 @@ msgstr "" "Щёлкните около края вашего рисунка, чтобы натянуть оконные шторы над ним. " "Двигайте перпендикулярно, чтобы открыть или закрыть шторы." -#: ../../magic/src/blocks_chalk_drip.c:129 +#: ../../magic/src/blocks_chalk_drip.c:129 msgid "Blocks" msgstr "Мозаика" -#: ../../magic/src/blocks_chalk_drip.c:131 +#: ../../magic/src/blocks_chalk_drip.c:131 msgid "Chalk" msgstr "Мел" -#: ../../magic/src/blocks_chalk_drip.c:133 +#: ../../magic/src/blocks_chalk_drip.c:133 msgid "Drip" msgstr "Капанье" -#: ../../magic/src/blocks_chalk_drip.c:142 +#: ../../magic/src/blocks_chalk_drip.c:142 msgid "Click and drag the mouse around to make the picture blocky." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы превратить её часть в мозаику." -#: ../../magic/src/blocks_chalk_drip.c:144 +#: ../../magic/src/blocks_chalk_drip.c:144 msgid "" "Click and drag the mouse around to turn the picture into a chalk drawing." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы превратить её часть в рисунок " "мелом." -#: ../../magic/src/blocks_chalk_drip.c:146 +#: ../../magic/src/blocks_chalk_drip.c:146 msgid "Click and drag the mouse around to make the picture drip." msgstr "Щёлкните и ведите мышью по картинке, чтобы заставьте её капать." -#: ../../magic/src/blur.c:80 +#: ../../magic/src/blur.c:80 msgid "Blur" msgstr "Размытие" -#: ../../magic/src/blur.c:84 +#: ../../magic/src/blur.c:84 msgid "Click and drag the mouse around to blur the image." msgstr "Щёлкните и ведите мышью по картинке, чтобы размыть её." -#: ../../magic/src/blur.c:85 +#: ../../magic/src/blur.c:85 msgid "Click to blur the entire image." msgstr "Щёлкните, чтобы размыть картинку." -#. Both are named "Bricks", at the moment: -#: ../../magic/src/bricks.c:120 +#. Both are named "Bricks", at the moment: +#: ../../magic/src/bricks.c:120 msgid "Bricks" msgstr "Кирпичи" -#: ../../magic/src/bricks.c:127 +#: ../../magic/src/bricks.c:127 msgid "Click and drag to draw large bricks." msgstr "Щёлкните и ведите мышью по картинке, чтобы нарисовать большие кирпичи." -#: ../../magic/src/bricks.c:129 +#: ../../magic/src/bricks.c:129 msgid "Click and drag to draw small bricks." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы нарисовать маленькие кирпичи." -#: ../../magic/src/calligraphy.c:124 +#: ../../magic/src/calligraphy.c:124 msgid "Calligraphy" msgstr "Каллиграфия" -#: ../../magic/src/calligraphy.c:131 +#: ../../magic/src/calligraphy.c:131 msgid "Click and drag the mouse around to draw in calligraphy." msgstr "Щёлкните и ведите мышью, чтобы рисовать каллиграфической кистью." -#: ../../magic/src/cartoon.c:103 +#: ../../magic/src/cartoon.c:103 msgid "Cartoon" msgstr "Мультфильм" -#: ../../magic/src/cartoon.c:109 +#: ../../magic/src/cartoon.c:109 msgid "Click and drag the mouse around to turn the picture into a cartoon." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы превратить её часть в мультфильм." -#: ../../magic/src/confetti.c:83 +#: ../../magic/src/confetti.c:83 msgid "Confetti" msgstr "Конфетти" -#: ../../magic/src/confetti.c:88 +#: ../../magic/src/confetti.c:88 msgid "Click to throw confetti!" msgstr "Щёлкните, чтобы разбросать конфетти!" -#: ../../magic/src/distortion.c:134 +#: ../../magic/src/distortion.c:134 msgid "Distortion" msgstr "Искажение" -#: ../../magic/src/distortion.c:143 +#: ../../magic/src/distortion.c:143 msgid "Click and drag the mouse to cause distortion in your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы вызвать искажения в вашем рисунке." -#: ../../magic/src/emboss.c:101 +#: ../../magic/src/emboss.c:101 msgid "Emboss" msgstr "Рельеф" -#: ../../magic/src/emboss.c:107 +#: ../../magic/src/emboss.c:107 msgid "Click and drag the mouse to emboss the picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы сделать рисунок рельефным." -#: ../../magic/src/fade_darken.c:114 +#: ../../magic/src/fade_darken.c:114 msgid "Lighten" msgstr "Светлее" -#: ../../magic/src/fade_darken.c:116 +#: ../../magic/src/fade_darken.c:116 msgid "Darken" msgstr "Темнее" -#: ../../magic/src/fade_darken.c:127 +#: ../../magic/src/fade_darken.c:127 msgid "Click and drag the mouse to lighten parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы осветлить её часть." -#: ../../magic/src/fade_darken.c:129 +#: ../../magic/src/fade_darken.c:129 msgid "Click to lighten your entire picture." msgstr "Щёлкните, чтобы осветлить вашу картинку." -#: ../../magic/src/fade_darken.c:134 +#: ../../magic/src/fade_darken.c:134 msgid "Click and drag the mouse to darken parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы затемнить её часть." -#: ../../magic/src/fade_darken.c:136 +#: ../../magic/src/fade_darken.c:136 msgid "Click to darken your entire picture." msgstr "Щёлкните, чтобы затемнить вашу картинку." -#: ../../magic/src/fisheye.c:101 +#: ../../magic/src/fisheye.c:101 msgid "Fisheye" msgstr "Вздутие" -#: ../../magic/src/fisheye.c:106 +#: ../../magic/src/fisheye.c:106 msgid "Click on part of your picture to create a fisheye effect." msgstr "Щёлкните по части вашей картинки, чтобы создать эффект вздутия." -#: ../../magic/src/flower.c:144 +#: ../../magic/src/flower.c:144 msgid "Flower" msgstr "Цветок" -#: ../../magic/src/flower.c:150 +#: ../../magic/src/flower.c:150 msgid "Click and drag to draw a flower stalk. Let go to finish the flower." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы нарисовать стебель. Отпустите, " "чтобы завершить цветок." -#: ../../magic/src/foam.c:114 +#: ../../magic/src/foam.c:114 msgid "Foam" msgstr "Пузыри" -#: ../../magic/src/foam.c:120 +#: ../../magic/src/foam.c:120 msgid "Click and drag the mouse to cover an area with foamy bubbles." msgstr "Нажмите и ведите мышь, чтобы нарисовать мыльные пузыри." -#: ../../magic/src/fold.c:103 +#: ../../magic/src/fold.c:103 msgid "Fold" msgstr "Сгиб" -#: ../../magic/src/fold.c:108 +#: ../../magic/src/fold.c:108 msgid "" "Choose a background color and click to turn the corner of the page over." msgstr "Выберите фоновый цвет и щёлкните, чтобы загнуть уголок страницы." -#: ../../magic/src/fretwork.c:176 +#: ../../magic/src/fretwork.c:176 msgid "Fretwork" msgstr "Узор" -#: ../../magic/src/fretwork.c:182 +#: ../../magic/src/fretwork.c:182 msgid "Click and drag to draw repetitive patterns. " msgstr "" "Щёлкните и ведите мышью по картинке, чтобы нарисовать повторяющиеся узоры." -#: ../../magic/src/fretwork.c:184 +#: ../../magic/src/fretwork.c:184 msgid "Click to surround your picture with repetitive patterns." msgstr "Щёлкните, чтобы окружить вашу картинку повторяющимися узорами." -#: ../../magic/src/glasstile.c:104 +#: ../../magic/src/glasstile.c:104 msgid "Glass Tile" msgstr "Стекло" -#: ../../magic/src/glasstile.c:111 +#: ../../magic/src/glasstile.c:111 msgid "Click and drag the mouse to put glass tile over your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы покрыть рисунок стеклянной " "плиткой." -#: ../../magic/src/glasstile.c:113 +#: ../../magic/src/glasstile.c:113 msgid "Click to cover your entire picture in glass tiles." msgstr "Щёлкните, чтобы покрыть рисунок стеклянной плиткой." -#: ../../magic/src/grass.c:107 +#: ../../magic/src/grass.c:107 msgid "Grass" msgstr "Трава" -#: ../../magic/src/grass.c:113 +#: ../../magic/src/grass.c:113 msgid "Click and drag to draw grass. Don’t forget the dirt!" msgstr "" "Щёлкните и ведите мышью по картинке, чтобы нарисовать траву. Не забудьте про " "почву!" -#: ../../magic/src/halftone.c:35 +#: ../../magic/src/halftone.c:35 msgid "Halftone" msgstr "Полутоновый оттиск" -#: ../../magic/src/halftone.c:39 +#: ../../magic/src/halftone.c:39 msgid "Click and drag to turn your drawing into a newspaper." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы превратить рисунок в газету." -#: ../../magic/src/kalidescope.c:119 +#: ../../magic/src/kalidescope.c:119 msgid "Symmetric Left/Right" msgstr "Симметрично слева направо" -#: ../../magic/src/kalidescope.c:123 +#: ../../magic/src/kalidescope.c:123 msgid "Symmetric Up/Down" msgstr "Симметрично сверху вниз" -#: ../../magic/src/kalidescope.c:127 +#: ../../magic/src/kalidescope.c:127 msgid "Pattern" msgstr "Образец" -#: ../../magic/src/kalidescope.c:131 +#: ../../magic/src/kalidescope.c:131 msgid "Tiles" msgstr "Плитки" -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:135 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:135 msgid "Kaleidoscope" msgstr "Калейдоскоп" -#: ../../magic/src/kalidescope.c:146 +#: ../../magic/src/kalidescope.c:146 msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the left and right of your picture." @@ -1099,7 +1099,7 @@ msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать двумя кистями, которые " "симметрично слева направо пересекают вашу картинку." -#: ../../magic/src/kalidescope.c:152 +#: ../../magic/src/kalidescope.c:152 msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the top and bottom of your picture." @@ -1107,13 +1107,13 @@ msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать двумя кистями, которые " "симметрично сверху вниз пересекают вашу картинку." -#: ../../magic/src/kalidescope.c:156 +#: ../../magic/src/kalidescope.c:156 msgid "Click and drag the mouse to draw a pattern across the picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать образцом по вашей " "картинке." -#: ../../magic/src/kalidescope.c:160 +#: ../../magic/src/kalidescope.c:160 msgid "" "Click and drag the mouse to draw a pattern that is symmetric across the " "picture." @@ -1121,331 +1121,331 @@ msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать образцом — симметричным " "изображением картинки." -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:164 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:164 msgid "" "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать симметричными кистями " "(калейдоскоп)." -#: ../../magic/src/light.c:103 +#: ../../magic/src/light.c:103 msgid "Light" msgstr "Свет" -#: ../../magic/src/light.c:109 +#: ../../magic/src/light.c:109 msgid "Click and drag to draw a beam of light on your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы нарисовать луч света." -#: ../../magic/src/metalpaint.c:98 +#: ../../magic/src/metalpaint.c:98 msgid "Metal Paint" msgstr "Металл" -#: ../../magic/src/metalpaint.c:105 +#: ../../magic/src/metalpaint.c:105 msgid "Click and drag the mouse to paint with a metallic color." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать металлическим цветом." -#: ../../magic/src/mirror_flip.c:110 +#: ../../magic/src/mirror_flip.c:110 msgid "Mirror" msgstr "Зеркало" -#: ../../magic/src/mirror_flip.c:112 +#: ../../magic/src/mirror_flip.c:112 msgid "Flip" msgstr "Переворот" -#: ../../magic/src/mirror_flip.c:121 +#: ../../magic/src/mirror_flip.c:121 msgid "Click to make a mirror image." msgstr "Щёлкните на картинку, чтобы превратить её в зеркальное отражение." -#: ../../magic/src/mirror_flip.c:123 +#: ../../magic/src/mirror_flip.c:123 msgid "Click to flip the picture upside-down." msgstr "Щёлкните на картинку, чтобы перевернуть её вверх тормашками." -#: ../../magic/src/mosaic.c:96 +#: ../../magic/src/mosaic.c:96 msgid "Mosaic" msgstr "Мозаика" -#: ../../magic/src/mosaic.c:100 +#: ../../magic/src/mosaic.c:100 msgid "" "Click and drag the mouse to add a mosaic effect to parts of your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы добавить к её части эффект " "мозаики." -#: ../../magic/src/mosaic.c:101 +#: ../../magic/src/mosaic.c:101 msgid "Click to add a mosaic effect to your entire picture." msgstr "Щёлкните, чтобы добавить эффект мозаики к вашей картинке." -#: ../../magic/src/mosaic_shaped.c:132 +#: ../../magic/src/mosaic_shaped.c:132 msgid "Square Mosaic" msgstr "Квадратная мозаика" -#: ../../magic/src/mosaic_shaped.c:133 +#: ../../magic/src/mosaic_shaped.c:133 msgid "Hexagon Mosaic" msgstr "Шестиугольная мозаика" -#: ../../magic/src/mosaic_shaped.c:134 +#: ../../magic/src/mosaic_shaped.c:134 msgid "Irregular Mosaic" msgstr "Неровная мозаика" -#: ../../magic/src/mosaic_shaped.c:140 +#: ../../magic/src/mosaic_shaped.c:140 msgid "" "Click and drag the mouse to add a square mosaic to parts of your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы добавить к её части эффект " "квадратной мозаики." -#: ../../magic/src/mosaic_shaped.c:141 +#: ../../magic/src/mosaic_shaped.c:141 msgid "Click to add a square mosaic to your entire picture." msgstr "Щёлкните, чтобы добавить эффект квадратной мозаики к вашей картинке." -#: ../../magic/src/mosaic_shaped.c:145 +#: ../../magic/src/mosaic_shaped.c:145 msgid "" "Click and drag the mouse to add a hexagonal mosaic to parts of your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы добавить к её части эффект " "шестиугольной мозаики." -#: ../../magic/src/mosaic_shaped.c:146 +#: ../../magic/src/mosaic_shaped.c:146 msgid "Click to add a hexagonal mosaic to your entire picture." msgstr "" "Щёлкните, чтобы добавить эффект шестиугольной мозаики к вашей картинке." -#: ../../magic/src/mosaic_shaped.c:150 +#: ../../magic/src/mosaic_shaped.c:150 msgid "" "Click and drag the mouse to add an irregular mosaic to parts of your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы добавить к её части эффект " "неровной мозаики." -#: ../../magic/src/mosaic_shaped.c:151 +#: ../../magic/src/mosaic_shaped.c:151 msgid "Click to add an irregular mosaic to your entire picture." msgstr "Щёлкните, чтобы добавить эффект неровной мозаики к вашей картинке." -#: ../../magic/src/negative.c:94 +#: ../../magic/src/negative.c:94 msgid "Negative" msgstr "Негатив" -#: ../../magic/src/negative.c:101 +#: ../../magic/src/negative.c:101 msgid "Click and drag the mouse around to make your painting negative." msgstr "Щёлкните и ведите мышью по картинке, чтобы превратить её в негатив." -#: ../../magic/src/negative.c:103 +#: ../../magic/src/negative.c:103 msgid "Click to turn your painting into its negative." msgstr "Щёлкните, чтобы превратить ваш рисунок в негатив." -#: ../../magic/src/noise.c:66 +#: ../../magic/src/noise.c:66 msgid "Noise" msgstr "Шум" -#: ../../magic/src/noise.c:70 +#: ../../magic/src/noise.c:70 msgid "Click and drag the mouse to add noise to parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы добавить шум к её части." -#: ../../magic/src/noise.c:71 +#: ../../magic/src/noise.c:71 msgid "Click to add noise to your entire picture." msgstr "Щёлкните, чтобы добавить шум к вашей картинке." -#: ../../magic/src/perspective.c:147 +#: ../../magic/src/perspective.c:147 msgid "Perspective" msgstr "Перспектива" -#: ../../magic/src/perspective.c:148 +#: ../../magic/src/perspective.c:148 msgid "Zoom" msgstr "Увеличение" -#: ../../magic/src/perspective.c:153 +#: ../../magic/src/perspective.c:153 msgid "Click on the corners and drag where you want to stretch the picture." msgstr "Нажмите на углы и ведите мышь там, где вы хотите растянуть рисунок." -#: ../../magic/src/perspective.c:156 +#: ../../magic/src/perspective.c:156 msgid "Click and drag up to zoom in or drag down to zoom out the picture." msgstr "" "Щёлкните и ведите мышью по картинке вверх для увеличения или вниз для " "уменьшения картинки." # При выборе пурпурного (128, 0, 128) цвета -#: ../../magic/src/puzzle.c:103 +#: ../../magic/src/puzzle.c:103 msgid "Puzzle" msgstr "Пазл" -#: ../../magic/src/puzzle.c:110 +#: ../../magic/src/puzzle.c:110 msgid "Click the part of your picture where would you like a puzzle." msgstr "Щёлкните по части картинки, где бы вы хотели получить пазл." -#: ../../magic/src/puzzle.c:111 +#: ../../magic/src/puzzle.c:111 msgid "Click to make a puzzle in fullscreen mode." msgstr "Щёлкните по картинке, чтобы создать пазл в полноэкранном режиме." -#: ../../magic/src/rails.c:129 +#: ../../magic/src/rails.c:129 msgid "Rails" msgstr "Рельсы" -#: ../../magic/src/rails.c:134 +#: ../../magic/src/rails.c:134 msgid "Click and drag to draw train track rails on your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы нарисовать железнодорожные рельсы." -#: ../../magic/src/rainbow.c:133 +#: ../../magic/src/rainbow.c:133 msgid "Rainbow" msgstr "7 цветов" -#: ../../magic/src/rainbow.c:139 +#: ../../magic/src/rainbow.c:139 msgid "You can draw in rainbow colors!" msgstr "Вы можете рисовать цветами радуги!" -#: ../../magic/src/rain.c:68 +#: ../../magic/src/rain.c:68 msgid "Rain" msgstr "Дождь" -#: ../../magic/src/rain.c:72 +#: ../../magic/src/rain.c:72 msgid "Click to place a rain drop onto your picture." msgstr "Щёлкните, чтобы поместить дождевые капли на вашу картинку." -#: ../../magic/src/rain.c:73 +#: ../../magic/src/rain.c:73 msgid "Click to cover your picture with rain drops." msgstr "Щёлкните, чтобы покрыть вашу картинку дождевыми каплями." # msgid "Rainbow" -#: ../../magic/src/realrainbow.c:98 +#: ../../magic/src/realrainbow.c:98 msgid "Real Rainbow" msgstr "Радуга" # msgid "Rainbow" -#: ../../magic/src/realrainbow.c:100 +#: ../../magic/src/realrainbow.c:100 msgid "ROYGBIV Rainbow" msgstr "Радуга" -#: ../../magic/src/realrainbow.c:108 +#: ../../magic/src/realrainbow.c:108 msgid "" "Click where you want your rainbow to start, drag to where you want it to " "end, and then let go to draw a rainbow." msgstr "Нажмите, чтобы указать начало радуги и тяните до её конца." -#: ../../magic/src/ripples.c:102 +#: ../../magic/src/ripples.c:102 msgid "Ripples" msgstr "Круги" -#: ../../magic/src/ripples.c:108 +#: ../../magic/src/ripples.c:108 msgid "Click to make ripples appear over your picture." msgstr "Щёлкните, чтобы сделать «круги на воде»." -#: ../../magic/src/rosette.c:115 +#: ../../magic/src/rosette.c:115 msgid "Rosette" msgstr "Розетка" -#: ../../magic/src/rosette.c:117 +#: ../../magic/src/rosette.c:117 msgid "Picasso" msgstr "Пикассо" -#: ../../magic/src/rosette.c:123 +#: ../../magic/src/rosette.c:123 msgid "Click and start drawing your rosette." msgstr "Щёлкните, чтобы начать рисовать розетку. " -#: ../../magic/src/rosette.c:125 +#: ../../magic/src/rosette.c:125 msgid "You can draw just like Picasso!" msgstr "Вы можете рисовать почти как Пикассо!" -#: ../../magic/src/sharpen.c:76 +#: ../../magic/src/sharpen.c:76 msgid "Edges" msgstr "Края" -#: ../../magic/src/sharpen.c:77 +#: ../../magic/src/sharpen.c:77 msgid "Sharpen" msgstr "Резкость" -#: ../../magic/src/sharpen.c:78 +#: ../../magic/src/sharpen.c:78 msgid "Silhouette" msgstr "Силуэт" -#: ../../magic/src/sharpen.c:82 +#: ../../magic/src/sharpen.c:82 msgid "Click and drag the mouse to trace edges in parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы выделить края объектов." -#: ../../magic/src/sharpen.c:83 +#: ../../magic/src/sharpen.c:83 msgid "Click to trace edges in your entire picture." msgstr "Щёлкните, чтобы выделить края объектов на всей картинке." -#: ../../magic/src/sharpen.c:84 +#: ../../magic/src/sharpen.c:84 msgid "Click and drag the mouse to sharpen parts of your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы увеличить резкость её части." -#: ../../magic/src/sharpen.c:85 +#: ../../magic/src/sharpen.c:85 msgid "Click to sharpen the entire picture." msgstr "Щёлкните, чтобы увеличить резкость картинки." -#: ../../magic/src/sharpen.c:86 +#: ../../magic/src/sharpen.c:86 msgid "Click and drag the mouse to create a black and white silhouette." msgstr "Щёлкните и ведите мышью по картинке, чтобы создать черно-белый силуэт." -#: ../../magic/src/sharpen.c:87 +#: ../../magic/src/sharpen.c:87 msgid "Click to create a black and white silhouette of your entire picture." msgstr "Щёлкните, чтобы создать черно-белый силуэт всего рисунка." -#: ../../magic/src/shift.c:106 +#: ../../magic/src/shift.c:106 msgid "Shift" msgstr "Сдвиг" -#: ../../magic/src/shift.c:112 +#: ../../magic/src/shift.c:112 msgid "Click and drag to shift your picture around on the canvas." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы сдвинуть рисунок относительно " "холста." -#: ../../magic/src/smudge.c:102 +#: ../../magic/src/smudge.c:102 msgid "Smudge" msgstr "Смазать" -#. if (which == 1) -#: ../../magic/src/smudge.c:104 +#. if (which == 1) +#: ../../magic/src/smudge.c:104 msgid "Wet Paint" msgstr "Мокрое рисование" -#: ../../magic/src/smudge.c:111 +#: ../../magic/src/smudge.c:111 msgid "Click and drag the mouse around to smudge the picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы смазать рисунок." -#. if (which == 1) -#: ../../magic/src/smudge.c:113 +#. if (which == 1) +#: ../../magic/src/smudge.c:113 msgid "Click and drag the mouse around to draw with wet, smudgy paint." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы рисовать мокрыми, размытыми " "красками." -#: ../../magic/src/snow.c:71 +#: ../../magic/src/snow.c:71 msgid "Snow Ball" msgstr "Снежок" -#: ../../magic/src/snow.c:72 +#: ../../magic/src/snow.c:72 msgid "Snow Flake" msgstr "Снежинка" -#: ../../magic/src/snow.c:76 +#: ../../magic/src/snow.c:76 msgid "Click to add snow balls to your picture." msgstr "Щёлкните, чтобы добавить снежки на вашу картинку." -#: ../../magic/src/snow.c:77 +#: ../../magic/src/snow.c:77 msgid "Click to add snow flakes to your picture." msgstr "Щёлкните, чтобы добавить снежинки на вашу картинку." -#: ../../magic/src/string.c:129 +#: ../../magic/src/string.c:129 msgid "String edges" msgstr "Паутинка" -#: ../../magic/src/string.c:132 +#: ../../magic/src/string.c:132 msgid "String corner" msgstr "Уголок" -#: ../../magic/src/string.c:135 +#: ../../magic/src/string.c:135 msgid "String 'V'" msgstr "Нити" # msgid "" # "Click and drag to draw string art. Drag top-bottom to draw less or more " # "lines, to the center to approach the lines to center." -#: ../../magic/src/string.c:147 +#: ../../magic/src/string.c:147 msgid "" "Click and drag to draw string art. Drag top-bottom to draw less or more " "lines, left or right to make a bigger hole." @@ -1455,32 +1455,32 @@ msgstr "" "вправо, чтобы увеличить отверстие." # msgid "Click and drag to draw a beam of light on your picture." -#: ../../magic/src/string.c:150 +#: ../../magic/src/string.c:150 msgid "Click and drag to draw arrows made of string art." msgstr "Щёлкните и ведите мышью по картинке, чтобы нарисовать стрелу из нитей." -#: ../../magic/src/string.c:153 +#: ../../magic/src/string.c:153 msgid "Draw string art arrows with free angles." msgstr "Рисуйте каркас из нитей под любым углом." -#: ../../magic/src/tint.c:74 +#: ../../magic/src/tint.c:74 msgid "Tint" msgstr "Смена цвета" -#: ../../magic/src/tint.c:75 +#: ../../magic/src/tint.c:75 msgid "Color & White" msgstr "Два цвета" -#: ../../magic/src/tint.c:79 +#: ../../magic/src/tint.c:79 msgid "" "Click and drag the mouse around to change the color of parts of your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы изменить цвет её части." -#: ../../magic/src/tint.c:80 +#: ../../magic/src/tint.c:80 msgid "Click to change the color of your entire picture." msgstr "Щёлкните, чтобы изменить цвет картинки." -#: ../../magic/src/tint.c:81 +#: ../../magic/src/tint.c:81 msgid "" "Click and drag the mouse around to turn parts of your picture into white and " "a color you choose." @@ -1488,33 +1488,33 @@ msgstr "" "Щёлкните и ведите мышью по картинке, чтобы оставить на её части белый и " "выбранный вами цвет." -#: ../../magic/src/tint.c:82 +#: ../../magic/src/tint.c:82 msgid "Click to turn your entire picture into white and a color you choose." msgstr "Щёлкните, чтобы оставить на картинке белый и выбранный вами цвет." -#: ../../magic/src/toothpaste.c:68 +#: ../../magic/src/toothpaste.c:68 msgid "Toothpaste" msgstr "Паста" -#: ../../magic/src/toothpaste.c:72 +#: ../../magic/src/toothpaste.c:72 msgid "Click and drag to squirt toothpaste onto your picture." msgstr "" "Щёлкните и ведите мышью по картинке, чтобы выдавить на неё зубную пасту." -#: ../../magic/src/tornado.c:153 +#: ../../magic/src/tornado.c:153 msgid "Tornado" msgstr "Торнадо" -#: ../../magic/src/tornado.c:159 +#: ../../magic/src/tornado.c:159 msgid "Click and drag to draw a tornado funnel on your picture." msgstr "Щёлкните и ведите мышью по картинке, чтобы нарисовать торнадо." -#: ../../magic/src/tv.c:96 +#: ../../magic/src/tv.c:96 msgid "TV" msgstr "ТВ" # msgid "Click to make your picture look like it's on television." -#: ../../magic/src/tv.c:102 +#: ../../magic/src/tv.c:102 msgid "" "Click and drag to make parts of your picture look like they are on " "television." @@ -1522,19 +1522,19 @@ msgstr "" "Щёлкните и ведите мышью по картинке, чтобы ваша картинка выглядела, как " "телевизионная." -#: ../../magic/src/tv.c:105 +#: ../../magic/src/tv.c:105 msgid "Click to make your picture look like it's on television." msgstr "Щёлкните, чтобы ваша картинка выглядела, как телевизионная." -#: ../../magic/src/waves.c:104 +#: ../../magic/src/waves.c:104 msgid "Waves" msgstr "Волны" -#: ../../magic/src/waves.c:106 +#: ../../magic/src/waves.c:106 msgid "Wavelets" msgstr "Рябь" -#: ../../magic/src/waves.c:115 +#: ../../magic/src/waves.c:115 msgid "" "Click to make the picture horizontally wavy. Click toward the top for " "shorter waves, the bottom for taller waves, the left for small waves, and " @@ -1544,7 +1544,7 @@ msgstr "" "сделать волны короче, вниз - выше, налево - для коротких волн, направо - для " "длинных." -#: ../../magic/src/waves.c:118 +#: ../../magic/src/waves.c:118 msgid "" "Click to make the picture vertically wavy. Click toward the top for shorter " "waves, the bottom for taller waves, the left for small waves, and the right " @@ -1553,16 +1553,16 @@ msgstr "" "Щёлкните, чтобы нарисовать вертикальные волны. Двигайте вверх, чтобы сделать " "волны короче, вниз — выше, налево — для коротких волн, направо — для длинных." -#: ../../magic/src/xor.c:93 +#: ../../magic/src/xor.c:93 msgid "Xor Colors" msgstr "Цвета XOR" # msgid "Click and drag to draw a beam of light on your picture." -#: ../../magic/src/xor.c:99 +#: ../../magic/src/xor.c:99 msgid "Click and drag to draw a XOR effect" msgstr "Щёлкните и ведите мышью по картинке, чтобы рисовать эффектом XOR" -#: ../../magic/src/xor.c:101 +#: ../../magic/src/xor.c:101 msgid "Click to draw a XOR effect on the whole picture" msgstr "Щёлкните, чтобы добавить эффект XOR к вашей картинке." diff --git a/src/po/si.po b/src/po/si.po index 5d54a0ac9..0aaff63ec 100644 --- a/src/po/si.po +++ b/src/po/si.po @@ -17,464 +17,464 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Response to Black (0, 0, 0) color selected -#: ../colors.h:86 +#. Response to Black (0, 0, 0) color selected +#: ../colors.h:86 msgid "Black!" msgstr "කළු පැහැය!" -#. Response to Dark grey (128, 128, 128) color selected -#: ../colors.h:89 +#. Response to Dark grey (128, 128, 128) color selected +#: ../colors.h:89 #, fuzzy #| msgid "Dark grey! Some people spell it “dark gray”." msgid "Dark grey! Some people spell it “dark gray”." msgstr "තද අළු පැහැය!" -#. Response to Light grey (192, 192, 192) color selected -#: ../colors.h:92 +#. Response to Light grey (192, 192, 192) color selected +#: ../colors.h:92 #, fuzzy #| msgid "Light grey! Some people spell it “light gray”." msgid "Light grey! Some people spell it “light gray”." msgstr "ළා අළු පැහැය!" -#. Response to White (255, 255, 255) color selected -#: ../colors.h:95 +#. Response to White (255, 255, 255) color selected +#: ../colors.h:95 msgid "White!" msgstr "සුදු පැහැය!" -#. Response to Red (255, 0, 0) color selected -#: ../colors.h:98 +#. Response to Red (255, 0, 0) color selected +#: ../colors.h:98 msgid "Red!" msgstr "රතු පැහැය!" -#. Response to Orange (255, 128, 0) color selected -#: ../colors.h:101 +#. Response to Orange (255, 128, 0) color selected +#: ../colors.h:101 msgid "Orange!" msgstr "තැඹිළි පැහැය!" -#. Response to Yellow (255, 255, 0) color selected -#: ../colors.h:104 +#. Response to Yellow (255, 255, 0) color selected +#: ../colors.h:104 msgid "Yellow!" msgstr "කහ පැහැය!" -#. Response to Light green (160, 228, 128) color selected -#: ../colors.h:107 +#. Response to Light green (160, 228, 128) color selected +#: ../colors.h:107 msgid "Light green!" msgstr "ළා කොළ පැහැය!" -#. Response to Dark green (33, 148, 70) color selected -#: ../colors.h:110 +#. Response to Dark green (33, 148, 70) color selected +#: ../colors.h:110 msgid "Dark green!" msgstr "තද කොළ පැහැය!" -#. Response to "Sky" blue (138, 168, 205) color selected -#: ../colors.h:113 +#. Response to "Sky" blue (138, 168, 205) color selected +#: ../colors.h:113 msgid "Sky blue!" msgstr "ළා නිල් පැහැය!" -#. Response to Blue (50, 100, 255) color selected -#: ../colors.h:116 +#. Response to Blue (50, 100, 255) color selected +#: ../colors.h:116 msgid "Blue!" msgstr "නිල් පැහැය!" -#. Response to Lavender (186, 157, 255) color selected -#: ../colors.h:119 +#. Response to Lavender (186, 157, 255) color selected +#: ../colors.h:119 msgid "Lavender!" msgstr "ළා දම් පැහැය!" -#. Response to Purple (128, 0, 128) color selected -#: ../colors.h:122 +#. Response to Purple (128, 0, 128) color selected +#: ../colors.h:122 msgid "Purple!" msgstr "දම් පැහැය!" -#. Response to Pink (255, 165, 211) color selected -#: ../colors.h:125 +#. Response to Pink (255, 165, 211) color selected +#: ../colors.h:125 msgid "Pink!" msgstr "රෝස පැහැය!" -#. Response to Brown (128, 80, 0) color selected -#: ../colors.h:128 +#. Response to Brown (128, 80, 0) color selected +#: ../colors.h:128 msgid "Brown!" msgstr "දුඹුරු පැහැය!" -#. Response to Tan (226, 189, 166) color selected -#: ../colors.h:131 +#. Response to Tan (226, 189, 166) color selected +#: ../colors.h:131 msgid "Tan!" msgstr "ළා දුඹුරු පැහැය!" -#. Response to Beige (247, 228, 219) color selected -#: ../colors.h:134 +#. Response to Beige (247, 228, 219) color selected +#: ../colors.h:134 msgid "Beige!" msgstr "වැලි දුඹුරු පැහැය!" -#. First, the blacklist. We list font families that can crash Tux Paint -#. via bugs in the SDL_ttf library. We also test fonts to be sure that -#. they have both uppercase and lowercase letters. Note that we do not -#. test for "Aa", because it is OK if uppercase and lowercase are the -#. same (but not nice -- such fonts get a low score later). -#. -#. Most locales leave the blacklist strings alone: "QX" and "qx" -#. (it is less destructive to use the scoring strings instead) -#. -#. Locales that absolutely require all fonts to have some -#. extra characters should use "QX..." and "qx...", where "..." -#. are some characters you absolutely require in all fonts. -#. -#. Locales with absolutely NO use for ASCII may use "..." and "...", -#. where "..." are some characters you absolutely require in -#. all fonts. This would be the case for a locale in which it is -#. impossible for a user to type ASCII letters. -#. -#. Most translators should use scoring instead. -#: ../dirwalk.c:177 +#. First, the blacklist. We list font families that can crash Tux Paint +#. via bugs in the SDL_ttf library. We also test fonts to be sure that +#. they have both uppercase and lowercase letters. Note that we do not +#. test for "Aa", because it is OK if uppercase and lowercase are the +#. same (but not nice -- such fonts get a low score later). +#. +#. Most locales leave the blacklist strings alone: "QX" and "qx" +#. (it is less destructive to use the scoring strings instead) +#. +#. Locales that absolutely require all fonts to have some +#. extra characters should use "QX..." and "qx...", where "..." +#. are some characters you absolutely require in all fonts. +#. +#. Locales with absolutely NO use for ASCII may use "..." and "...", +#. where "..." are some characters you absolutely require in +#. all fonts. This would be the case for a locale in which it is +#. impossible for a user to type ASCII letters. +#. +#. Most translators should use scoring instead. +#: ../dirwalk.c:177 msgid "qx" msgstr "qx" -#: ../dirwalk.c:177 +#: ../dirwalk.c:177 msgid "QX" msgstr "QX" -#. TODO: weight specification -#. Now we score fonts to ensure that the best ones will be placed at -#. the top of the list. The user will see them first. This sorting is -#. especially important for users who have scroll buttons disabled. -#. Translators should do whatever is needed to put crummy fonts last. -#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') -#: ../dirwalk.c:202 +#. TODO: weight specification +#. Now we score fonts to ensure that the best ones will be placed at +#. the top of the list. The user will see them first. This sorting is +#. especially important for users who have scroll buttons disabled. +#. Translators should do whatever is needed to put crummy fonts last. +#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') +#: ../dirwalk.c:202 msgid "oO" msgstr "oO" -#. common punctuation (e.g., '?', '!', '.', ',', etc.) -#: ../dirwalk.c:205 +#. common punctuation (e.g., '?', '!', '.', ',', etc.) +#: ../dirwalk.c:205 msgid ",.?!" msgstr ",.?!" -#. uncommon punctuation (e.g., '@', '#', '*', etc.) -#: ../dirwalk.c:208 +#. uncommon punctuation (e.g., '@', '#', '*', etc.) +#: ../dirwalk.c:208 #, fuzzy #| msgid "`\\%_@$~#{<(^&*" msgid "`%_@$~#{<(^&*" msgstr "`\\%_@$~#{<(^&*" -#. digits (e.g., '0', '1' and '7') -#: ../dirwalk.c:211 +#. digits (e.g., '0', '1' and '7') +#: ../dirwalk.c:211 msgid "017" msgstr "017" -#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) -#: ../dirwalk.c:214 +#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) +#: ../dirwalk.c:214 msgid "O0" msgstr "O0" -#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) -#: ../dirwalk.c:217 +#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) +#: ../dirwalk.c:217 msgid "1Il|" msgstr "1Il|" -#: ../dirwalk.c:221 +#: ../dirwalk.c:221 msgid "<1>spare-1a" msgstr "<1>spare-1a" -#: ../dirwalk.c:222 +#: ../dirwalk.c:222 msgid "<1>spare-1b" msgstr "<1>spare-1b" -#: ../dirwalk.c:223 +#: ../dirwalk.c:223 msgid "<9>spare-9a" msgstr "<9>spare-9a" -#: ../dirwalk.c:224 +#: ../dirwalk.c:224 msgid "<9>spare-9b" msgstr "<9>spare-9b" -#. Congratulations #1 -#: ../great.h:37 +#. Congratulations #1 +#: ../great.h:37 msgid "Great!" msgstr "විශිෂ්ටයි!" -#. Congratulations #2 -#: ../great.h:40 +#. Congratulations #2 +#: ../great.h:40 msgid "Cool!" msgstr "නියමයි!" -#. Congratulations #3 -#: ../great.h:43 +#. Congratulations #3 +#: ../great.h:43 msgid "Keep it up!" msgstr "දිගටම කරගෙන යන්න!" -#. Congratulations #4 -#: ../great.h:46 +#. Congratulations #4 +#: ../great.h:46 msgid "Good job!" msgstr "විශිෂ්ට කාර්යයක්!" -#. Input Method: English mode -#: ../im.c:74 +#. Input Method: English mode +#: ../im.c:74 msgid "English" msgstr "ඉංග්‍රීසි" -#. Input Method: Japanese Romanized Hiragana mode -#: ../im.c:77 +#. Input Method: Japanese Romanized Hiragana mode +#: ../im.c:77 msgid "Hiragana" msgstr "හිරගන" -#. Input Method: Japanese Romanized Katakana mode -#: ../im.c:80 +#. Input Method: Japanese Romanized Katakana mode +#: ../im.c:80 msgid "Katakana" msgstr "කටකන" -#. Input Method: Korean Hangul 2-Bul mode -#: ../im.c:83 +#. Input Method: Korean Hangul 2-Bul mode +#: ../im.c:83 msgid "Hangul" msgstr "හන්ගුල්" -#. Input Method: Thai mode -#: ../im.c:86 +#. Input Method: Thai mode +#: ../im.c:86 msgid "Thai" msgstr "තායි" -#. Input Method: Traditional Chinese mode -#: ../im.c:89 +#. Input Method: Traditional Chinese mode +#: ../im.c:89 msgid "ZH_TW" msgstr "ZH_TW" -#. Square shape tool (4 equally-lengthed sides at right angles) -#: ../shapes.h:234 ../shapes.h:235 +#. Square shape tool (4 equally-lengthed sides at right angles) +#: ../shapes.h:234 ../shapes.h:235 msgid "Square" msgstr "සමචතුරස්‍රය" -#. Rectangle shape tool (4 sides at right angles) -#: ../shapes.h:238 ../shapes.h:239 +#. Rectangle shape tool (4 sides at right angles) +#: ../shapes.h:238 ../shapes.h:239 msgid "Rectangle" msgstr "සෘජුකෝණාස්‍රය" -#. Circle shape tool (X radius and Y radius are the same) -#: ../shapes.h:242 ../shapes.h:243 +#. Circle shape tool (X radius and Y radius are the same) +#: ../shapes.h:242 ../shapes.h:243 msgid "Circle" msgstr "වෘත්තය" -#. Ellipse shape tool (X radius and Y radius may differ) -#: ../shapes.h:246 ../shapes.h:247 +#. Ellipse shape tool (X radius and Y radius may differ) +#: ../shapes.h:246 ../shapes.h:247 msgid "Ellipse" msgstr "ඉලිප්සය" -#. Triangle shape tool (3 sides) -#: ../shapes.h:250 ../shapes.h:251 +#. Triangle shape tool (3 sides) +#: ../shapes.h:250 ../shapes.h:251 msgid "Triangle" msgstr "ත්‍රිකෝණය" -#. Pentagone shape tool (5 sides) -#: ../shapes.h:254 ../shapes.h:255 +#. Pentagone shape tool (5 sides) +#: ../shapes.h:254 ../shapes.h:255 msgid "Pentagon" msgstr "පංචාස්‍රය" -#. Rhombus shape tool (4 sides, not at right angles) -#: ../shapes.h:258 ../shapes.h:259 +#. Rhombus shape tool (4 sides, not at right angles) +#: ../shapes.h:258 ../shapes.h:259 msgid "Rhombus" msgstr "රොම්බසය" -#. Octagon shape tool (8 sides) -#: ../shapes.h:262 ../shapes.h:263 +#. Octagon shape tool (8 sides) +#: ../shapes.h:262 ../shapes.h:263 msgid "Octagon" msgstr "අෂ්ටාස්‍රය" -#. Triangle star (3 points star) -#. Rhombus star (4 points star) -#. Pentagone star (5 points star) -#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 -#: ../shapes.h:278 ../shapes.h:281 +#. Triangle star (3 points star) +#. Rhombus star (4 points star) +#. Pentagone star (5 points star) +#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 +#: ../shapes.h:278 ../shapes.h:281 msgid "Star" msgstr "" -#. Description of a square -#: ../shapes.h:289 ../shapes.h:290 +#. Description of a square +#: ../shapes.h:289 ../shapes.h:290 msgid "A square is a rectangle with four equal sides." msgstr "සමචතුරස්‍රය යනු පාද සතරම සමාන සෘජුකෝණාස්‍රයකි." -#. Description of a rectangle -#: ../shapes.h:293 ../shapes.h:294 +#. Description of a rectangle +#: ../shapes.h:293 ../shapes.h:294 msgid "A rectangle has four sides and four right angles." msgstr "සෘජුකෝණාස්‍රයට සතර පැත්තක් හා සෘජුකෝණ සතරක් තිබේ." -#. Description of a circle -#: ../shapes.h:297 ../shapes.h:298 +#. Description of a circle +#: ../shapes.h:297 ../shapes.h:298 msgid "" "A circle is a curve where all points have the same distance from the center." msgstr "වෘත්තයක් යනු මධ්‍යයේ සිට සළකුණු කරනු ලබන ඕනෑම ස්ථානයක් සම දුරින් පිහිටන්නා වූ වක්‍රයකි." -#. Description of an ellipse -#: ../shapes.h:301 ../shapes.h:302 +#. Description of an ellipse +#: ../shapes.h:301 ../shapes.h:302 msgid "An ellipse is a stretched circle." msgstr "ඉලිප්සයක් යනු එක් පැත්තකට අදිනු ලැබූ වෘත්තයකි." -#. Description of a triangle -#: ../shapes.h:305 ../shapes.h:306 +#. Description of a triangle +#: ../shapes.h:305 ../shapes.h:306 msgid "A triangle has three sides." msgstr "ත්‍රිකෝණයකට තුන් පැත්තතක් තිබේ." -#. Description of a pentagon -#: ../shapes.h:309 ../shapes.h:310 +#. Description of a pentagon +#: ../shapes.h:309 ../shapes.h:310 msgid "A pentagon has five sides." msgstr "පංචාස්‍රයකට පාද පහක් තිබේ." -#. Description of a rhombus -#: ../shapes.h:313 ../shapes.h:314 +#. Description of a rhombus +#: ../shapes.h:313 ../shapes.h:314 msgid "A rhombus has four equal sides, and opposite sides are parallel." msgstr "රොම්බසයේ පාද සතරම සමාන වන අතර සම්මුඛ පාද සමාන්තර වේ." -#. Description of an octagon -#: ../shapes.h:317 ../shapes.h:318 +#. Description of an octagon +#: ../shapes.h:317 ../shapes.h:318 msgid "An octagon has eight equal sides." msgstr "අෂ්ටාස්‍රයකට සමාන පාද අටක් තිබේ." -#: ../shapes.h:320 ../shapes.h:321 +#: ../shapes.h:320 ../shapes.h:321 msgid "A star with 3 points." msgstr "" -#: ../shapes.h:322 ../shapes.h:323 +#: ../shapes.h:322 ../shapes.h:323 msgid "A star with 4 points." msgstr "" -#: ../shapes.h:324 ../shapes.h:325 +#: ../shapes.h:324 ../shapes.h:325 msgid "A star with 5 points." msgstr "" -#: ../shapes.h:372 +#: ../shapes.h:372 msgid "Draw shapes from the center." msgstr "" -#: ../shapes.h:373 +#: ../shapes.h:373 msgid "Draw shapes from a corner." msgstr "" -#. Title of tool selector (buttons down the left) -#: ../titles.h:56 +#. Title of tool selector (buttons down the left) +#: ../titles.h:56 msgid "Tools" msgstr "මෙවලම්" -#. Title of color palette (buttons across the bottom) -#: ../titles.h:59 +#. Title of color palette (buttons across the bottom) +#: ../titles.h:59 msgid "Colors" msgstr "වර්ණ" -#. Title of brush selector (buttons down the right for paint and line tools) -#: ../titles.h:62 +#. Title of brush selector (buttons down the right for paint and line tools) +#: ../titles.h:62 msgid "Brushes" msgstr "පින්සල්" -#. Title of eraser selector (buttons down the right for eraser tool) -#: ../titles.h:65 +#. Title of eraser selector (buttons down the right for eraser tool) +#: ../titles.h:65 msgid "Erasers" msgstr "මකන" -#. Title of stamp selector (buttons down the right for stamps tool) -#: ../titles.h:68 +#. Title of stamp selector (buttons down the right for stamps tool) +#: ../titles.h:68 msgid "Stamps" msgstr "මුද්‍රා" -#. Title of shape selector (buttons down the right for shapes tool) -#. Shape creation tool (square, circle, etc.) -#: ../titles.h:71 ../tools.h:71 +#. Title of shape selector (buttons down the right for shapes tool) +#. Shape creation tool (square, circle, etc.) +#: ../titles.h:71 ../tools.h:71 msgid "Shapes" msgstr "හැඩතල" -#. Title of font selector (buttons down the right for text and label tools) -#: ../titles.h:74 +#. Title of font selector (buttons down the right for text and label tools) +#: ../titles.h:74 msgid "Letters" msgstr "අක්ෂර" -#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) -#. "Magic" effects tools (blur, flip image, etc.) -#: ../titles.h:77 ../tools.h:83 +#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) +#. "Magic" effects tools (blur, flip image, etc.) +#: ../titles.h:77 ../tools.h:83 msgid "Magic" msgstr "මැජික්" -#. Freehand painting tool -#: ../tools.h:62 +#. Freehand painting tool +#: ../tools.h:62 msgid "Paint" msgstr "වර්ණක" -#. Stamp tool (aka Rubber Stamps) -#: ../tools.h:65 +#. Stamp tool (aka Rubber Stamps) +#: ../tools.h:65 msgid "Stamp" msgstr "රබර් මුද්‍රාව" -#. Line drawing tool -#: ../tools.h:68 +#. Line drawing tool +#: ../tools.h:68 msgid "Lines" msgstr "රේඛා" -#. Text tool -#: ../tools.h:74 +#. Text tool +#: ../tools.h:74 msgid "Text" msgstr "වගන්තිය" -#. Label tool -#: ../tools.h:77 +#. Label tool +#: ../tools.h:77 msgid "Label" msgstr "ලේබලය" -#. Fill tool -#: ../tools.h:80 +#. Fill tool +#: ../tools.h:80 msgid "Fill" msgstr "පුරවන්න" -#. Undo last action -#: ../tools.h:86 +#. Undo last action +#: ../tools.h:86 msgid "Undo" msgstr "පසු පියවරට යන්න" -#. Redo undone action -#: ../tools.h:89 +#. Redo undone action +#: ../tools.h:89 msgid "Redo" msgstr "ඉදිරි පියවරට යන්න" -#. Eraser tool -#: ../tools.h:92 +#. Eraser tool +#: ../tools.h:92 msgid "Eraser" msgstr "මකනය" -#. Start a new picture -#: ../tools.h:95 +#. Start a new picture +#: ../tools.h:95 msgid "New" msgstr "නව ඇරඹුමක්" -#. 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 +#. 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 msgid "Open" msgstr "විවෘත කරන්න" -#. Save the current picture -#: ../tools.h:101 +#. Save the current picture +#: ../tools.h:101 msgid "Save" msgstr "සුරකින්න" -#. Print the current picture -#: ../tools.h:104 +#. Print the current picture +#: ../tools.h:104 msgid "Print" msgstr "මුද්‍රණය කරන්න" -#. Quit/exit Tux Paint application -#: ../tools.h:107 +#. Quit/exit Tux Paint application +#: ../tools.h:107 msgid "Quit" msgstr "ඉවත් වන්න" -#. Paint tool instructions -#: ../tools.h:115 +#. Paint tool instructions +#: ../tools.h:115 msgid "Pick a color and a brush shape to draw with." msgstr "ඇඳීම සඳහා වර්ණයක් හා පින්සලක් තෝරාගන්න." -#. Stamp tool instructions -#: ../tools.h:118 +#. Stamp tool instructions +#: ../tools.h:118 msgid "Pick a picture to stamp around your drawing." msgstr "ඔබේ චිත්‍රය වටා මුද්‍රා තැබීම සඳහා පින්තූරයක් තෝරාගන්න." -#. Line tool instructions -#: ../tools.h:121 +#. Line tool instructions +#: ../tools.h:121 msgid "Click to start drawing a line. Let go to complete it." msgstr "රේඛාවක් ඇඳීම සඳහා මෙය තෝරාගෙන එය සම්පූර්ණ කරන්න." -#: ../tools.h:125 +#: ../tools.h:125 #, fuzzy #| msgid "" #| "Pick a shape. Click to pick the center, drag, then let go when it is the " @@ -486,7 +486,7 @@ msgstr "" "හැඩතලයක් තෝරාගන්න. එය මැද ක්ලික් කර ඔබට අවශ්‍ය ප්‍රමාණයට ඇදගෙන යන්න. එය කරකැවීමට එහා " "මෙහා ගෙනයන්න, ඇඳීම සඳහා ක්ලික් කරන්න." -#: ../tools.h:129 +#: ../tools.h:129 msgid "" "Choose a style of text. Click on your drawing and you can start typing. " "Press [Enter] or [Tab] to complete the text." @@ -494,7 +494,7 @@ msgstr "" "සුදුසු වගන්ති ශෛලිය තෝරාගන්න. ඔබේ චිත්‍රය මත ක්ලික් කර ටයිප් කරගෙන යන්න. වගන්තිය අවසාන කිරීමට " "[Enter] හෝ [Tab] ඔබන්න." -#: ../tools.h:133 +#: ../tools.h:133 #, fuzzy #| msgid "" #| "Choose a style of text. Click on your drawing and you can start typing. " @@ -511,357 +511,357 @@ msgstr "" "[Enter] හෝ [Tab] ඔබන්න. තෝරනය බොත්තමෙන් හා පවතින ලේබලය ක්ලික් කිරීමෙන්,ඔබට එය එහා මෙහා " "ගෙනයන්නටත්, සංස්කරණය කිරීමට හා එහි වගන්ති ශෛලිය වෙනස් කිරීමත් කළ හැකිය." -#. Fill tool instructions -#: ../tools.h:136 +#. Fill tool instructions +#: ../tools.h:136 msgid "Click in the picture to fill that area with color." msgstr "පින්තූරයේ ප්‍රදේශ පාට කිරීමට එම ප්‍රදේශය තුල මූසික ක්ලිකය කරන්න." -#. Magic tool instruction -#: ../tools.h:139 +#. Magic tool instruction +#: ../tools.h:139 msgid "Pick a magical effect to use on your drawing!" msgstr "ඔබේ චිත්‍රයේ භාවිතා කිරීමට මැජික් ඵලයක් තෝරාගන්න!" -#. Response to 'undo' action -#: ../tools.h:142 +#. Response to 'undo' action +#: ../tools.h:142 msgid "Undo!" msgstr "පසු පියවරට යන්න!" -#. Response to 'redo' action -#: ../tools.h:145 +#. Response to 'redo' action +#: ../tools.h:145 msgid "Redo!" msgstr "ඉදිරි පියවරට යන්න!" -#. Eraser tool -#: ../tools.h:148 +#. Eraser tool +#: ../tools.h:148 msgid "Eraser!" msgstr "මකනය!" -#. Response to 'start a new image' action -#: ../tools.h:151 +#. Response to 'start a new image' action +#: ../tools.h:151 msgid "Pick a color or picture with which to start a new drawing." msgstr "නව චිත්‍රයක් ආරම්භ කිරීම සඳහා වර්ණයක් හෝ පින්තූරයක් තෝරාගන්න." -#. Response to 'open' action (while file dialog is being constructed) -#: ../tools.h:154 +#. Response to 'open' action (while file dialog is being constructed) +#: ../tools.h:154 #, fuzzy #| msgid "Open" msgid "Open…" msgstr "විවෘත කරන්න" -#. Response to 'save' action -#: ../tools.h:157 +#. Response to 'save' action +#: ../tools.h:157 msgid "Your image has been saved!" msgstr "ඔබගේ පින්තූරය සුරැකිනි!" -#. Response to 'print' action (while printing, or print dialog is being used) -#: ../tools.h:160 +#. Response to 'print' action (while printing, or print dialog is being used) +#: ../tools.h:160 #, fuzzy #| msgid "Printing…" msgid "Printing…" msgstr "මුද්‍රණය වෙමින් පවතී" -#. Response to 'quit' (exit) action -#: ../tools.h:163 +#. Response to 'quit' (exit) action +#: ../tools.h:163 msgid "Bye bye!" msgstr "සුභ දවසක්\t!" -#. Instruction while using Line tool (after click, before release) -#: ../tools.h:167 +#. Instruction while using Line tool (after click, before release) +#: ../tools.h:167 msgid "Let go of the button to complete the line." msgstr "රේඛාව සම්පූර්ණ කිරීමට බොත්තම අතහරින්න." -#. Instruction while using Shape tool (after first click, before release) -#: ../tools.h:170 +#. Instruction while using Shape tool (after first click, before release) +#: ../tools.h:170 msgid "Hold the button to stretch the shape." msgstr "හැඩය පැතිරීම සඳහා බොත්තම තදකර සිටින්න." -#. Instruction while finishing Shape tool (after release, during rotation step before second click) -#: ../tools.h:173 +#. Instruction while finishing Shape tool (after release, during rotation step before second click) +#: ../tools.h:173 msgid "Move the mouse to rotate the shape. Click to draw it." msgstr "හැඩය භ්‍රමණය කිරීමට මූසිකය චලනය කරන්න. ඇඳීමට මූසික ක්ලිකය කරන්න." -#. Notification that 'New' action was aborted (current image would have been lost) -#: ../tools.h:176 +#. Notification that 'New' action was aborted (current image would have been lost) +#: ../tools.h:176 #, fuzzy #| msgid "OK then… Let’s keep drawing this one!" msgid "OK then… Let’s keep drawing this one!" msgstr "Oඔව් එසේ නම් නැවතත් මෙය අඳිමු!" -#. Prompt to confirm user wishes to quit -#: ../tuxpaint.c:2134 +#. Prompt to confirm user wishes to quit +#: ../tuxpaint.c:2134 msgid "Do you really want to quit?" msgstr "ඔබට ඇත්තටම ඉවත්වීමට අවශ්‍යද ?" -#. Quit prompt positive response (quit) -#: ../tuxpaint.c:2137 +#. Quit prompt positive response (quit) +#: ../tuxpaint.c:2137 #, fuzzy #| msgid "Yes, I’m done!" msgid "Yes, I’m done!" msgstr "ඔව්, I’m ස්ථිර කරන ලදී! " -#. Quit prompt negative response (don't quit) -#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 +#. Quit prompt negative response (don't quit) +#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 msgid "No, take me back!" msgstr "නැහැ. නැවත මාව කැඳවන්න!" -#. Current picture is not saved; user is quitting -#: ../tuxpaint.c:2144 +#. Current picture is not saved; user is quitting +#: ../tuxpaint.c:2144 #, fuzzy #| msgid "If you quit, you’ll lose your picture! Save it?" msgid "If you quit, you’ll lose your picture! Save it?" msgstr "ඔබ ඉවත් වුවොත්, ඔබගේ පින්තූරය අහිමි වේ! සුරැකීමට අවශ්‍යද ?’" -#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 +#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 msgid "Yes, save it!" msgstr "ඔව්, සුරකින්න.!" -#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 +#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 #, fuzzy #| msgid "No, don’t bother saving!" msgid "No, don’t bother saving!" msgstr "නැහැ, සුරැකීමට බධා කිරීමෙන් වළකින්න!" -#. Current picture is not saved; user is opening another picture -#: ../tuxpaint.c:2149 +#. Current picture is not saved; user is opening another picture +#: ../tuxpaint.c:2149 msgid "Save your picture first?" msgstr "ප්‍රථමයෙන් ඔබගේ පින්තූරය සුරකින්නද?" -#. Error opening picture -#: ../tuxpaint.c:2154 +#. Error opening picture +#: ../tuxpaint.c:2154 #, fuzzy #| msgid "Can’t open that picture!" msgid "Can’t open that picture!" msgstr "එම පින්තූරය විවෘත කිරීමට නොහැක !" -#. Generic dialog dismissal -#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 -#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 +#. Generic dialog dismissal +#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 +#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 msgid "OK" msgstr "හරි" -#. Notification that 'Open' dialog has nothing to show -#: ../tuxpaint.c:2161 +#. Notification that 'Open' dialog has nothing to show +#: ../tuxpaint.c:2161 msgid "There are no saved files!" msgstr "සුරකින ලද ගොනු නොමැත!" -#. Verification of print action -#: ../tuxpaint.c:2165 +#. Verification of print action +#: ../tuxpaint.c:2165 msgid "Print your picture now?" msgstr "ඔබගේ පින්තූරය දැන් මුද්‍රණය කරන්නද?" -#: ../tuxpaint.c:2166 +#: ../tuxpaint.c:2166 msgid "Yes, print it!" msgstr "ඔව්, මුද්‍රණය කරන්න!" -#. Confirmation of successful (we hope) printing -#: ../tuxpaint.c:2170 +#. Confirmation of successful (we hope) printing +#: ../tuxpaint.c:2170 msgid "Your picture has been printed!" msgstr "ඔබගේ පින්තූරය මුද්‍රණය කරන ලදී!" -#. We got an error printing -#: ../tuxpaint.c:2174 +#. We got an error printing +#: ../tuxpaint.c:2174 msgid "Sorry! Your picture could not be printed!" msgstr "සමාවන්න! ඔබගේ පින්තූරය මුද්‍රණය කිරීමට නොහැක!" -#. Notification that it's too soon to print again (--printdelay option is in effect) -#: ../tuxpaint.c:2177 +#. Notification that it's too soon to print again (--printdelay option is in effect) +#: ../tuxpaint.c:2177 #, fuzzy #| msgid "You can’t print yet!" msgid "You can’t print yet!" msgstr "ඔබට තවම මුද්‍රණය කිරීමට නොහැක!" -#. Prompt to confirm erasing a picture in the Open dialog -#: ../tuxpaint.c:2181 +#. Prompt to confirm erasing a picture in the Open dialog +#: ../tuxpaint.c:2181 msgid "Erase this picture?" msgstr "මෙම පින්තූරය මකන්නද?" -#: ../tuxpaint.c:2182 +#: ../tuxpaint.c:2182 msgid "Yes, erase it!" msgstr "ඔව්, මකන්න!" -#: ../tuxpaint.c:2183 +#: ../tuxpaint.c:2183 #, fuzzy #| msgid "No, don’t erase it!" msgid "No, don’t erase it!" msgstr "නැහැ, මකන්න එපා!" -#. Reminder that Mouse Button 1 is the button to use in Tux Paint -#: ../tuxpaint.c:2186 +#. Reminder that Mouse Button 1 is the button to use in Tux Paint +#: ../tuxpaint.c:2186 msgid "Remember to use the left mouse button!" msgstr "වාම මූසික බොත්තම භාවිතා කිරීමට මතක තබා ගන්න!" -#. Confirmation of successful (we hope) image export -#: ../tuxpaint.c:2190 +#. Confirmation of successful (we hope) image export +#: ../tuxpaint.c:2190 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your picture has been exported!" msgstr "ඔබගේ පින්තූරය මුද්‍රණය කරන ලදී!" -#: ../tuxpaint.c:2191 +#: ../tuxpaint.c:2191 #, fuzzy #| msgid "Your picture has been printed!" msgid "Your slideshow GIF has been exported!" msgstr "ඔබගේ පින්තූරය මුද්‍රණය කරන ලදී!" -#. We got an error exporting -#: ../tuxpaint.c:2195 +#. 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 "සමාවන්න! ඔබගේ පින්තූරය මුද්‍රණය කිරීමට නොහැක!" -#: ../tuxpaint.c:2196 +#: ../tuxpaint.c:2196 #, fuzzy #| msgid "Sorry! Your picture could not be printed!" msgid "Sorry! Your slideshow GIF could not be exported!" msgstr "සමාවන්න! ඔබගේ පින්තූරය මුද්‍රණය කිරීමට නොහැක!" -#. Slideshow instructions -#: ../tuxpaint.c:2200 +#. Slideshow instructions +#: ../tuxpaint.c:2200 #, fuzzy #| msgid "Choose the pictures you want, then click “Play”." msgid "Choose the pictures you want, then click “Play”." msgstr "ඔබට අවශ්‍ය පින්තූර තොරන්න, ඉන්පසු ක්‍රියා කරවන්න මත මූසික ක්ලිකය කරන්න." -#. Sound has been muted (silenced) via keyboard shortcut -#: ../tuxpaint.c:2407 +#. Sound has been muted (silenced) via keyboard shortcut +#: ../tuxpaint.c:2407 msgid "Sound muted." msgstr "ශබ්දය ඉවත් කරන ලදී." -#. Sound has been unmuted (unsilenced) via keyboard shortcut -#: ../tuxpaint.c:2412 +#. Sound has been unmuted (unsilenced) via keyboard shortcut +#: ../tuxpaint.c:2412 msgid "Sound unmuted." msgstr "ශබ්දය නැවත ඇති කරන ලදී." -#. Wait while Text tool finishes loading fonts -#: ../tuxpaint.c:3167 +#. Wait while Text tool finishes loading fonts +#: ../tuxpaint.c:3167 #, fuzzy #| msgid "Please wait…" msgid "Please wait…" msgstr "කරුණාකර රැඳී සිටින්න!" -#. Open dialog: 'Erase' button, to erase/deleted the selected picture -#: ../tuxpaint.c:7923 +#. Open dialog: 'Erase' button, to erase/deleted the selected picture +#: ../tuxpaint.c:7923 msgid "Erase" msgstr "මකන්න" -#. Open dialog: 'Slides' button, to switch to slide show mode -#: ../tuxpaint.c:7926 +#. Open dialog: 'Slides' button, to switch to slide show mode +#: ../tuxpaint.c:7926 msgid "Slides" msgstr "ස්ලයිඩ" -#. Open dialog: 'Export' button, to copy an image to an easily-accessible location -#: ../tuxpaint.c:7929 +#. Open dialog: 'Export' button, to copy an image to an easily-accessible location +#: ../tuxpaint.c:7929 msgid "Export" msgstr "" -#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture -#: ../tuxpaint.c:7932 +#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture +#: ../tuxpaint.c:7932 msgid "Back" msgstr "ආපසු" -#. Slideshow: 'Play' button, to begin a slideshow sequence -#: ../tuxpaint.c:7935 +#. Slideshow: 'Play' button, to begin a slideshow sequence +#: ../tuxpaint.c:7935 msgid "Play" msgstr "ක්‍රියා කරවන්න" -#. Slideshow: 'GIF Export' button, to create an animated GIF -#: ../tuxpaint.c:7938 +#. Slideshow: 'GIF Export' button, to create an animated GIF +#: ../tuxpaint.c:7938 msgid "GIF Export" msgstr "" -#. Slideshow: 'Next' button, to load next slide (image) -#: ../tuxpaint.c:7941 +#. Slideshow: 'Next' button, to load next slide (image) +#: ../tuxpaint.c:7941 msgid "Next" msgstr "ඉදිරියට" -#. 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 +#. 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 msgid "Aa" msgstr "අකුරු" -#. 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 +#. 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 msgid "Yes" msgstr "ඔව් " -#: ../tuxpaint.c:12073 +#: ../tuxpaint.c:12073 msgid "No" msgstr "නැහැ" -#. Prompt to ask whether user wishes to save over old version of their file -#: ../tuxpaint.c:13190 +#. Prompt to ask whether user wishes to save over old version of their file +#: ../tuxpaint.c:13190 msgid "Replace the picture with your changes?" msgstr "ඔබගේ වෙනස් කිරීම් සමඟින් පින්තූරය ප්‍රතිස්ථාපනය කරන්නද?" -#. Positive response to saving over old version -#. (like a 'File:Save' action in other applications) -#: ../tuxpaint.c:13194 +#. Positive response to saving over old version +#. (like a 'File:Save' action in other applications) +#: ../tuxpaint.c:13194 msgid "Yes, replace the old one!" msgstr "ඔව්, පරණ පින්තූරය ප්‍රතිස්ථාපනය කරන්න!" -#. Negative response to saving over old version (saves a new image) -#. (like a 'File:Save As...' action in other applications) -#: ../tuxpaint.c:13198 +#. Negative response to saving over old version (saves a new image) +#. (like a 'File:Save As...' action in other applications) +#: ../tuxpaint.c:13198 msgid "No, save a new file!" msgstr "නැහැ, අලුත් ගොනුවක් සුරකින්න!" -#. Let user choose an image: -#. Instructions for 'Open' file dialog -#: ../tuxpaint.c:14454 +#. Let user choose an image: +#. Instructions for 'Open' file dialog +#: ../tuxpaint.c:14454 #, fuzzy #| msgid "Choose the picture you want, then click “Open”." msgid "Choose the picture you want, then click “Open”." msgstr "ඔබට අවශ්‍ය පින්තූරය තොරන්න, ඉන්පසු විවෘත කිරීම මත මූසික ක්ලිකය කරන්න." -#. 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 +#. 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 "" -#: ../tuxpaint.c:23539 +#: ../tuxpaint.c:23539 msgid "Select a color from your drawing." msgstr "" -#: ../tuxpaint.c:23551 +#: ../tuxpaint.c:23551 msgid "Pick a color." msgstr "පාටක් තෝරන්න." -#: ../tuxpaint.desktop.in.h:1 +#: ../tuxpaint.desktop.in.h:1 msgid "Tux Paint" msgstr "Tux Paint" -#: ../tuxpaint.desktop.in.h:2 +#: ../tuxpaint.desktop.in.h:2 msgid "Drawing program" msgstr "ඇඳීමේ වැඩසටහන" -#: ../tuxpaint.desktop.in.h:3 +#: ../tuxpaint.desktop.in.h:3 msgid "A drawing program for children." msgstr "ළමයින් සඳහා ඇඳීමේ වැඩසටහන." -#: ../../magic/src/alien.c:68 +#: ../../magic/src/alien.c:68 msgid "Color Shift" msgstr "පාට මාරු කරන්න" -#: ../../magic/src/alien.c:72 +#: ../../magic/src/alien.c:72 #, 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." msgstr "ඔබේ පින්තූරයේ කොටස් වල පාට මාරු කිරීමට මූසික ක්ලිකය කර චලනය කරන්න." -#: ../../magic/src/alien.c:73 +#: ../../magic/src/alien.c:73 msgid "Click to change the colors in your entire picture." msgstr "මුලු පින්තූරයේ පාට මාරු කිරීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/blind.c:116 +#: ../../magic/src/blind.c:116 msgid "Blind" msgstr "වැස්ම" -#: ../../magic/src/blind.c:123 +#: ../../magic/src/blind.c:123 msgid "" "Click towards the edge of your picture to pull window blinds over it. Move " "perpendicularly to open or close the blinds." @@ -869,25 +869,25 @@ msgstr "" "පින්තූරයේ මායිම දක්වා ජනේලයේ වැස්ම වැටීමට සලස්වන්න.වැස්ම ඇරීමට හෝ වැසීමට ලම්භකව එහා මෙහා " "ගෙන යන්න." -#: ../../magic/src/blocks_chalk_drip.c:129 +#: ../../magic/src/blocks_chalk_drip.c:129 msgid "Blocks" msgstr "අච්චු" -#: ../../magic/src/blocks_chalk_drip.c:131 +#: ../../magic/src/blocks_chalk_drip.c:131 msgid "Chalk" msgstr "පාට කූරු" -#: ../../magic/src/blocks_chalk_drip.c:133 +#: ../../magic/src/blocks_chalk_drip.c:133 msgid "Drip" msgstr "ස්‍රාවය" -#: ../../magic/src/blocks_chalk_drip.c:142 +#: ../../magic/src/blocks_chalk_drip.c:142 #, fuzzy #| msgid "Click and move the mouse around to make the picture blocky." msgid "Click and drag the mouse around to make the picture blocky." msgstr "පින්තූරය ඒකඝන කිරීමට මවුසය ක්ලික් කර එහා මෙහා ගෙන යන්න." -#: ../../magic/src/blocks_chalk_drip.c:144 +#: ../../magic/src/blocks_chalk_drip.c:144 #, fuzzy #| msgid "" #| "Click and move the mouse around to turn the picture into a chalk drawing." @@ -895,218 +895,218 @@ msgid "" "Click and drag the mouse around to turn the picture into a chalk drawing." msgstr "පින්තූරය පාට කූරු මගින් ඇඳීම සඳහා මූසික ක්ලිකය කර එය චලනය කරන්න." -#: ../../magic/src/blocks_chalk_drip.c:146 +#: ../../magic/src/blocks_chalk_drip.c:146 #, 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." msgstr "පින්තූරයේ බින්දු වශයෙන් වැටීම පෙන්වීමට මවුසය ක්ලික් කර එහා මෙහා ගෙන යන්න." -#: ../../magic/src/blur.c:80 +#: ../../magic/src/blur.c:80 msgid "Blur" msgstr "බොඳ කරන්න" -#: ../../magic/src/blur.c:84 +#: ../../magic/src/blur.c:84 #, fuzzy #| msgid "Click and move the mouse around to blur the image." msgid "Click and drag the mouse around to blur the image." msgstr "පින්තූරය බොඳ කිරීමට මූසික ක්ලිකය කර එහා මෙහා චලනය කරන්න." -#: ../../magic/src/blur.c:85 +#: ../../magic/src/blur.c:85 msgid "Click to blur the entire image." msgstr "මුලු පින්තූරයම අඳුරු කිරීමට මූසික ක්ලිකය කරන්න." -#. Both are named "Bricks", at the moment: -#: ../../magic/src/bricks.c:120 +#. Both are named "Bricks", at the moment: +#: ../../magic/src/bricks.c:120 msgid "Bricks" msgstr "ගඩොල්" -#: ../../magic/src/bricks.c:127 +#: ../../magic/src/bricks.c:127 #, fuzzy #| msgid "Click and move to draw large bricks." msgid "Click and drag to draw large bricks." msgstr "විශාල ගඩොල් ඇඳීමට මූසික ක්ලිකය කර චලනය කරන්න." -#: ../../magic/src/bricks.c:129 +#: ../../magic/src/bricks.c:129 #, fuzzy #| msgid "Click and move to draw small bricks." msgid "Click and drag to draw small bricks." msgstr "කුඩා ගඩොල් ඇඳීමට මූසික ක්ලිකය කර චලනය කරන්න." -#: ../../magic/src/calligraphy.c:124 +#: ../../magic/src/calligraphy.c:124 msgid "Calligraphy" msgstr "විචිත්‍ර අක්ෂර කලාව" -#: ../../magic/src/calligraphy.c:131 +#: ../../magic/src/calligraphy.c:131 #, fuzzy #| msgid "Click and move the mouse around to draw in calligraphy." msgid "Click and drag the mouse around to draw in calligraphy." msgstr "විචිත්‍ර අක්ෂර කලාවෙන් ඇඳීමට මූසික ක්ලිකය කර එහා මෙහා චලනය කරන්න." -#: ../../magic/src/cartoon.c:103 +#: ../../magic/src/cartoon.c:103 msgid "Cartoon" msgstr "කාටූනය" -#: ../../magic/src/cartoon.c:109 +#: ../../magic/src/cartoon.c:109 #, fuzzy #| msgid "Click and move the mouse around to turn the picture into a cartoon." msgid "Click and drag the mouse around to turn the picture into a cartoon." msgstr "පින්තූරය කාටූනයක් බවට පත්කිරීමට මූසික ක්ලිකය කර එහා මෙහා චලනය කරන්න." -#: ../../magic/src/confetti.c:83 +#: ../../magic/src/confetti.c:83 msgid "Confetti" msgstr "මංගල මල්පෙති" -#: ../../magic/src/confetti.c:88 +#: ../../magic/src/confetti.c:88 msgid "Click to throw confetti!" msgstr "මංගල මල්පෙති විසි කිරීමට මූසික ක්ලිකය කරන්න!" -#: ../../magic/src/distortion.c:134 +#: ../../magic/src/distortion.c:134 msgid "Distortion" msgstr "විකෘතිය" -#: ../../magic/src/distortion.c:143 +#: ../../magic/src/distortion.c:143 msgid "Click and drag the mouse to cause distortion in your picture." msgstr "ඔබේ පින්තූරයේ විකෘතියක් ඇතිකිරීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/emboss.c:101 +#: ../../magic/src/emboss.c:101 msgid "Emboss" msgstr "කැටයම් මතුකර පෙන්වීම" -#: ../../magic/src/emboss.c:107 +#: ../../magic/src/emboss.c:107 msgid "Click and drag the mouse to emboss the picture." msgstr "පින්තූරය කැටයම් ලෙස මතුකර පෙන්වීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/fade_darken.c:114 +#: ../../magic/src/fade_darken.c:114 msgid "Lighten" msgstr "එළිය කරන්න" -#: ../../magic/src/fade_darken.c:116 +#: ../../magic/src/fade_darken.c:116 msgid "Darken" msgstr "අඳුරු කරන්න" -#: ../../magic/src/fade_darken.c:127 +#: ../../magic/src/fade_darken.c:127 #, 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." msgstr "ඔබේ පින්තූරයේ කොටස් එළිය කිරීමට මූසික ක්ලිකය කර චලනය කරන්න." -#: ../../magic/src/fade_darken.c:129 +#: ../../magic/src/fade_darken.c:129 msgid "Click to lighten your entire picture." msgstr "ඔබේ පින්තූරයම එළිය කිරීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/fade_darken.c:134 +#: ../../magic/src/fade_darken.c:134 #, 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." msgstr "ඔබේ පින්තූරයේ කොටස් අඳුරු කිරීමට මූසික ක්ලිකය කර චලනය කරන්න." -#: ../../magic/src/fade_darken.c:136 +#: ../../magic/src/fade_darken.c:136 msgid "Click to darken your entire picture." msgstr "ඔබේ පින්තූරයම අඳුරු කිරීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/fisheye.c:101 +#: ../../magic/src/fisheye.c:101 msgid "Fisheye" msgstr "මාලු ඇස" -#: ../../magic/src/fisheye.c:106 +#: ../../magic/src/fisheye.c:106 msgid "Click on part of your picture to create a fisheye effect." msgstr "මාලු ඇස බලපෑම ඇති කිරීමට ඔබගේ පින්තූරයේ කොටස් මත මූසික ක්ලිකය කරන්න." -#: ../../magic/src/flower.c:144 +#: ../../magic/src/flower.c:144 msgid "Flower" msgstr "මල" -#: ../../magic/src/flower.c:150 +#: ../../magic/src/flower.c:150 msgid "Click and drag to draw a flower stalk. Let go to finish the flower." msgstr "මල් නටුව ඇඳීමට මූසික ක්ලිකය කර අදින්න. මල සම්පූර්ණ වීමට ඉඩහරින්න." -#: ../../magic/src/foam.c:114 +#: ../../magic/src/foam.c:114 msgid "Foam" msgstr "පෙණ" -#: ../../magic/src/foam.c:120 +#: ../../magic/src/foam.c:120 msgid "Click and drag the mouse to cover an area with foamy bubbles." msgstr "පෙණ සහිත බුබුළු මගින් ප්‍රදේශය ආවරණය කිරීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/fold.c:103 +#: ../../magic/src/fold.c:103 msgid "Fold" msgstr "නැම්ම" -#: ../../magic/src/fold.c:108 +#: ../../magic/src/fold.c:108 msgid "" "Choose a background color and click to turn the corner of the page over." msgstr "පිටුවේ කොන හැරවීමට ක්ලික් කර පසුබිම් වර්ණයක් තෝරාගන්න." -#: ../../magic/src/fretwork.c:176 +#: ../../magic/src/fretwork.c:176 msgid "Fretwork" msgstr "කැටයම්" -#: ../../magic/src/fretwork.c:182 +#: ../../magic/src/fretwork.c:182 #, fuzzy #| msgid "Click and drag to draw string art aligned to the edges." msgid "Click and drag to draw repetitive patterns. " msgstr "මායිම් සඳහා මෝස්තරයක් එක් කිරීමට ක්ලික් කර ඇද ගෙන යන්න." -#: ../../magic/src/fretwork.c:184 +#: ../../magic/src/fretwork.c:184 #, fuzzy #| msgid "Click to cover your picture with rain drops." msgid "Click to surround your picture with repetitive patterns." msgstr "ඔබගේ පින්තූරය වැසි බින්දු මගින් ආවරනය කිරීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/glasstile.c:104 +#: ../../magic/src/glasstile.c:104 msgid "Glass Tile" msgstr "වීදුරු ගඩොළු" -#: ../../magic/src/glasstile.c:111 +#: ../../magic/src/glasstile.c:111 msgid "Click and drag the mouse to put glass tile over your picture." msgstr "ඔබගේ පින්තූරය පුරාවට වීදුරු ගඩොළු යෙදීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/glasstile.c:113 +#: ../../magic/src/glasstile.c:113 msgid "Click to cover your entire picture in glass tiles." msgstr "ඔබගේ පින්තූරය වීදුරු ගඩොළු වලින් ආවරණය කිරීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/grass.c:107 +#: ../../magic/src/grass.c:107 msgid "Grass" msgstr "තණකොළ" -#: ../../magic/src/grass.c:113 +#: ../../magic/src/grass.c:113 #, fuzzy #| msgid "Click and move to draw grass. Don’t forget the dirt!" msgid "Click and drag to draw grass. Don’t forget the dirt!" msgstr "තණකොළ ඇඳීමට මූසික ක්ලිකය කර චලනය කරන්න. Don’t forget the dirt!" -#: ../../magic/src/halftone.c:35 +#: ../../magic/src/halftone.c:35 msgid "Halftone" msgstr "" -#: ../../magic/src/halftone.c:39 +#: ../../magic/src/halftone.c:39 #, fuzzy #| msgid "Click to turn your painting into its negative." msgid "Click and drag to turn your drawing into a newspaper." msgstr "ඔබගේ පින්තූරය අනුඡායාවක් බවට හැරවීමට මූසික ක්ලිකය කරන්න." -#: ../../magic/src/kalidescope.c:119 +#: ../../magic/src/kalidescope.c:119 msgid "Symmetric Left/Right" msgstr "සමමිතික වම/දකුණ" -#: ../../magic/src/kalidescope.c:123 +#: ../../magic/src/kalidescope.c:123 msgid "Symmetric Up/Down" msgstr "සමමිතික ඉහළ පහළ" -#: ../../magic/src/kalidescope.c:127 +#: ../../magic/src/kalidescope.c:127 msgid "Pattern" msgstr "රටාව" -#: ../../magic/src/kalidescope.c:131 +#: ../../magic/src/kalidescope.c:131 msgid "Tiles" msgstr "ගඩොළු" -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:135 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:135 msgid "Kaleidoscope" msgstr "බහුරූපේක්ෂය" -#: ../../magic/src/kalidescope.c:146 +#: ../../magic/src/kalidescope.c:146 #, fuzzy #| msgid "" #| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." @@ -1115,7 +1115,7 @@ msgid "" "the left and right of your picture." msgstr "සමමිතික බුරුසු ( බහුරූපේක්ෂය ) මගින් ඇඳීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/kalidescope.c:152 +#: ../../magic/src/kalidescope.c:152 #, fuzzy #| msgid "" #| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." @@ -1124,13 +1124,13 @@ msgid "" "the top and bottom of your picture." msgstr "සමමිතික බුරුසු ( බහුරූපේක්ෂය ) මගින් ඇඳීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/kalidescope.c:156 +#: ../../magic/src/kalidescope.c:156 #, fuzzy #| msgid "Click and drag the mouse to emboss the picture." msgid "Click and drag the mouse to draw a pattern across the picture." msgstr "පින්තූරය කැටයම් ලෙස මතුකර පෙන්වීමට මූසික ක්ලිකය කර අදින්න." -#: ../../magic/src/kalidescope.c:160 +#: ../../magic/src/kalidescope.c:160 #, fuzzy #| msgid "" #| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." @@ -1139,49 +1139,49 @@ msgid "" "picture." msgstr "මුසිකය තද කරමින් ඇදගෙන යාමෙන් සමමිතික බුරුසු ඇදිම(කෙලිය්දොස්කප්) ." -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:164 +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:164 msgid "" "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." msgstr "මුසිකය තද කරමින් ඇදගෙන යාමෙන් සමමිතික බුරුසු ඇදිම(කෙලිය්දොස්කප්). " -#: ../../magic/src/light.c:103 +#: ../../magic/src/light.c:103 msgid "Light" msgstr "ආලෝකය" -#: ../../magic/src/light.c:109 +#: ../../magic/src/light.c:109 msgid "Click and drag to draw a beam of light on your picture." msgstr "ඔබේ පින්තුරයේ ප්‍රකාශ ආලෝක දණ්ඩක් ඇදිමට තද කරගෙන එහා මෙහා ගෙනයන්න." -#: ../../magic/src/metalpaint.c:98 +#: ../../magic/src/metalpaint.c:98 msgid "Metal Paint" msgstr "ලෝහ පාට" -#: ../../magic/src/metalpaint.c:105 +#: ../../magic/src/metalpaint.c:105 msgid "Click and drag the mouse to paint with a metallic color." msgstr "චිත්‍රය ලෝහමය වර්ණ ගැන්වීමට මුසිකය තද කරගෙන එහා මෙහා ගෙන යන්න." -#: ../../magic/src/mirror_flip.c:110 +#: ../../magic/src/mirror_flip.c:110 msgid "Mirror" msgstr "කඩපත" -#: ../../magic/src/mirror_flip.c:112 +#: ../../magic/src/mirror_flip.c:112 msgid "Flip" msgstr "විසි කිරීම" -#: ../../magic/src/mirror_flip.c:121 +#: ../../magic/src/mirror_flip.c:121 msgid "Click to make a mirror image." msgstr "කැඩපත් දර්ශනයක් ලබාගැනීමට තද කරන්න." -#: ../../magic/src/mirror_flip.c:123 +#: ../../magic/src/mirror_flip.c:123 msgid "Click to flip the picture upside-down." msgstr "පින්තුරය ඉහල-පහල විසි කිරීමට තද කරන්න." -#: ../../magic/src/mosaic.c:96 +#: ../../magic/src/mosaic.c:96 msgid "Mosaic" msgstr "විචිත්‍ර හැඩතල" -#: ../../magic/src/mosaic.c:100 +#: ../../magic/src/mosaic.c:100 #, fuzzy #| msgid "" #| "Click and move the mouse to add a mosaic effect to parts of your picture." @@ -1189,23 +1189,23 @@ msgid "" "Click and drag the mouse to add a mosaic effect to parts of your picture." msgstr "ඔබගේ පින්තුරයේ කොටසකට විචිත්‍ර පෙනුමක් එක්කිරීමට මුසිකය තද කරගෙන එහම මෙහා ගෙනයන්න." -#: ../../magic/src/mosaic.c:101 +#: ../../magic/src/mosaic.c:101 msgid "Click to add a mosaic effect to your entire picture." msgstr "ඔබගේ සම්පුර්ණ පින්තුරයට විචිත්‍ර පෙනුමක් එකතු කිරීමට තද කරන්න." -#: ../../magic/src/mosaic_shaped.c:132 +#: ../../magic/src/mosaic_shaped.c:132 msgid "Square Mosaic" msgstr "හතරැස් හැඩ" -#: ../../magic/src/mosaic_shaped.c:133 +#: ../../magic/src/mosaic_shaped.c:133 msgid "Hexagon Mosaic" msgstr "සයකොන් හැඩ" -#: ../../magic/src/mosaic_shaped.c:134 +#: ../../magic/src/mosaic_shaped.c:134 msgid "Irregular Mosaic" msgstr "අවිදිමත් හැඩ" -#: ../../magic/src/mosaic_shaped.c:140 +#: ../../magic/src/mosaic_shaped.c:140 #, fuzzy #| msgid "" #| "Click and move the mouse to add a square mosaic to parts of your picture." @@ -1214,11 +1214,11 @@ msgid "" msgstr "" "ඔබගේ පින්තුරයේ කොටසක විචිත්‍ර හතරැස් හැඩයක් එකතු කිරීමය තද කරගෙන මුසිකය එහා මෙහා ගෙන යන්න." -#: ../../magic/src/mosaic_shaped.c:141 +#: ../../magic/src/mosaic_shaped.c:141 msgid "Click to add a square mosaic to your entire picture." msgstr "ඔබගේ මුලු පින්තුරයට විචිත්‍ර හතරැස් හැඩයක් එකතු කිරීමට තද කරන්න." -#: ../../magic/src/mosaic_shaped.c:145 +#: ../../magic/src/mosaic_shaped.c:145 #, fuzzy #| msgid "" #| "Click and move the mouse to add a hexagonal mosaic to parts of your " @@ -1227,11 +1227,11 @@ msgid "" "Click and drag the mouse to add a hexagonal mosaic to parts of your picture." msgstr "ඔබගේ පින්තුරයේ කොටසක මුලු හයක් විචිත්‍ර කිරීමට තද කරමින් එහා මෙහා ගෙනයන්න." -#: ../../magic/src/mosaic_shaped.c:146 +#: ../../magic/src/mosaic_shaped.c:146 msgid "Click to add a hexagonal mosaic to your entire picture." msgstr "විචිත්‍ර මුලු හයක් ලබාගැනීමට තද කරන්න." -#: ../../magic/src/mosaic_shaped.c:150 +#: ../../magic/src/mosaic_shaped.c:150 #, fuzzy #| msgid "" #| "Click and move the mouse to add an irregular mosaic to parts of your " @@ -1240,234 +1240,234 @@ msgid "" "Click and drag the mouse to add an irregular mosaic to parts of your picture." msgstr "ඔබේ පින්තුරයේ කොටසක් අවිදිමත් විදියට දැක්වීමට තද කරමින් එහා මෙහා ගෙන යන්න." -#: ../../magic/src/mosaic_shaped.c:151 +#: ../../magic/src/mosaic_shaped.c:151 msgid "Click to add an irregular mosaic to your entire picture." msgstr "ඔබගේ මුලු පින්තුරයම අවිදිමත් විදියට දැක්වීමට තද කරන්න." -#: ../../magic/src/negative.c:94 +#: ../../magic/src/negative.c:94 msgid "Negative" msgstr "ජායාරුප පිටපත" -#: ../../magic/src/negative.c:101 +#: ../../magic/src/negative.c:101 #, fuzzy #| msgid "Click and move the mouse around to make your painting negative." msgid "Click and drag the mouse around to make your painting negative." msgstr "ඔබේ පින්තුරයේ කොටසක් ජායාරුපයක පිටපතක් ලෙස දැක්වීමට තද කරමින් එහා මෙහා ගෙන යන්න." -#: ../../magic/src/negative.c:103 +#: ../../magic/src/negative.c:103 msgid "Click to turn your painting into its negative." msgstr "ඔබේ පින්තුරය ජායාරුපයක පිටපතක් ලෙස දැක්වීමට තද කරන්න." -#: ../../magic/src/noise.c:66 +#: ../../magic/src/noise.c:66 msgid "Noise" msgstr "ශබ්දය" -#: ../../magic/src/noise.c:70 +#: ../../magic/src/noise.c:70 #, fuzzy #| msgid "Click and move the mouse to add noise to parts of your picture." msgid "Click and drag the mouse to add noise to parts of your picture." msgstr "ඔබේ පින්තුරයේ කොටසකට ශබ්දය එකතු කිරීමට එබීම සහ එහා මෙහා ගෙනයාම." -#: ../../magic/src/noise.c:71 +#: ../../magic/src/noise.c:71 msgid "Click to add noise to your entire picture." msgstr "ඔබේ පින්තුරය ශබ්දය එකතු කිරීමට තද කරන්න." -#: ../../magic/src/perspective.c:147 +#: ../../magic/src/perspective.c:147 msgid "Perspective" msgstr "පෙනෙන දර්ශනය" -#: ../../magic/src/perspective.c:148 +#: ../../magic/src/perspective.c:148 msgid "Zoom" msgstr "විශාල හෝ කුඩා කිරීම" -#: ../../magic/src/perspective.c:153 +#: ../../magic/src/perspective.c:153 msgid "Click on the corners and drag where you want to stretch the picture." msgstr "පින්තුරය දික් කිරීමට මායිම් මත තද කිරීමෙන් සහ ඇදගෙන යාමෙන් කල හැක." -#: ../../magic/src/perspective.c:156 +#: ../../magic/src/perspective.c:156 msgid "Click and drag up to zoom in or drag down to zoom out the picture." msgstr "ඉහලට ඇදගෙන යාමෙන් පින්තුරය විශාල කිරීම හෝ පහලට ඇදගෙන යාමෙන් පින්තුරය කුඩා කිරීම." -#: ../../magic/src/puzzle.c:103 +#: ../../magic/src/puzzle.c:103 msgid "Puzzle" msgstr "ප්‍රහේලිකාව" -#: ../../magic/src/puzzle.c:110 +#: ../../magic/src/puzzle.c:110 msgid "Click the part of your picture where would you like a puzzle." msgstr "ඔබේ පින්තුරයේ කොටසක ප්‍රහේලිකාව ඇතුලත් විය යුතු ස්ථානයේ තද කරන්න." -#: ../../magic/src/puzzle.c:111 +#: ../../magic/src/puzzle.c:111 msgid "Click to make a puzzle in fullscreen mode." msgstr "ප්‍රහේලිකාව සම්පුර්ණ තිරයේ පෙනීමට තද කරන්න." -#: ../../magic/src/rails.c:129 +#: ../../magic/src/rails.c:129 msgid "Rails" msgstr "රේල් පීලි" -#: ../../magic/src/rails.c:134 +#: ../../magic/src/rails.c:134 msgid "Click and drag to draw train track rails on your picture." msgstr "එබීමෙන් සහ ඇදගෙන යාමෙන් ඔබේ පින්තුරයට රේල් පිලි පාරක් ඇදිය හැක." -#: ../../magic/src/rainbow.c:133 +#: ../../magic/src/rainbow.c:133 msgid "Rainbow" msgstr "දේදුන්න" -#: ../../magic/src/rainbow.c:139 +#: ../../magic/src/rainbow.c:139 msgid "You can draw in rainbow colors!" msgstr "ඔබට දැන් දේදුන්නේ පාටවලින් ඇදිය හැක!" -#: ../../magic/src/rain.c:68 +#: ../../magic/src/rain.c:68 msgid "Rain" msgstr "වැස්ස" -#: ../../magic/src/rain.c:72 +#: ../../magic/src/rain.c:72 msgid "Click to place a rain drop onto your picture." msgstr "ඔබගේ පින්තුරයේ වැහි බින්දු එකතු කලයුතු ස්ථානය මත තද කරන්න." -#: ../../magic/src/rain.c:73 +#: ../../magic/src/rain.c:73 msgid "Click to cover your picture with rain drops." msgstr "ඔබගේ පින්තුරය වැහි බින්දු වලින් ආවරණය කිරීමට තද කරන්න." -#: ../../magic/src/realrainbow.c:98 +#: ../../magic/src/realrainbow.c:98 msgid "Real Rainbow" msgstr "නියම දේදුන්න" -#: ../../magic/src/realrainbow.c:100 +#: ../../magic/src/realrainbow.c:100 msgid "ROYGBIV Rainbow" msgstr "රතුතැබිලිකහකොලනිල්ඉන්දිගෝදම් දේදුන්න" -#: ../../magic/src/realrainbow.c:108 +#: ../../magic/src/realrainbow.c:108 msgid "" "Click where you want your rainbow to start, drag to where you want it to " "end, and then let go to draw a rainbow." msgstr "" "දේදුන්න පටන් ගන්න ස්ථානය මත තද කරන්න, අවසාන වන ස්ථානයට ඇදගෙන යන්න, පසුව දේදුන්න අදින්න." -#: ../../magic/src/ripples.c:102 +#: ../../magic/src/ripples.c:102 msgid "Ripples" msgstr "කුඩා රැලි" -#: ../../magic/src/ripples.c:108 +#: ../../magic/src/ripples.c:108 msgid "Click to make ripples appear over your picture." msgstr "ඔබගේ පින්තුරයට කුඩා රැලි එකතු කිරීමට තද කරන්න." -#: ../../magic/src/rosette.c:115 +#: ../../magic/src/rosette.c:115 msgid "Rosette" msgstr "රෝස" -#: ../../magic/src/rosette.c:117 +#: ../../magic/src/rosette.c:117 msgid "Picasso" msgstr "පිකාසෝ" -#: ../../magic/src/rosette.c:123 +#: ../../magic/src/rosette.c:123 msgid "Click and start drawing your rosette." msgstr "රෝස ඇදීමට ආරම්භ කිරීමට තද කරන්න." -#: ../../magic/src/rosette.c:125 +#: ../../magic/src/rosette.c:125 msgid "You can draw just like Picasso!" msgstr "ඔබට පිකාසෝ වගේ ඇදිය හැක." -#: ../../magic/src/sharpen.c:76 +#: ../../magic/src/sharpen.c:76 msgid "Edges" msgstr "මායිම්" -#: ../../magic/src/sharpen.c:77 +#: ../../magic/src/sharpen.c:77 msgid "Sharpen" msgstr "මුවහත" -#: ../../magic/src/sharpen.c:78 +#: ../../magic/src/sharpen.c:78 msgid "Silhouette" msgstr "සේයාව" -#: ../../magic/src/sharpen.c:82 +#: ../../magic/src/sharpen.c:82 #, fuzzy #| msgid "Click and move the mouse to trace edges in parts of your picture." msgid "Click and drag the mouse to trace edges in parts of your picture." msgstr "මුසිකය තද කිරීමෙන් සහ එහා මෙහා ගෙනයාමෙන් පින්තුරයේ කොටසක මායිම ලකුණු කර හැක." -#: ../../magic/src/sharpen.c:83 +#: ../../magic/src/sharpen.c:83 msgid "Click to trace edges in your entire picture." msgstr "මුලු පින්තුරයේම මායිම ලකුණු කර ගැනීමට තද කරන්න." -#: ../../magic/src/sharpen.c:84 +#: ../../magic/src/sharpen.c:84 #, fuzzy #| msgid "Click and move the mouse to sharpen parts of your picture." msgid "Click and drag the mouse to sharpen parts of your picture." msgstr "මුසිකය තද කිරීමෙන් සහ එහා මෙහා ගෙනයාමෙන් පින්තුරයේ කොටසක් මුවහත් කල හැක." -#: ../../magic/src/sharpen.c:85 +#: ../../magic/src/sharpen.c:85 msgid "Click to sharpen the entire picture." msgstr "මුලු පින්තුරයම මුවහත් කිරීමට තද කරන්න." -#: ../../magic/src/sharpen.c:86 +#: ../../magic/src/sharpen.c:86 #, fuzzy #| msgid "Click and move the mouse to create a black and white silhouette." msgid "Click and drag the mouse to create a black and white silhouette." msgstr "මුසිකය තද කිරීමෙන් සහ එහා මෙහා ගෙනයාමෙන් කළු සහ සුදු සේයාවක් නිර්මාණය වේ." -#: ../../magic/src/sharpen.c:87 +#: ../../magic/src/sharpen.c:87 msgid "Click to create a black and white silhouette of your entire picture." msgstr "තද කිරීමෙන් ඔබගේ පින්තුරයට කළු සහ සුදු සේයාවක් නිර්මාණය කර හැක." -#: ../../magic/src/shift.c:106 +#: ../../magic/src/shift.c:106 msgid "Shift" msgstr "මාරු කිරීම" -#: ../../magic/src/shift.c:112 +#: ../../magic/src/shift.c:112 msgid "Click and drag to shift your picture around on the canvas." msgstr "එබීමෙන් සහ ඇදගෙන යාමෙන් ඔබගේ පින්තුරය කැන්වස් ඒක තුල එහා මෙහා කල හැක." -#: ../../magic/src/smudge.c:102 +#: ../../magic/src/smudge.c:102 msgid "Smudge" msgstr "පැල්ලම" -#. if (which == 1) -#: ../../magic/src/smudge.c:104 +#. if (which == 1) +#: ../../magic/src/smudge.c:104 msgid "Wet Paint" msgstr "තෙත පාට" -#: ../../magic/src/smudge.c:111 +#: ../../magic/src/smudge.c:111 #, fuzzy #| msgid "Click and move the mouse around to smudge the picture." msgid "Click and drag the mouse around to smudge the picture." msgstr "මුසිකය තද කිරීමෙන් සහ එහා මෙහා ගෙනයාමෙන් පින්තුරයට පැල්ලම් එකතු කර හැක." -#. if (which == 1) -#: ../../magic/src/smudge.c:113 +#. if (which == 1) +#: ../../magic/src/smudge.c:113 #, fuzzy #| msgid "Click and move the mouse around to draw with wet, smudgy paint." msgid "Click and drag the mouse around to draw with wet, smudgy paint." msgstr "තෙත, පැල්ලම් පින්තුරයට එකතු කිරීමට මුසිකය තද කිරීමෙන් සහ එහා මෙහා ගෙනයාමෙන් කල හැක." -#: ../../magic/src/snow.c:71 +#: ../../magic/src/snow.c:71 msgid "Snow Ball" msgstr "හිම බෝල" -#: ../../magic/src/snow.c:72 +#: ../../magic/src/snow.c:72 msgid "Snow Flake" msgstr "හිම පතුරු" -#: ../../magic/src/snow.c:76 +#: ../../magic/src/snow.c:76 msgid "Click to add snow balls to your picture." msgstr "හිම බෝල ඔබගේ පින්තුරයට එකතු කිරීමට තද කරන්න." -#: ../../magic/src/snow.c:77 +#: ../../magic/src/snow.c:77 msgid "Click to add snow flakes to your picture." msgstr "හිම පතුරු ඔබගේ පින්තුරයට එකතු කිරීමට තද කරන්න." -#: ../../magic/src/string.c:129 +#: ../../magic/src/string.c:129 msgid "String edges" msgstr "අකුරු ගැට්ට" -#: ../../magic/src/string.c:132 +#: ../../magic/src/string.c:132 msgid "String corner" msgstr "අකුරු මුල්ල" -#: ../../magic/src/string.c:135 +#: ../../magic/src/string.c:135 msgid "String 'V'" msgstr "අකුරු 'වී'" -#: ../../magic/src/string.c:147 +#: ../../magic/src/string.c:147 msgid "" "Click and drag to draw string art. Drag top-bottom to draw less or more " "lines, left or right to make a bigger hole." @@ -1475,23 +1475,23 @@ msgstr "" "එබීමෙන් සහ ඇදගෙන යාමෙන් අකුරු ඇදිය හැක. ඉහල-පහල ඇදගෙන යාමෙන් ඇදිය හැකිය අඩු හෝ වැඩි " "පේලි, දකුණට හෝ වමට ගෙනයාමෙන් විශාල හිලක් ඇදේ." -#: ../../magic/src/string.c:150 +#: ../../magic/src/string.c:150 msgid "Click and drag to draw arrows made of string art." msgstr "එබීමෙන් සහ ඇදගෙන යාමෙන් අකුරු වල ඉරි ඇදිය හැක." -#: ../../magic/src/string.c:153 +#: ../../magic/src/string.c:153 msgid "Draw string art arrows with free angles." msgstr "අකුරු නිදහස් ආකාරයෙන් ඇදීම." -#: ../../magic/src/tint.c:74 +#: ../../magic/src/tint.c:74 msgid "Tint" msgstr "අඩු වර්ණ" -#: ../../magic/src/tint.c:75 +#: ../../magic/src/tint.c:75 msgid "Color & White" msgstr "වර්ණ & සුදු" -#: ../../magic/src/tint.c:79 +#: ../../magic/src/tint.c:79 #, fuzzy #| msgid "" #| "Click and move the mouse around to change the color of parts of your " @@ -1500,11 +1500,11 @@ msgid "" "Click and drag the mouse around to change the color of parts of your picture." msgstr "එබීමෙන් සහ එහා මෙහා මුසිකය ගෙනයාමෙන් කොටසක් වර්ණ ගැන්විය හැක ඔබේ පින්තුරයේ." -#: ../../magic/src/tint.c:80 +#: ../../magic/src/tint.c:80 msgid "Click to change the color of your entire picture." msgstr "සම්පුර්ණ පින්තුරයේ වර්ණය වෙනස් කිරීමට තද කරන්න." -#: ../../magic/src/tint.c:81 +#: ../../magic/src/tint.c:81 #, fuzzy #| msgid "" #| "Click and move the mouse around to turn parts of your picture into white " @@ -1516,49 +1516,49 @@ msgstr "" "එබීමෙන් සහ එහා මෙහා මුසිකය ගෙනයාමෙන් ඔබේ පින්තුරය කොටසක් සුදු සහ ඔබ තෝරාගත් වර්ණය ගැන්විය " "හැක." -#: ../../magic/src/tint.c:82 +#: ../../magic/src/tint.c:82 msgid "Click to turn your entire picture into white and a color you choose." msgstr "එබීමෙන් ඔබගේ පින්තුරය සුදු සහ ඔබ තෝරා ගත් වර්ණ ගැන්විය හැක." -#: ../../magic/src/toothpaste.c:68 +#: ../../magic/src/toothpaste.c:68 msgid "Toothpaste" msgstr "දන්තාලේප" -#: ../../magic/src/toothpaste.c:72 +#: ../../magic/src/toothpaste.c:72 msgid "Click and drag to squirt toothpaste onto your picture." msgstr "තද කිරීමෙන් සහ ඇදගෙන යාමෙන් බොරු දන්තාලේප පාටක් ඔබගේ පින්තුරයට එකතු කර හැක." -#: ../../magic/src/tornado.c:153 +#: ../../magic/src/tornado.c:153 msgid "Tornado" msgstr "ටොනාඩෝ" -#: ../../magic/src/tornado.c:159 +#: ../../magic/src/tornado.c:159 msgid "Click and drag to draw a tornado funnel on your picture." msgstr "ඔබගේ පින්තුරයට ටොනාඩෝ දුමක් එකතු කිරීමට ඔබන්න." -#: ../../magic/src/tv.c:96 +#: ../../magic/src/tv.c:96 msgid "TV" msgstr "ටීවී" -#: ../../magic/src/tv.c:102 +#: ../../magic/src/tv.c:102 msgid "" "Click and drag to make parts of your picture look like they are on " "television." msgstr "එබීමෙන් ඔබගේ පින්තුරයේ කොටසක් පෙනෙන ආකාරයරුපවහිනයේ." -#: ../../magic/src/tv.c:105 +#: ../../magic/src/tv.c:105 msgid "Click to make your picture look like it's on television." msgstr "රුපවාහිනියේ ඔබගේ පින්තුරය පෙනෙන ආකාරය ලබාගැනීමට තද කරන්න." -#: ../../magic/src/waves.c:104 +#: ../../magic/src/waves.c:104 msgid "Waves" msgstr "රැලි" -#: ../../magic/src/waves.c:106 +#: ../../magic/src/waves.c:106 msgid "Wavelets" msgstr "කුඩා දිය රැලි" -#: ../../magic/src/waves.c:115 +#: ../../magic/src/waves.c:115 msgid "" "Click to make the picture horizontally wavy. Click toward the top for " "shorter waves, the bottom for taller waves, the left for small waves, and " @@ -1567,7 +1567,7 @@ msgstr "" "එබීමෙන් පින්තුරයේ තිරස් අතට රැලි එක්කර හැක.තව දුරට තද කිරීමෙන් කෙටි රැලි, උස රැලි, කුඩා රැලි " "වමට, සහ දකුණට විශාල රැලි." -#: ../../magic/src/waves.c:118 +#: ../../magic/src/waves.c:118 msgid "" "Click to make the picture vertically wavy. Click toward the top for shorter " "waves, the bottom for taller waves, the left for small waves, and the right " @@ -1576,19 +1576,19 @@ msgstr "" "එබීමෙන් පින්තුරයේ සිරස් අතට රැලි එක්කර හැක.තව දුරට තද කිරීමෙන් කෙටි රැලි, උස රැලි, කුඩා රැලි " "වමට, සහ දකුණට විශාල රැලි." -#: ../../magic/src/xor.c:93 +#: ../../magic/src/xor.c:93 #, fuzzy #| msgid "Colors" msgid "Xor Colors" msgstr "වර්ණ" -#: ../../magic/src/xor.c:99 +#: ../../magic/src/xor.c:99 #, fuzzy #| msgid "Click and drag to draw arrows made of string art." msgid "Click and drag to draw a XOR effect" msgstr "තද කිරීමෙන් සහ ඇගෙනයාමෙන් අකුරු හැඩ ලබාගත හැක." -#: ../../magic/src/xor.c:101 +#: ../../magic/src/xor.c:101 #, fuzzy #| msgid "Click to add a mosaic effect to your entire picture." msgid "Click to draw a XOR effect on the whole picture" diff --git a/src/po/tuxpaint.pot b/src/po/tuxpaint.pot index 0f5ef5502..99a9bc10e 100644 --- a/src/po/tuxpaint.pot +++ b/src/po/tuxpaint.pot @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" @@ -107,19 +107,19 @@ msgstr "" #. they have both uppercase and lowercase letters. Note that we do not #. test for "Aa", because it is OK if uppercase and lowercase are the #. same (but not nice -- such fonts get a low score later). -#. +#. #. Most locales leave the blacklist strings alone: "QX" and "qx" #. (it is less destructive to use the scoring strings instead) -#. +#. #. Locales that absolutely require all fonts to have some #. extra characters should use "QX..." and "qx...", where "..." #. are some characters you absolutely require in all fonts. -#. +#. #. Locales with absolutely NO use for ASCII may use "..." and "...", #. where "..." are some characters you absolutely require in #. all fonts. This would be the case for a locale in which it is #. impossible for a user to type ASCII letters. -#. +#. #. Most translators should use scoring instead. #: ../dirwalk.c:177 msgid "qx" @@ -762,7 +762,7 @@ msgstr "" #. 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 "" From 55eb44df768bd7027539f14a28e9d20551a0c0dd Mon Sep 17 00:00:00 2001 From: prasantahembram Date: Sun, 25 Oct 2020 15:51:20 +0530 Subject: [PATCH 22/41] Fixed some spelling mistake in Santali Language Ol Chiki. Signed-off-by: prasantahembram --- src/po/sat@olchiki.po | 420 ++++++++++++++++-------------------------- 1 file changed, 158 insertions(+), 262 deletions(-) diff --git a/src/po/sat@olchiki.po b/src/po/sat@olchiki.po index 223a6451e..330093889 100644 --- a/src/po/sat@olchiki.po +++ b/src/po/sat@olchiki.po @@ -1,6 +1,5 @@ msgid "" -msgstr "" -"Project-Id-Version: Santali tux\n" +msgstr "Project-Id-Version: Santali tux\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-08-15 16:42-0700\n" "Language: en\n" @@ -17,12 +16,12 @@ msgstr "ᱦᱮᱸᱫᱮ!" #. Response to Dark grey (128, 128, 128) color selected #: ../colors.h:89 msgid "Dark grey! Some people spell it “dark gray”." -msgstr "ᱜᱟᱲᱦᱚ ᱡᱷᱤᱸᱜᱟ! ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱦᱚᱲ ᱱᱚᱣᱟ ᱠᱚ ᱵᱟᱱᱟᱱᱟ ᱟᱜᱟᱲᱦᱚ ᱡᱷᱤᱸᱜᱟᱟ." +msgstr "ᱜᱟᱲᱦᱚ ᱡᱷᱤᱸᱜᱟ! ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱦᱚᱲ ᱱᱚᱣᱟ ᱠᱚ ᱵᱟᱱᱟᱱᱟ ᱟᱜᱟᱲᱦᱚ ᱡᱷᱤᱸᱜᱟᱟ ᱾" #. Response to Light grey (192, 192, 192) color selected #: ../colors.h:92 msgid "Light grey! Some people spell it “light gray”." -msgstr "ᱮᱛᱟᱝ ᱡᱷᱤᱸᱜᱟ ᱨᱚᱝ! ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱦᱚᱲ ᱱᱚᱣᱟ ᱠᱚ ᱵᱟᱱᱟᱱᱟ ᱟᱮᱛᱟᱝ ᱡᱷᱤᱸᱜᱟ ᱨᱚᱝᱝ." +msgstr "ᱮᱛᱟᱝ ᱡᱷᱤᱸᱜᱟ ᱨᱚᱝ! ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱦᱚᱲ ᱱᱚᱣᱟ ᱠᱚ ᱵᱟᱱᱟᱱᱟ ᱟᱮᱛᱟᱝ ᱡᱷᱤᱸᱜᱟ ᱨᱚᱝᱝ ᱾" #. Response to White (255, 255, 255) color selected #: ../colors.h:95 @@ -115,11 +114,11 @@ msgstr "ᱢᱟᱹᱴᱤᱭᱟᱹᱲ ᱨᱚᱝ!" #. Most translators should use scoring instead. #: ../dirwalk.c:177 msgid "qx" -msgstr "qx" +msgstr "" #: ../dirwalk.c:177 msgid "QX" -msgstr "QX" +msgstr "" #. TODO: weight specification #. Now we score fonts to ensure that the best ones will be placed at @@ -129,12 +128,12 @@ msgstr "QX" #. distinct uppercase and lowercase (e.g., 'o' vs. 'O') #: ../dirwalk.c:202 msgid "oO" -msgstr "oO" +msgstr "" #. common punctuation (e.g., '?', '!', '.', ',', etc.) #: ../dirwalk.c:205 msgid ",.?!" -msgstr ",.?!" +msgstr "" #. uncommon punctuation (e.g., '@', '#', '*', etc.) #: ../dirwalk.c:208 @@ -144,17 +143,17 @@ msgstr "`\\%_@$~#{<(^&*" #. digits (e.g., '0', '1' and '7') #: ../dirwalk.c:211 msgid "017" -msgstr "017" +msgstr "" #. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) #: ../dirwalk.c:214 msgid "O0" -msgstr "O0" +msgstr "" #. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) #: ../dirwalk.c:217 msgid "1Il|" -msgstr "1Il|" +msgstr "" #: ../dirwalk.c:221 msgid "<1>spare-1a" @@ -220,7 +219,7 @@ msgstr "ᱛᱷᱟᱤ" #. Input Method: Traditional Chinese mode #: ../im.c:89 msgid "ZH_TW" -msgstr "ZH_TW" +msgstr "" #. Square shape tool (4 equally-lengthed sides at right angles) #: ../shapes.h:234 ../shapes.h:235 @@ -268,66 +267,60 @@ msgstr "ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱛ ᱛᱮᱭᱟᱨ ᱠᱷᱚ #: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 #: ../shapes.h:278 ../shapes.h:281 msgid "Star" -msgstr "ᱛᱟᱨᱟ" +msgstr "ᱤᱯᱤᱞ" #. Description of a square #: ../shapes.h:289 ../shapes.h:290 msgid "A square is a rectangle with four equal sides." -msgstr "ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱫᱚ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱥᱤᱨᱟᱹᱣᱟᱜ ᱟᱭᱟᱛ ᱠᱟᱱᱟ." +msgstr "ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱫᱚ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱥᱤᱨᱟᱹᱣᱟᱜ ᱟᱭᱟᱛ ᱠᱟᱱᱟ ᱾" #. Description of a rectangle #: ../shapes.h:293 ../shapes.h:294 msgid "A rectangle has four sides and four right angles." -msgstr "" -"ᱵᱟᱵᱟᱨ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱫ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱨᱮᱫᱚ ᱯᱩᱱ ᱫᱷᱟᱨᱮ ᱟᱨ ᱯᱩᱱᱭᱟ ᱡᱚᱡᱚᱢ ᱥᱮᱫᱟᱜ ᱠᱚᱸᱰ " -"ᱠᱚ ᱢᱮᱱᱟᱜ ᱟ." +msgstr "ᱵᱟᱵᱟᱨ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱫ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱨᱮᱫᱚ ᱯᱩᱱ ᱫᱷᱟᱨᱮ ᱟᱨ ᱯᱩᱱᱭᱟ ᱡᱚᱡᱚᱢ ᱥᱮᱫᱟᱜ ᱠᱚᱸᱰ ᱠᱚ ᱢᱮᱱᱟᱜ ᱟ ᱾" #. Description of a circle #: ../shapes.h:297 ../shapes.h:298 msgid "" "A circle is a curve where all points have the same distance from the center." -msgstr "" -"ᱜᱩᱞᱟᱸᱲ ᱫᱚ ᱢᱤᱫ ᱠᱚᱸᱲᱵᱮᱛ ᱠᱟᱱᱟ ᱚᱠᱟᱨᱮ ᱡᱚᱛᱚ ᱴᱩᱰᱟᱹᱜ ᱞᱟᱹᱜᱤᱫ ᱛᱟᱞᱟ ᱠᱷᱚᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ " -"ᱢᱮᱱᱟᱜ ᱟ." +msgstr "ᱜᱩᱞᱟᱸᱲ ᱫᱚ ᱢᱤᱫ ᱠᱚᱸᱲᱵᱮᱛ ᱠᱟᱱᱟ ᱚᱠᱟᱨᱮ ᱡᱚᱛᱚ ᱴᱩᱰᱟᱹᱜ ᱞᱟᱹᱜᱤᱫ ᱛᱟᱞᱟ ᱠᱷᱚᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱢᱮᱱᱟᱜ ᱟ ᱾" #. Description of an ellipse #: ../shapes.h:301 ../shapes.h:302 msgid "An ellipse is a stretched circle." -msgstr "ᱢᱟᱨᱟᱝ ᱜᱩᱞᱟᱸᱲ ᱛᱮᱭᱟᱨ ᱫᱚ ᱴᱟᱱᱟᱜᱟᱜ ᱜᱩᱞᱟᱸᱲ ᱠᱟᱱᱟ." +msgstr "ᱢᱟᱨᱟᱝ ᱜᱩᱞᱟᱸᱲ ᱛᱮᱭᱟᱨ ᱫᱚ ᱴᱟᱱᱟᱜᱟᱜ ᱜᱩᱞᱟᱸᱲ ᱠᱟᱱᱟ ᱾" #. Description of a triangle #: ../shapes.h:305 ../shapes.h:306 msgid "A triangle has three sides." -msgstr "ᱯᱮ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱛᱮᱭᱟᱨ ᱮᱥᱮᱛ ᱨᱮᱫᱚ ᱯᱮᱭᱟ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ." +msgstr "ᱯᱮ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱛᱮᱭᱟᱨ ᱮᱥᱮᱛ ᱨᱮᱫᱚ ᱯᱮᱭᱟ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ ᱾" #. Description of a pentagon #: ../shapes.h:309 ../shapes.h:310 msgid "A pentagon has five sides." -msgstr "ᱢᱚᱸᱲᱮ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱛᱮᱭᱟᱨ ᱮᱥᱮᱫ ᱨᱮᱫᱚ ᱢᱚᱲᱮ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ." +msgstr "ᱢᱚᱸᱲᱮ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱛᱮᱭᱟᱨ ᱮᱥᱮᱫ ᱨᱮᱫᱚ ᱢᱚᱲᱮ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ ᱾" #. Description of a rhombus #: ../shapes.h:313 ../shapes.h:314 msgid "A rhombus has four equal sides, and opposite sides are parallel." -msgstr "" -"ᱯᱩᱱ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨᱟᱜ ᱛᱩᱨᱩᱭ ᱯᱟᱴ ᱨᱮᱫᱚ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱫᱷᱟᱨᱮ, ᱟᱨ ᱩᱞᱴᱟ ᱫᱷᱟᱨᱮ ᱥᱮᱫ " -"ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱᱟ." +msgstr "ᱯᱩᱱ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨᱟᱜ ᱛᱩᱨᱩᱭ ᱯᱟᱴ ᱨᱮᱫᱚ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱫᱷᱟᱨᱮ, ᱟᱨ ᱩᱞᱴᱟ ᱫᱷᱟᱨᱮ ᱥᱮᱫ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱᱟ ᱾" #. Description of an octagon #: ../shapes.h:317 ../shapes.h:318 msgid "An octagon has eight equal sides." -msgstr "ᱤᱨᱟᱹᱞ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱨᱮᱫᱚ ᱤᱨᱟᱹᱞ ᱥᱚᱢᱟᱱ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ." +msgstr "ᱤᱨᱟᱹᱞ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱨᱮᱫᱚ ᱤᱨᱟᱹᱞ ᱥᱚᱢᱟᱱ ᱫᱷᱟᱨᱮ ᱢᱮᱱᱟᱜ ᱟ ᱾" #: ../shapes.h:320 ../shapes.h:321 msgid "A star with 3 points." -msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱛᱟᱨᱟ ᱥᱟᱞᱟᱜ ᱓ ᱯᱚᱮᱸᱴᱥ" +msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱤᱯᱤᱞ ᱥᱟᱞᱟᱜ ᱓ ᱴᱩᱰᱟᱹᱜ ᱠᱚ ᱾" #: ../shapes.h:322 ../shapes.h:323 msgid "A star with 4 points." -msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱛᱟᱨᱟ ᱥᱟᱞᱟᱜ ᱔ ᱯᱚᱮᱸᱴᱥ" +msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱤᱯᱤᱞ ᱥᱟᱞᱟᱜ ᱔ ᱴᱩᱰᱟᱹᱜ ᱠᱚ ᱾" #: ../shapes.h:324 ../shapes.h:325 msgid "A star with 5 points." -msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱛᱟᱨᱟ ᱥᱟᱞᱟᱜ ᱕ ᱯᱚᱮᱸᱴᱥ" +msgstr "ᱢᱤᱫᱴᱟᱹᱝ ᱤᱯᱤᱞ ᱥᱟᱞᱟᱜ ᱕ ᱴᱩᱰᱟᱹᱜ ᱠᱚ ᱾" #: ../shapes.h:372 msgid "Draw shapes from the center." @@ -427,19 +420,19 @@ msgstr "ᱵᱟᱹᱲᱤᱡᱟᱠ" #. Start a new picture #: ../tools.h:95 msgid "New" -msgstr "ᱱᱟᱣᱟᱱᱟᱠ" +msgstr "ᱱᱟᱶᱟ" #. 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 msgid "Open" -msgstr "ᱡᱷᱤᱪ" +msgstr "ᱨᱟᱲᱟ" #. Save the current picture #: ../tools.h:101 msgid "Save" -msgstr "ᱥᱟᱸᱪᱟᱣ" +msgstr "ᱥᱟᱸᱪᱚᱣ" #. Print the current picture #: ../tools.h:104 @@ -454,56 +447,42 @@ msgstr "ᱟᱲᱟᱜ ᱠᱟᱠ" #. Paint tool instructions #: ../tools.h:115 msgid "Pick a color and a brush shape to draw with." -msgstr "ᱨᱚᱝ ᱞᱟᱴᱟᱯ ᱢᱮ ᱟᱨ ᱚᱱᱟᱛᱮ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱡᱚᱛᱚᱜ ᱢᱮ." +msgstr "ᱨᱚᱝ ᱞᱟᱴᱟᱯ ᱢᱮ ᱟᱨ ᱚᱱᱟᱛᱮ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱡᱚᱛᱚᱜ ᱢᱮ ᱾" #. Stamp tool instructions #: ../tools.h:118 msgid "Pick a picture to stamp around your drawing." -msgstr "ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱮᱦᱟᱭ ᱛᱮ ᱪᱷᱟᱯ ᱞᱟᱹᱜᱤᱫ ᱢᱤᱫ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱴᱟᱯ ᱢᱮ." +msgstr " ᱾ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱮᱦᱟᱭ ᱛᱮ ᱪᱷᱟᱯ ᱞᱟᱹᱜᱤᱫ ᱢᱤᱫ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱴᱟᱯ ᱢᱮ ᱾" #. Line tool instructions #: ../tools.h:121 msgid "Click to start drawing a line. Let go to complete it." -msgstr "ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱜᱟᱨ ᱮᱦᱚᱵ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ. ᱪᱚᱞᱚ ᱱᱚᱣᱟ ᱯᱩᱨᱟᱹᱣ ᱞᱮᱜᱮ." +msgstr "ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱜᱟᱨ ᱮᱦᱚᱵ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ. ᱪᱚᱞᱚ ᱱᱚᱣᱟ ᱯᱩᱨᱟᱹᱣ ᱞᱮᱜᱮ ᱾" #: ../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 "" -"ᱢᱤᱫ ᱵᱮᱱᱟᱣ ᱞᱟᱴᱟᱯ ᱢᱮ. ᱛᱟᱞᱟ ᱛᱮᱫ ᱞᱟᱴᱟᱯ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ, ᱚᱨ ᱢᱮ, ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ ᱪᱟᱞᱟᱜ ᱟ " -"ᱛᱤᱱ ᱨᱮ ᱱᱚᱣᱟ ᱟᱢᱮᱢ ᱞᱟᱹᱠᱛᱤ ᱠᱟᱱ ᱢᱟᱨᱟᱝ ᱛᱮᱫ ᱛᱮᱭᱟᱨᱚᱜ ᱟ. ᱱᱚᱣᱟ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱵᱮ ᱦᱟᱭᱛᱮ " -"ᱞᱟᱲᱟᱣ ᱢᱮ, ᱟᱨ ᱱᱚᱣᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." #: ../tools.h:129 msgid "" "Choose a style of text. Click on your drawing and you can start typing. " "Press [Enter] or [Tab] to complete the text." -msgstr "" -"ᱚᱱᱚᱞ ᱨᱮᱭᱟᱜ ᱦᱩᱱᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ. ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱴᱟᱤᱯ ᱮᱢ ᱮᱦᱚᱵ " -"ᱫᱟᱲᱮᱭᱟᱜ ᱟ. ᱚᱱᱚᱞ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ [Enter] ᱟᱨ ᱵᱟᱝ [Tab] ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱚᱱᱚᱞ ᱨᱮᱭᱟᱜ ᱦᱩᱱᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ ᱾ ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱴᱟᱤᱯ ᱮᱢ ᱮᱦᱚᱵ ᱫᱟᱲᱮᱭᱟᱜ ᱟ ᱾ ᱚᱱᱚᱞ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ [Enter] ᱟᱨ ᱵᱟᱝ [Tab] ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../tools.h:133 -#, 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 existing label, you can move it, edit it and change its text " "style." -msgstr "" -"ᱚᱱᱚᱞ ᱨᱮᱭᱟᱜ ᱢᱤᱫ ᱦᱩᱱᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ. ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱴᱟᱤᱯ ᱮᱢ " -"ᱮᱦᱚᱵ ᱫᱟᱲᱮᱭᱟᱜ ᱟ. ᱚᱱᱚᱞ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ [Enter] ᱟᱨ ᱵᱟᱝ [Tab] ᱚᱛᱟᱭ ᱢᱮ. ᱵᱟᱪᱷᱟᱣᱟᱜ " -"ᱵᱩᱛᱟᱹᱢ ᱵᱮᱵᱚᱦᱟᱨᱟᱛᱮ ᱟᱨ ᱢᱮᱱᱟᱜ ᱪᱤᱠᱷᱱᱟ ᱚᱛᱟᱣᱟᱛᱮ, ᱟᱢ ᱱᱚᱣᱟᱢ ᱞᱟᱲᱟᱣ ᱫᱟᱲᱮᱭᱟᱜ ᱟ, ᱱᱚᱣᱟ " -"ᱥᱟᱥᱟᱯᱲᱟᱣ ᱢᱮ ᱟᱨ ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱚᱱᱚᱞ ᱦᱩᱱᱟᱹᱨ ᱵᱚᱫᱚᱞ ᱢᱮ." +msgstr "ᱚᱱᱚᱞ ᱨᱮᱭᱟᱜ ᱢᱤᱫ ᱦᱩᱱᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ ᱾ ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱴᱟᱤᱯ ᱮᱢ ᱮᱦᱚᱵ ᱫᱟᱲᱮᱭᱟᱜ ᱟ. ᱚᱱᱚᱞ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ [Enter] ᱟᱨ ᱵᱟᱝ [Tab] ᱚᱛᱟᱭ ᱢᱮ ᱾ ᱵᱟᱪᱷᱟᱣᱟᱜ ᱵᱩᱛᱟᱹᱢ ᱵᱮᱵᱚᱦᱟᱨᱟᱛᱮ ᱟᱨ ᱢᱮᱱᱟᱜ ᱪᱤᱠᱷᱱᱟ ᱚᱛᱟᱣᱟᱛᱮ, ᱟᱢ ᱱᱚᱣᱟᱢ ᱞᱟᱲᱟᱣ ᱫᱟᱲᱮᱭᱟᱜ ᱟ, ᱱᱚᱣᱟ ᱥᱟᱥᱟᱯᱲᱟᱣ ᱢᱮ ᱟᱨ ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱚᱱᱚᱞ ᱦᱩᱱᱟᱹᱨ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾" #. Fill tool instructions #: ../tools.h:136 msgid "Click in the picture to fill that area with color." -msgstr "ᱚᱱᱟ ᱡᱟᱭᱜᱟ ᱨᱚᱝ ᱛᱮ ᱯᱮᱨᱮᱡ ᱞᱟᱹᱜᱤᱫ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱚᱱᱟ ᱡᱟᱭᱜᱟ ᱨᱚᱝ ᱛᱮ ᱯᱮᱨᱮᱡ ᱞᱟᱹᱜᱤᱫ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. Magic tool instruction #: ../tools.h:139 @@ -528,12 +507,12 @@ msgstr "ᱵᱟᱲᱤᱡᱟᱠ!" #. Response to 'start a new image' action #: ../tools.h:151 msgid "Pick a color or picture with which to start a new drawing." -msgstr "ᱨᱚᱝ ᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱴᱟᱯ ᱢᱮ ᱚᱠᱟ ᱥᱟᱸᱣ ᱛᱮ ᱱᱟᱣᱟ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱮᱦᱚᱵ ᱞᱟᱹᱜᱤᱫ." +msgstr "ᱨᱚᱝ ᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱴᱟᱯ ᱢᱮ ᱚᱠᱟ ᱥᱟᱸᱣ ᱛᱮ ᱱᱟᱣᱟ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱮᱦᱚᱵ ᱞᱟᱹᱜᱤᱫ ᱾" #. Response to 'open' action (while file dialog is being constructed) #: ../tools.h:154 msgid "Open…" -msgstr "ᱡᱷᱤᱪ" +msgstr "ᱡᱷᱤᱪ…" #. Response to 'save' action #: ../tools.h:157 @@ -543,7 +522,7 @@ msgstr "ᱟᱢᱟᱜ ᱟᱦᱞᱟ ᱪᱤᱛᱟᱹᱨ ᱥᱟᱸᱪᱟᱣᱟᱠᱟ #. Response to 'print' action (while printing, or print dialog is being used) #: ../tools.h:160 msgid "Printing…" -msgstr "ᱪᱷᱟᱯᱟᱜ ᱠᱟᱱᱟᱟ" +msgstr "ᱪᱷᱟᱯᱟᱜ ᱠᱟᱱᱟᱟ…" #. Response to 'quit' (exit) action #: ../tools.h:163 @@ -553,18 +532,17 @@ msgstr "ᱵᱤᱫᱟᱹᱭ ᱪᱟᱞᱟᱣ!" #. Instruction while using Line tool (after click, before release) #: ../tools.h:167 msgid "Let go of the button to complete the line." -msgstr "ᱪᱚᱞᱚ ᱜᱟᱨ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ ᱵᱩᱛᱟᱹᱢ ᱨᱮᱭᱟᱜ ᱨᱮ." +msgstr "ᱪᱚᱞᱚ ᱜᱟᱨ ᱯᱩᱨᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ ᱵᱩᱛᱟᱹᱢ ᱨᱮᱭᱟᱜ ᱨᱮ ᱾" #. Instruction while using Shape tool (after first click, before release) #: ../tools.h:170 msgid "Hold the button to stretch the shape." -msgstr "ᱵᱮᱱᱟᱣ ᱴᱟᱱᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱵᱩᱛᱟᱹᱢ ᱥᱟᱵ ᱢᱮ." +msgstr "ᱵᱮᱱᱟᱣ ᱴᱟᱱᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱵᱩᱛᱟᱹᱢ ᱥᱟᱵ ᱢᱮ ᱾" #. Instruction while finishing Shape tool (after release, during rotation step before second click) #: ../tools.h:173 msgid "Move the mouse to rotate the shape. Click to draw it." -msgstr "" -"ᱵᱮᱱᱟᱣ ᱜᱷᱩᱨᱱᱤ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱢᱮ. ᱱᱚᱣᱟ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱵᱮᱱᱟᱣ ᱜᱷᱩᱨᱱᱤ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱢᱮ ᱾ ᱱᱚᱣᱟ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. Notification that 'New' action was aborted (current image would have been lost) #: ../tools.h:176 @@ -613,7 +591,7 @@ msgstr "ᱚᱱᱟ ᱪᱤᱛᱟᱹᱨ ᱵᱟᱢ ᱡᱷᱤᱪ ᱫᱟᱲᱮᱭᱟ #: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 #: ../tuxpaint.c:2187 ../tuxpaint.c:2192 msgid "OK" -msgstr "ᱦᱚᱭ" +msgstr "ᱴᱷᱤᱠ" #. Notification that 'Open' dialog has nothing to show #: ../tuxpaint.c:2161 @@ -623,7 +601,7 @@ msgstr "ᱱᱚᱰᱮ ᱡᱟᱦᱟᱱ ᱥᱟᱸᱪᱟᱣ ᱨᱮ ᱠᱚ ᱵᱟᱹ #. Verification of print action #: ../tuxpaint.c:2165 msgid "Print your picture now?" -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱱᱤᱛᱚᱜ ᱪᱷᱟᱯᱟᱭ ᱢᱮPrint your picture now?" +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱱᱤᱛᱚᱜ ᱪᱷᱟᱯᱟᱭ ᱟᱢ ᱥᱮ?" #: ../tuxpaint.c:2166 msgid "Yes, print it!" @@ -664,45 +642,41 @@ msgstr "ᱞᱮᱸᱜᱟ ᱢᱟᱩᱥ ᱵᱩᱛᱟᱹᱢ ᱵᱮᱵᱚᱦᱟᱨ #. Confirmation of successful (we hope) image export #: ../tuxpaint.c:2190 -#, fuzzy msgid "Your picture has been exported!" -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱷᱟᱯᱟᱭᱮᱛ ᱠᱟᱱᱟ!" +msgstr "" #: ../tuxpaint.c:2191 -#, fuzzy msgid "Your slideshow GIF has been exported!" -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱷᱟᱯᱟᱭᱮᱛ ᱠᱟᱱᱟ!" +msgstr "" #. We got an error exporting #: ../tuxpaint.c:2195 -#, fuzzy msgid "Sorry! Your picture could not be exported!" -msgstr "ᱦᱟᱨᱩᱝ! ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱵᱟᱝ ᱪᱷᱟᱯᱟ ᱫᱟᱲᱮᱭᱟᱜ ᱟ!" +msgstr "" #: ../tuxpaint.c:2196 -#, fuzzy msgid "Sorry! Your slideshow GIF could not be exported!" -msgstr "ᱦᱟᱨᱩᱝ! ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱵᱟᱝ ᱪᱷᱟᱯᱟ ᱫᱟᱲᱮᱭᱟᱜ ᱟ!" +msgstr "" #. Slideshow instructions #: ../tuxpaint.c:2200 msgid "Choose the pictures you want, then click “Play”." -msgstr "ᱟᱢᱮᱢ ᱧᱟᱢ ᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱠᱚ ᱵᱟᱪᱷᱟᱣ ᱢᱮ, ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱢᱮᱱᱮᱪ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱮᱢ ᱧᱟᱢ ᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱠᱚ ᱵᱟᱪᱷᱟᱣ ᱢᱮ, ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱢᱮᱱᱮᱪ ᱚᱛᱟᱭ ᱢᱮ ᱾ " #. Sound has been muted (silenced) via keyboard shortcut #: ../tuxpaint.c:2407 msgid "Sound muted." -msgstr "ᱥᱟᱰᱮ ᱛᱷᱤᱨ ᱦᱟᱱᱛᱟᱲ." +msgstr "ᱥᱟᱰᱮ ᱛᱷᱤᱨ ᱦᱟᱱᱛᱟᱲ ᱾" #. Sound has been unmuted (unsilenced) via keyboard shortcut #: ../tuxpaint.c:2412 msgid "Sound unmuted." -msgstr "ᱥᱟᱰᱮ ᱥᱟᱰᱮ ᱦᱚᱪᱚ." +msgstr "ᱥᱟᱰᱮ ᱥᱟᱰᱮ ᱦᱚᱪᱚ ᱾" #. Wait while Text tool finishes loading fonts #: ../tuxpaint.c:3167 msgid "Please wait…" -msgstr "ᱛᱟᱸᱜᱤ ᱢᱮ" +msgstr "ᱫᱟᱭᱟᱠᱟᱛᱮ ᱛᱟᱺᱜᱤᱢᱮ ..." #. Open dialog: 'Erase' button, to erase/deleted the selected picture #: ../tuxpaint.c:7923 @@ -722,12 +696,12 @@ msgstr "ᱵᱷᱮᱡᱟ" #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture #: ../tuxpaint.c:7932 msgid "Back" -msgstr "ᱛᱟᱭᱱᱚᱢ" +msgstr "ᱛᱟᱭᱚᱢ" #. Slideshow: 'Play' button, to begin a slideshow sequence #: ../tuxpaint.c:7935 msgid "Play" -msgstr "ᱦᱟᱹᱞᱠᱟᱹᱣ" +msgstr "ᱮᱱᱮᱪ" #. Slideshow: 'GIF Export' button, to create an animated GIF #: ../tuxpaint.c:7938 @@ -737,7 +711,7 @@ msgstr "GIF ᱵᱷᱮᱡᱟ" #. Slideshow: 'Next' button, to load next slide (image) #: ../tuxpaint.c:7941 msgid "Next" -msgstr "ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ" +msgstr "ᱤᱱᱟ ᱛᱟᱭᱚᱢ" #. 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 @@ -748,7 +722,7 @@ msgstr "ᱟᱠᱷᱚᱨ ᱵᱟᱪᱷᱟᱣᱟᱠ" #. positive and negative responses in dialogs (e.g., [Y] (for 'yes') in English) #: ../tuxpaint.c:12069 msgid "Yes" -msgstr "ᱦᱚᱭ" +msgstr "ᱦᱮᱸ" #: ../tuxpaint.c:12073 msgid "No" @@ -775,7 +749,7 @@ msgstr "ᱵᱟᱝᱟ, ᱢᱤᱫ ᱱᱟᱣᱟ ᱨᱮᱫ ᱥᱟᱸᱪᱟᱣ ᱢᱮ #. Instructions for 'Open' file dialog #: ../tuxpaint.c:14454 msgid "Choose the picture you want, then click “Open”." -msgstr "ᱟᱢᱮᱢ ᱧᱟᱢ ᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ, ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱢᱡᱷᱤᱡ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱮᱢ ᱧᱟᱢ ᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ, ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱢᱡᱷᱤᱡ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. None selected? Too dangerous to automatically select all (like we do for slideshow playback). #. Only 1 selected? No point in saving as GIF. @@ -786,11 +760,11 @@ msgstr "ᱮᱱᱤᱢᱮᱴᱮᱰ GIF ᱞᱟᱹᱜᱤᱫ ᱵᱟᱨᱭᱟ ᱠᱷ #: ../tuxpaint.c:23539 msgid "Select a color from your drawing." -msgstr "ᱛᱮᱭᱟᱨ ᱠᱷᱚᱱ ᱨᱚᱸᱝ ᱪᱚᱭᱚᱱ ᱢᱮ" +msgstr "ᱟᱢᱟᱜ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱠᱷᱚᱱ ᱨᱚᱝ ᱪᱚᱭᱚᱱ ᱢᱮ ᱾" #: ../tuxpaint.c:23551 msgid "Pick a color." -msgstr "ᱢᱤᱫ ᱨᱚᱝ ᱞᱟᱴᱟᱯ ᱢᱮ." +msgstr "ᱢᱤᱫ ᱨᱚᱝ ᱞᱟᱴᱟᱯ ᱢᱮ ᱾" #: ../tuxpaint.desktop.in.h:1 msgid "Tux Paint" @@ -802,20 +776,19 @@ msgstr "ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱠᱟᱹᱢᱤ ᱦᱚᱨ #: ../tuxpaint.desktop.in.h:3 msgid "A drawing program for children." -msgstr "ᱜᱤᱫᱨᱟᱹ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱤᱫ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱠᱟᱹᱢᱤ ᱦᱚᱨᱟ." +msgstr "ᱜᱤᱫᱨᱟᱹ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱤᱫ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱠᱟᱹᱢᱤ ᱦᱚᱨᱟ ᱾" #: ../../magic/src/alien.c:68 msgid "Color Shift" msgstr "ᱨᱚᱝ ᱩᱪᱟᱹᱲ" #: ../../magic/src/alien.c:72 -#, fuzzy msgid "Click and drag the mouse to change the colors in parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱨᱚᱝ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱟᱹᱴᱤᱧ ᱠᱚᱨᱮ ᱚᱛᱟ ᱟᱨ ᱢᱟᱩᱥ ᱛᱮ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱠᱟᱛᱮ ᱨᱚᱝ ᱪᱚᱭᱚᱱ ᱢᱮ ᱾ " #: ../../magic/src/alien.c:73 msgid "Click to change the colors in your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱨᱚᱝ ᱠᱚ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱨᱚᱝ ᱠᱚ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/blind.c:116 msgid "Blind" @@ -825,9 +798,7 @@ msgstr "ᱠᱟᱸᱲᱟ" msgid "" "Click towards the edge of your picture to pull window blinds over it. Move " "perpendicularly to open or close the blinds." -msgstr "" -"ᱣᱤᱸᱰᱚ ᱠᱟᱸᱲᱟ ᱪᱮᱛᱟᱱ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱞᱟᱹᱜᱤᱫ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱫᱷᱟᱨᱮ ᱥᱮᱫ ᱛᱮ ᱚᱛᱟᱭ ᱢᱮ. " -"ᱠᱟᱸᱲᱟ ᱠᱚ ᱡᱷᱤᱡ ᱟᱨ ᱵᱟᱝ ᱵᱚᱱᱫᱚ ᱞᱟᱹᱜᱤᱫ ᱥᱤᱫᱩᱵ ᱞᱮᱠᱟ ᱛᱮ ᱞᱟᱲᱟᱣ ᱢᱮ." +msgstr "ᱣᱤᱸᱰᱚ ᱠᱟᱸᱲᱟ ᱪᱮᱛᱟᱱ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱞᱟᱹᱜᱤᱫ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱫᱷᱟᱨᱮ ᱥᱮᱫ ᱛᱮ ᱚᱛᱟᱭ ᱢᱮ. ᱠᱟᱸᱲᱟ ᱠᱚ ᱡᱷᱤᱡ ᱟᱨ ᱵᱟᱝ ᱵᱚᱱᱫᱚ ᱞᱟᱹᱜᱤᱫ ᱥᱤᱫᱩᱵ ᱞᱮᱠᱟ ᱛᱮ ᱞᱟᱲᱟᱣ ᱢᱮ ᱾" #: ../../magic/src/blocks_chalk_drip.c:129 msgid "Blocks" @@ -842,34 +813,29 @@ msgid "Drip" msgstr "ᱴᱚᱯᱚᱠ" #: ../../magic/src/blocks_chalk_drip.c:142 -#, fuzzy msgid "Click and drag the mouse around to make the picture blocky." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱮᱥᱮᱛ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱜᱚᱴᱟ ᱥᱮᱫ ᱢᱟᱩᱥ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱮᱥᱮᱛ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱜᱚᱴᱟ ᱥᱮᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/blocks_chalk_drip.c:144 -#, fuzzy msgid "" "Click and drag the mouse around to turn the picture into a chalk drawing." -msgstr "" -"ᱪᱚᱠ ᱠᱷᱩᱲᱤ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱨᱮ ᱪᱤᱛᱟᱨ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱚᱠ ᱠᱷᱩᱲᱤ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱨᱮ ᱪᱤᱛᱟᱨ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱢᱮ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/blocks_chalk_drip.c:146 -#, fuzzy msgid "Click and drag the mouse around to make the picture drip." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱴᱚᱯᱚᱜ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱴᱚᱯᱚᱜ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/blur.c:80 msgid "Blur" msgstr "ᱫᱷᱩᱸᱫᱷ" #: ../../magic/src/blur.c:84 -#, fuzzy msgid "Click and drag the mouse around to blur the image." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱫᱷᱩᱸᱫᱷ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱫᱷᱩᱸᱫᱷ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/blur.c:85 msgid "Click to blur the entire image." -msgstr "ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱫᱷᱩᱸᱫᱷ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱫᱷᱩᱸᱫᱷ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. Both are named "Bricks", at the moment: #: ../../magic/src/bricks.c:120 @@ -877,34 +843,28 @@ msgid "Bricks" msgstr "ᱤᱸᱴᱟ ᱠᱚ" #: ../../magic/src/bricks.c:127 -#, fuzzy msgid "Click and drag to draw large bricks." -msgstr "ᱢᱟᱨᱟᱝ ᱤᱸᱴᱟ ᱠᱚ ᱜᱟᱨ ᱞᱟᱹᱜᱤ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱢᱟᱨᱟᱝ ᱤᱸᱴᱟ ᱠᱚ ᱜᱟᱨ ᱞᱟᱹᱜᱤ ᱜᱟᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/bricks.c:129 -#, fuzzy msgid "Click and drag to draw small bricks." -msgstr "ᱦᱩᱰᱤᱧ ᱤᱸᱴᱟ ᱠᱚ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱦᱩᱰᱤᱧ ᱤᱸᱴᱟ ᱠᱚ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫᱟᱨ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/calligraphy.c:124 msgid "Calligraphy" msgstr "ᱵᱮᱥ ᱟᱠᱷᱚᱨ ᱚᱞ ᱦᱩᱱᱟᱹᱨ" #: ../../magic/src/calligraphy.c:131 -#, fuzzy msgid "Click and drag the mouse around to draw in calligraphy." -msgstr "ᱵᱮᱥ ᱟᱠᱷᱚᱨ ᱚᱞ ᱦᱩᱱᱟᱹᱨ ᱨᱮ ᱜᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱵᱮᱥ ᱟᱠᱷᱚᱨ ᱚᱞ ᱦᱩᱱᱟᱹᱨ ᱨᱮ ᱜᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/cartoon.c:103 msgid "Cartoon" -msgstr "ᱪᱤᱜᱟᱹᱨᱤᱭᱟᱹ ᱞᱟᱹᱜᱤᱫ ᱵᱮᱱᱟᱣᱟᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ" +msgstr "ᱠᱟᱨᱴᱩᱩᱱ" #: ../../magic/src/cartoon.c:109 -#, fuzzy msgid "Click and drag the mouse around to turn the picture into a cartoon." -msgstr "" -"ᱪᱤᱜᱟᱹᱨᱤᱭᱟᱹ ᱞᱟᱹᱜᱤᱫ ᱵᱮᱱᱟᱣᱟᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ " -"ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱜᱟᱹᱨᱤᱭᱟᱹ ᱞᱟᱹᱜᱤᱫ ᱵᱮᱱᱟᱣᱟᱠᱟᱱ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱜᱚᱴᱟ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱠᱟᱛᱮ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/confetti.c:83 msgid "Confetti" @@ -920,7 +880,7 @@ msgstr "ᱵᱟᱹᱲᱤᱪ ᱛᱮᱭᱟᱨ" #: ../../magic/src/distortion.c:143 msgid "Click and drag the mouse to cause distortion in your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱵᱟᱹᱲᱤᱪ ᱛᱮᱭᱟᱨᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱵᱟᱹᱲᱤᱪ ᱛᱮᱭᱟᱨᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/emboss.c:101 msgid "Emboss" @@ -928,7 +888,7 @@ msgstr "ᱜᱟᱲᱦᱟᱣ" #: ../../magic/src/emboss.c:107 msgid "Click and drag the mouse to emboss the picture." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱜᱟᱲᱦᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱜᱟᱲᱦᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fade_darken.c:114 msgid "Lighten" @@ -939,22 +899,20 @@ msgid "Darken" msgstr "ᱜᱟᱲᱦᱚ ᱛᱮᱭᱟᱨ" #: ../../magic/src/fade_darken.c:127 -#, fuzzy msgid "Click and drag the mouse to lighten parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱮᱛᱟᱝ ᱦᱤᱸᱥ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱮᱛᱟᱝ ᱦᱤᱸᱥ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fade_darken.c:129 msgid "Click to lighten your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱨ ᱮᱛᱟᱦ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱨ ᱮᱛᱟᱦ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fade_darken.c:134 -#, fuzzy msgid "Click and drag the mouse to darken parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱜᱟᱲᱦᱚ ᱦᱤᱸᱥ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱟᱹᱪᱩᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱮᱛᱟᱝ ᱦᱤᱸᱥ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fade_darken.c:136 msgid "Click to darken your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱜᱟᱲᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱜᱟᱲᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fisheye.c:101 msgid "Fisheye" @@ -962,7 +920,7 @@ msgstr "ᱦᱟᱹᱠᱩ ᱢᱮᱫ" #: ../../magic/src/fisheye.c:106 msgid "Click on part of your picture to create a fisheye effect." -msgstr "ᱦᱟᱹᱠᱩ ᱢᱮᱫ ᱯᱚᱨᱵᱷᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱦᱟᱹᱠᱩ ᱢᱮᱫ ᱯᱚᱨᱵᱷᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/flower.c:144 msgid "Flower" @@ -970,9 +928,7 @@ msgstr "ᱵᱟᱦᱟ" #: ../../magic/src/flower.c:150 msgid "Click and drag to draw a flower stalk. Let go to finish the flower." -msgstr "" -"ᱵᱟᱦᱟ ᱰᱷᱟᱨᱣᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ. ᱫᱮᱞᱟ ᱵᱟᱦᱟ ᱪᱟᱵᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱵᱚ ᱪᱟᱞᱟᱜ " -"ᱟ." +msgstr "ᱵᱟᱦᱟ ᱰᱷᱟᱨᱣᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾ ᱫᱮᱞᱟ ᱵᱟᱦᱟ ᱪᱟᱵᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱵᱚ ᱪᱟᱞᱟᱜ ᱟ ᱾" #: ../../magic/src/foam.c:114 msgid "Foam" @@ -980,7 +936,7 @@ msgstr "ᱯᱷᱚᱛᱚ" #: ../../magic/src/foam.c:120 msgid "Click and drag the mouse to cover an area with foamy bubbles." -msgstr "ᱯᱷᱚᱛᱚ ᱵᱩᱨᱵᱩᱰᱩᱪ ᱥᱟᱸᱣ ᱢᱤᱫ ᱡᱟᱭᱜᱟ ᱮᱥᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱯᱷᱚᱛᱚ ᱵᱩᱨᱵᱩᱰᱩᱪ ᱥᱟᱸᱣ ᱢᱤᱫ ᱡᱟᱭᱜᱟ ᱮᱥᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/fold.c:103 msgid "Fold" @@ -989,22 +945,19 @@ msgstr "ᱞᱟᱹᱴᱩᱢ" #: ../../magic/src/fold.c:108 msgid "" "Choose a background color and click to turn the corner of the page over." -msgstr "" -"ᱥᱟᱦᱴᱟ ᱢᱩᱪᱟᱹᱛ ᱨᱮᱭᱟᱜ ᱠᱚᱸᱰ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱢᱤᱫ ᱚᱱᱚᱲ ᱨᱚᱝ ᱵᱟᱪᱷᱟᱣ ᱢᱮ." +msgstr "ᱥᱟᱦᱴᱟ ᱢᱩᱪᱟᱹᱛ ᱨᱮᱭᱟᱜ ᱠᱚᱸᱰ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱢᱤᱫ ᱚᱱᱚᱲ ᱨᱚᱝ ᱵᱟᱪᱷᱟᱣ ᱢᱮ ᱾" #: ../../magic/src/fretwork.c:176 msgid "Fretwork" -msgstr "ᱯᱷᱨᱮᱴᱣᱟᱨᱠ" +msgstr "ᱠᱟᱨᱤᱜᱚᱨᱤ" #: ../../magic/src/fretwork.c:182 -#, fuzzy msgid "Click and drag to draw repetitive patterns. " -msgstr "ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱛᱮ ᱛᱮᱭᱟᱨᱟᱜ ᱥᱟᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱫᱚᱯᱚᱲᱦᱟᱣ ᱪᱤᱱᱦᱟᱹ ᱠᱚ ᱜᱟᱨ ᱞᱟᱹᱜᱤ ᱜᱟᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾ " #: ../../magic/src/fretwork.c:184 -#, fuzzy msgid "Click to surround your picture with repetitive patterns." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱡᱟᱹᱯᱩᱫ ᱴᱟᱯᱟᱪ ᱴᱤᱯᱤᱪ ᱥᱟᱸᱣ ᱡᱚᱯᱚᱨᱜ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱫᱚᱯᱚᱲᱦᱟᱣ ᱪᱤᱱᱦᱟᱹ ᱠᱚ ᱜᱟᱨ ᱞᱟᱹᱜᱤ ᱜᱟᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/glasstile.c:104 msgid "Glass Tile" @@ -1012,29 +965,27 @@ msgstr "ᱠᱟᱸᱪ ᱠᱷᱟᱯᱨᱟ" #: ../../magic/src/glasstile.c:111 msgid "Click and drag the mouse to put glass tile over your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱠᱟᱸᱪ ᱠᱷᱟᱯᱨᱟ ᱫᱚᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱠᱟᱸᱪ ᱠᱷᱟᱯᱨᱟ ᱫᱚᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/glasstile.c:113 msgid "Click to cover your entire picture in glass tiles." -msgstr "ᱜᱤᱞᱟᱹᱥ ᱠᱷᱟᱯᱨᱟ ᱠᱚᱨᱮ ᱟᱢᱟᱜ ᱡᱚᱛᱚ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱜᱤᱞᱟᱹᱥ ᱠᱷᱟᱯᱨᱟ ᱠᱚᱨᱮ ᱟᱢᱟᱜ ᱡᱚᱛᱚ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/grass.c:107 msgid "Grass" msgstr "ᱜᱷᱟᱸᱥ" #: ../../magic/src/grass.c:113 -#, fuzzy msgid "Click and drag to draw grass. Don’t forget the dirt!" -msgstr "ᱜᱷᱟᱸᱥ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱹᱜᱤᱫ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟ. ᱚᱡᱨᱟ ᱟᱞᱚᱢ ᱦᱤᱲᱤᱧᱟ!" +msgstr "ᱜᱷᱟᱸᱥ ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟ. ᱚᱡᱨᱟ ᱟᱞᱚᱢ ᱦᱤᱲᱤᱧᱟ!" #: ../../magic/src/halftone.c:35 msgid "Halftone" msgstr "ᱦᱟᱯᱷᱴᱚᱱ" #: ../../magic/src/halftone.c:39 -#, fuzzy msgid "Click and drag to turn your drawing into a newspaper." -msgstr "ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱮᱝᱰᱨᱮ ᱨᱮ ᱟᱢᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱜᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱠᱚ ᱠᱷᱚᱵᱚᱨ ᱠᱟᱜᱚᱡ ᱛᱮ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/kalidescope.c:119 msgid "Symmetric Left/Right" @@ -1050,7 +1001,7 @@ msgstr "ᱱᱟᱹᱢᱩᱱᱟ" #: ../../magic/src/kalidescope.c:131 msgid "Tiles" -msgstr "ᱴᱟᱭᱞᱥ" +msgstr "ᱴᱟᱭᱤᱞ" #. KAL_BOTH #: ../../magic/src/kalidescope.c:135 @@ -1061,38 +1012,29 @@ msgstr "ᱟᱹᱰᱤ ᱨᱩᱯ ᱧᱮᱞᱟᱠ" msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the left and right of your picture." -msgstr "" -"ᱵᱟᱨᱭᱟ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ " -"ᱞᱮᱸᱜᱟ ᱟᱨ ᱡᱚᱡᱚᱢ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱯᱟᱨᱢ ᱠᱚᱜ ᱟ." +msgstr "ᱵᱟᱨᱭᱟ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱞᱮᱸᱜᱟ ᱟᱨ ᱡᱚᱡᱚᱢ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱯᱟᱨᱢ ᱠᱚᱜ ᱟ ᱾" #: ../../magic/src/kalidescope.c:152 msgid "" "Click and drag the mouse to draw with two brushes that are symmetric across " "the top and bottom of your picture." -msgstr "" -"ᱵᱟᱨᱭᱟ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ " -"ᱪᱚᱴ ᱟᱨ ᱞᱟᱛᱟᱨ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱯᱟᱨᱢ ᱠᱚᱜ ᱟ." +msgstr "ᱵᱟᱨᱭᱟ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱪᱚᱴ ᱟᱨ ᱞᱟᱛᱟᱨ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱯᱟᱨᱢ ᱠᱚᱜ ᱟ ᱾" #: ../../magic/src/kalidescope.c:156 -#, fuzzy msgid "Click and drag the mouse to draw a pattern across the picture." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱜᱟᱲᱦᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱜᱟᱨ ᱟᱨ ᱪᱤᱱᱦᱟᱹ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/kalidescope.c:160 -#, fuzzy msgid "" "Click and drag the mouse to draw a pattern that is symmetric across the " "picture." -msgstr "" -"ᱵᱟᱨᱭᱟ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ " -"ᱞᱮᱸᱜᱟ ᱟᱨ ᱡᱚᱡᱚᱢ ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱯᱟᱨᱢ ᱠᱚᱜ ᱟ." +msgstr "ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱪᱤᱱᱦᱟᱹ ᱛᱮ ᱪᱤᱛᱟᱹᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. KAL_BOTH #: ../../magic/src/kalidescope.c:164 msgid "" "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." -msgstr "" -"ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ (ᱟᱹᱰᱤ ᱨᱩᱯ ᱧᱮᱞᱟᱠ) ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱥᱚᱢᱟᱱ ᱥᱚᱢᱟᱱ ᱡᱚᱛᱚᱜ ᱥᱟᱸᱣ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ (ᱟᱹᱰᱤ ᱨᱩᱯ ᱧᱮᱞᱟᱠ) ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/light.c:103 msgid "Light" @@ -1100,7 +1042,7 @@ msgstr "ᱟᱨᱥᱟᱞ" #: ../../magic/src/light.c:109 msgid "Click and drag to draw a beam of light on your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱨᱥᱟᱞ ᱨᱮᱭᱟᱜ ᱯᱟᱹᱲ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱨᱥᱟᱞ ᱨᱮᱭᱟᱜ ᱯᱟᱹᱲ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/metalpaint.c:98 msgid "Metal Paint" @@ -1108,7 +1050,7 @@ msgstr "ᱫᱷᱟᱛᱩ ᱨᱚᱝ ᱯᱮᱨᱮᱪ" #: ../../magic/src/metalpaint.c:105 msgid "Click and drag the mouse to paint with a metallic color." -msgstr "ᱫᱷᱟᱛᱩ ᱨᱚᱝ ᱥᱟᱸᱣ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱫᱷᱟᱛᱩ ᱨᱚᱝ ᱥᱟᱸᱣ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mirror_flip.c:110 msgid "Mirror" @@ -1120,123 +1062,103 @@ msgstr "ᱩᱪᱷᱞᱟᱹᱣ" #: ../../magic/src/mirror_flip.c:121 msgid "Click to make a mirror image." -msgstr "ᱟᱨᱥᱤ ᱩᱢᱩᱞ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱨᱥᱤ ᱩᱢᱩᱞ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mirror_flip.c:123 msgid "Click to flip the picture upside-down." -msgstr "ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱫᱷᱟᱨᱮ-ᱞᱟᱛᱟᱨ ᱩᱪᱷᱞᱟᱹᱣ ᱞᱟᱹᱜᱤ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱫᱷᱟᱨᱮ-ᱞᱟᱛᱟᱨ ᱩᱪᱷᱞᱟᱹᱣ ᱞᱟᱹᱜᱤ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic.c:96 msgid "Mosaic" msgstr "ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ" #: ../../magic/src/mosaic.c:100 -#, fuzzy msgid "" "Click and drag the mouse to add a mosaic effect to parts of your picture." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱯᱚᱨᱵᱷᱟᱣ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ " -"ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱯᱚᱨᱵᱷᱟᱣ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic.c:101 msgid "Click to add a mosaic effect to your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱯᱚᱨᱵᱷᱟᱣ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱯᱚᱨᱵᱷᱟᱣ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:132 msgid "Square Mosaic" -msgstr "ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ" +msgstr "ᱥᱠᱣᱮᱨ ᱢᱚᱥᱟᱭᱤᱠ" #: ../../magic/src/mosaic_shaped.c:133 msgid "Hexagon Mosaic" -msgstr "ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ" +msgstr "ᱦᱮᱠᱥᱟᱜᱚᱱ ᱢᱚᱥᱟᱭᱤᱠ" #: ../../magic/src/mosaic_shaped.c:134 msgid "Irregular Mosaic" -msgstr "ᱟᱯᱟ ᱵᱟᱹᱲᱤᱭᱟ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ" +msgstr "ᱵᱟᱝ ᱴᱷᱤᱠ ᱢᱚᱥᱟᱭᱤᱠ" #: ../../magic/src/mosaic_shaped.c:140 -#, fuzzy msgid "" "Click and drag the mouse to add a square mosaic to parts of your picture." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱛ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ " -"ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱯᱩᱱᱠᱩᱬ ᱵᱟᱠᱥᱟ ᱛᱮ ᱮᱥᱮᱛ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:141 msgid "Click to add a square mosaic to your entire picture." -msgstr "" -"ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ " -"ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱯᱩᱱ ᱥᱚᱢᱟᱱ ᱡᱤᱞᱤᱧ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:145 -#, fuzzy msgid "" "Click and drag the mouse to add a hexagonal mosaic to parts of your picture." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ " -"ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:146 msgid "Click to add a hexagonal mosaic to your entire picture." -msgstr "" -"ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱨᱟᱹᱞ ᱜᱟᱨ ᱛᱮ ᱮᱥᱮᱫ ᱛᱮᱭᱟᱨ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:150 -#, fuzzy msgid "" "Click and drag the mouse to add an irregular mosaic to parts of your picture." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱟᱯᱟᱵᱟᱲᱤᱭᱟᱹ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ " -"ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱟᱯᱟᱵᱟᱲᱤᱭᱟᱹ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/mosaic_shaped.c:151 msgid "Click to add an irregular mosaic to your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱯᱟᱵᱟᱹᱲᱤᱭᱟ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱯᱟᱵᱟᱹᱲᱤᱭᱟ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/negative.c:94 msgid "Negative" msgstr "ᱮᱝᱰᱨᱮ, ᱵᱟᱝ" #: ../../magic/src/negative.c:101 -#, fuzzy msgid "Click and drag the mouse around to make your painting negative." -msgstr "" -"ᱟᱢᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱮᱝᱰᱨᱮ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤ ᱫ ᱢᱟᱩᱥ ᱫᱷᱟᱨᱮ ᱫᱷᱟᱨᱮ ᱥᱮᱫ ᱛᱮ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱮᱝᱰᱨᱮ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤ ᱫ ᱢᱟᱩᱥ ᱫᱷᱟᱨᱮ ᱫᱷᱟᱨᱮ ᱥᱮᱫ ᱛᱮ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/negative.c:103 msgid "Click to turn your painting into its negative." -msgstr "ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱮᱝᱰᱨᱮ ᱨᱮ ᱟᱢᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱮᱝᱰᱨᱮ ᱨᱮ ᱟᱢᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/noise.c:66 msgid "Noise" msgstr "ᱟᱝᱫᱚᱲ" #: ../../magic/src/noise.c:70 -#, fuzzy msgid "Click and drag the mouse to add noise to parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱟᱝᱫᱚᱲ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱟᱝᱫᱚᱲ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/noise.c:71 msgid "Click to add noise to your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱝᱫᱚᱲ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱟᱝᱫᱚᱲ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/perspective.c:147 msgid "Perspective" -msgstr "ᱧᱮᱞ ᱦᱚᱪᱚ ᱞᱮᱠᱟᱱ ᱛᱮᱭᱟᱨ" +msgstr "ᱵᱟᱵᱚᱛ ᱛᱮᱭᱟᱠ" #: ../../magic/src/perspective.c:148 msgid "Zoom" -msgstr "ᱦᱩᱰᱤᱧ ᱢᱟᱨᱟᱝ ᱛᱮᱭᱟᱨ ᱦᱚᱪᱚ" +msgstr "ᱡᱩᱩᱢ" #: ../../magic/src/perspective.c:153 msgid "Click on the corners and drag where you want to stretch the picture." -msgstr "ᱠᱚᱸᱰ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱚᱠᱟᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱴᱟᱱᱟᱣ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱨ ᱢᱮ." +msgstr "ᱠᱚᱸᱰ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢ ᱚᱠᱟᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱴᱟᱱᱟᱣ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱨ ᱢᱮ ᱾" #: ../../magic/src/perspective.c:156 msgid "Click and drag up to zoom in or drag down to zoom out the picture." -msgstr "" -"ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱦᱚᱪᱚ ᱟᱨ ᱵᱟᱝ ᱢᱟᱨᱟᱝ ᱦᱩᱰᱤᱧ ᱦᱚᱪᱚ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱝᱲᱜᱚ ᱦᱟᱵᱤᱪ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ " -"ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱦᱚᱪᱚ ᱟᱨ ᱵᱟᱝ ᱢᱟᱨᱟᱝ ᱦᱩᱰᱤᱧ ᱦᱚᱪᱚ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱝᱲᱜᱚ ᱦᱟᱵᱤᱪ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/puzzle.c:103 msgid "Puzzle" @@ -1244,11 +1166,11 @@ msgstr "ᱟᱠᱟ ᱵᱟᱠᱟ" #: ../../magic/src/puzzle.c:110 msgid "Click the part of your picture where would you like a puzzle." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱨᱮ ᱟᱢ ᱟᱠᱟ ᱵᱟᱠᱟ ᱠᱩᱥᱤᱭᱟᱜ ᱟᱢ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱚᱛᱟᱭ ᱢᱮ ᱚᱠᱟ ᱨᱮ ᱟᱢ ᱟᱠᱟ ᱵᱟᱠᱟ ᱠᱩᱥᱤᱭᱟᱜ ᱟᱢ ᱾" #: ../../magic/src/puzzle.c:111 msgid "Click to make a puzzle in fullscreen mode." -msgstr "ᱯᱩᱨᱟᱹ ᱤᱥᱠᱤᱨᱤᱱ ᱚᱵᱚᱥᱛᱟ ᱨᱮ ᱟᱠᱟ ᱵᱟᱠᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱯᱩᱨᱟᱹ ᱤᱥᱠᱤᱨᱤᱱ ᱚᱵᱚᱥᱛᱟ ᱨᱮ ᱟᱠᱟ ᱵᱟᱠᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/rails.c:129 msgid "Rails" @@ -1256,7 +1178,7 @@ msgstr "ᱵᱤᱱᱫᱷᱟᱹᱲ" #: ../../magic/src/rails.c:134 msgid "Click and drag to draw train track rails on your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱨᱮᱞᱜᱟᱲᱤ ᱯᱟᱸᱡᱟ ᱵᱤᱱᱫᱷᱟᱲ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱨᱮᱞᱜᱟᱲᱤ ᱯᱟᱸᱡᱟ ᱵᱤᱱᱫᱷᱟᱲ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/rainbow.c:133 msgid "Rainbow" @@ -1272,11 +1194,11 @@ msgstr "ᱡᱟᱹᱯᱩᱫ" #: ../../magic/src/rain.c:72 msgid "Click to place a rain drop onto your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱡᱟᱹᱯᱩᱫ ᱴᱟᱯᱟᱪ ᱴᱤᱯᱤᱪ ᱴᱷᱟᱸᱣ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱡᱟᱹᱯᱩᱫ ᱴᱟᱯᱟᱪ ᱴᱤᱯᱤᱪ ᱴᱷᱟᱸᱣ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/rain.c:73 msgid "Click to cover your picture with rain drops." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱡᱟᱹᱯᱩᱫ ᱴᱟᱯᱟᱪ ᱴᱤᱯᱤᱪ ᱥᱟᱸᱣ ᱡᱚᱯᱚᱨᱜ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱡᱟᱹᱯᱩᱫ ᱴᱟᱯᱟᱪ ᱴᱤᱯᱤᱪ ᱥᱟᱸᱣ ᱡᱚᱯᱚᱨᱜ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/realrainbow.c:98 msgid "Real Rainbow" @@ -1290,9 +1212,7 @@ msgstr "ROYGBIV ᱨᱟᱢ ᱟᱠ" msgid "" "Click where you want your rainbow to start, drag to where you want it to " "end, and then let go to draw a rainbow." -msgstr "" -"ᱚᱠᱟᱨᱮ ᱟᱢ ᱟᱢᱟᱜ ᱨᱟᱢ ᱟᱜ ᱮᱦᱚᱵ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱛᱟᱭ ᱢᱮ, ᱚᱠᱟᱨᱮ ᱟᱢ ᱱᱚᱣᱟ ᱢᱩᱪᱟᱹᱛ ᱥᱟᱱᱟᱢ " -"ᱠᱟᱱᱟ ᱚᱨ ᱢᱮ, ᱟᱨ ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ ᱫᱮᱞᱟ ᱨᱟᱢ ᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨᱟ." +msgstr "ᱚᱠᱟᱨᱮ ᱟᱢ ᱟᱢᱟᱜ ᱨᱟᱢ ᱟᱜ ᱮᱦᱚᱵ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱛᱟᱭ ᱢᱮ, ᱚᱠᱟᱨᱮ ᱟᱢ ᱱᱚᱣᱟ ᱢᱩᱪᱟᱹᱛ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱨ ᱢᱮ, ᱟᱨ ᱤᱱᱟᱹ ᱛᱟᱭᱚᱢ ᱫᱮᱞᱟ ᱨᱟᱢ ᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨᱟ ᱾" #: ../../magic/src/ripples.c:102 msgid "Ripples" @@ -1300,19 +1220,19 @@ msgstr "ᱵᱚᱦᱚᱨ ᱠᱚ" #: ../../magic/src/ripples.c:108 msgid "Click to make ripples appear over your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱛᱮ ᱵᱚᱦᱚᱨ ᱧᱮᱞ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱪᱮᱛᱟᱱ ᱛᱮ ᱵᱚᱦᱚᱨ ᱧᱮᱞ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/rosette.c:115 msgid "Rosette" -msgstr "ᱯᱷᱤᱛᱟᱹ ᱛᱮ ᱛᱮᱭᱟᱨ ᱜᱩᱞᱟᱹᱵ ᱵᱟᱦᱟ" +msgstr "ᱨᱚᱥᱮᱴᱴᱤ" #: ../../magic/src/rosette.c:117 msgid "Picasso" -msgstr "ᱜᱮᱞ ᱵᱟᱨ ᱴᱩᱰᱟᱹᱜ ᱨᱮᱭᱟᱜ ᱪᱷᱟᱯᱟ" +msgstr "ᱯᱤᱠᱟᱥᱥᱚ" #: ../../magic/src/rosette.c:123 msgid "Click and start drawing your rosette." -msgstr "ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢᱟᱜ ᱯᱷᱤᱛᱟᱹ ᱛᱮ ᱛᱮᱭᱟᱨ ᱜᱩᱞᱟᱵ ᱵᱟᱦᱟ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ." +msgstr "ᱚᱛᱟᱭ ᱢᱮ ᱟᱨ ᱟᱢᱟᱜ ᱴᱚᱥᱤᱴᱴᱤ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ ᱾" #: ../../magic/src/rosette.c:125 msgid "You can draw just like Picasso!" @@ -1328,34 +1248,31 @@ msgstr "ᱞᱟᱥᱮᱨᱟᱠ" #: ../../magic/src/sharpen.c:78 msgid "Silhouette" -msgstr "ᱩᱢᱩᱞ " +msgstr "ᱩᱢᱩᱞ" #: ../../magic/src/sharpen.c:82 -#, fuzzy msgid "Click and drag the mouse to trace edges in parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱫᱷᱟᱨᱮ ᱠᱚ ᱯᱟᱱᱛᱮ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱨᱮ ᱫᱷᱟᱨᱮ ᱠᱚ ᱯᱟᱱᱛᱮ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/sharpen.c:83 msgid "Click to trace edges in your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱫᱷᱟᱨᱮ ᱠᱚ ᱯᱟᱱᱛᱮ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱫᱷᱟᱨᱮ ᱠᱚ ᱯᱟᱱᱛᱮ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/sharpen.c:84 -#, fuzzy msgid "Click and drag the mouse to sharpen parts of your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱞᱟᱥᱮᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱮᱛᱟᱝ ᱞᱟᱥᱮᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/sharpen.c:85 msgid "Click to sharpen the entire picture." -msgstr "ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱥᱮᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱞᱟᱥᱮᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/sharpen.c:86 -#, fuzzy msgid "Click and drag the mouse to create a black and white silhouette." -msgstr "ᱦᱮᱸᱫᱮ ᱟᱨ ᱯᱩᱸᱰ ᱩᱢᱩᱞ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱦᱮᱸᱫᱮ ᱟᱨ ᱯᱩᱸᱰ ᱩᱢᱩᱞ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/sharpen.c:87 msgid "Click to create a black and white silhouette of your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱮᱸᱫᱮ ᱟᱨ ᱯᱩᱸᱰ ᱩᱢᱩᱞ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱮᱸᱫᱮ ᱟᱨ ᱯᱩᱸᱰ ᱩᱢᱩᱞ ᱪᱤᱛᱟᱹᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/shift.c:106 msgid "Shift" @@ -1363,9 +1280,7 @@ msgstr "ᱩᱪᱟᱹᱲ" #: ../../magic/src/shift.c:112 msgid "Click and drag to shift your picture around on the canvas." -msgstr "" -"ᱪᱤᱛᱟᱹᱨ ᱯᱟᱴᱟ ᱞᱩᱜᱲᱤ ᱨᱮ ᱭᱟᱜ ᱫᱷᱟᱨᱟ ᱫᱷᱟᱨᱮ ᱛᱮ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱩᱪᱟᱹᱲ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ " -"ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱯᱟᱴᱟ ᱞᱩᱜᱲᱤ ᱨᱮ ᱭᱟᱜ ᱫᱷᱟᱨᱟ ᱫᱷᱟᱨᱮ ᱛᱮ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱩᱪᱟᱹᱲ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/smudge.c:102 msgid "Smudge" @@ -1377,15 +1292,13 @@ msgid "Wet Paint" msgstr "ᱞᱚᱦᱚᱫᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ" #: ../../magic/src/smudge.c:111 -#, fuzzy msgid "Click and drag the mouse around to smudge the picture." -msgstr "ᱫᱷᱩᱸᱣᱟᱹ ᱫᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱫ ᱛᱮ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱫᱷᱩᱸᱣᱟᱹ ᱫᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱫ ᱛᱮ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #. if (which == 1) #: ../../magic/src/smudge.c:113 -#, fuzzy msgid "Click and drag the mouse around to draw with wet, smudgy paint." -msgstr "ᱞᱚᱦᱚᱫ, ᱫᱷᱩᱸᱣᱟᱹ ᱫᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱥᱮD ᱛᱮ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱞᱚᱦᱚᱫ, ᱫᱷᱩᱸᱣᱟᱹ ᱫᱟᱜ ᱨᱚᱝ ᱯᱮᱨᱮᱪ ᱥᱮD ᱛᱮ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/snow.c:71 msgid "Snow Ball" @@ -1397,11 +1310,11 @@ msgstr "ᱤᱛᱤᱧ ᱫᱟᱜ ᱨᱚᱫ" #: ../../magic/src/snow.c:76 msgid "Click to add snow balls to your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱛᱤᱧ ᱫᱟᱜ ᱰᱷᱩᱸᱵᱟᱜ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱛᱤᱧ ᱫᱟᱜ ᱰᱷᱩᱸᱵᱟᱜ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/snow.c:77 msgid "Click to add snow flakes to your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱛᱤᱧ ᱫᱟᱜ ᱨᱚᱫ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱤᱛᱤᱧ ᱫᱟᱜ ᱨᱚᱫ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/string.c:129 msgid "String edges" @@ -1419,49 +1332,42 @@ msgstr "ᱛᱟᱸᱛ 'V'" msgid "" "Click and drag to draw string art. Drag top-bottom to draw less or more " "lines, left or right to make a bigger hole." -msgstr "" -"ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ. ᱢᱟᱨᱟᱝ ᱵᱷᱩᱜᱟᱹᱜ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱠᱚᱢ " -"ᱟᱨ ᱰᱷᱮᱨ ᱜᱟᱨ ᱠᱚ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱞᱮᱸᱜᱟ ᱟᱨ ᱵᱟᱝ ᱡᱚᱡᱚᱢ ᱥᱮᱫ ᱚᱨ ᱢᱮ." +msgstr "ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾ ᱢᱟᱨᱟᱝ ᱵᱷᱩᱜᱟᱹᱜ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱠᱚᱢ ᱟᱨ ᱰᱷᱮᱨ ᱜᱟᱨ ᱠᱚ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱞᱮᱸᱜᱟ ᱟᱨ ᱵᱟᱝ ᱡᱚᱡᱚᱢ ᱥᱮᱫ ᱚᱨ ᱢᱮ ᱾" #: ../../magic/src/string.c:150 msgid "Click and drag to draw arrows made of string art." -msgstr "ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱛᱮ ᱛᱮᱭᱟᱨᱟᱜ ᱥᱟᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱛᱮ ᱛᱮᱭᱟᱨᱟᱜ ᱥᱟᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/string.c:153 msgid "Draw string art arrows with free angles." -msgstr "ᱥᱟᱫᱷᱤᱱ ᱠᱚᱸᱰ ᱠᱚ ᱥᱟᱸᱣ ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱥᱟᱨ ᱠᱚᱣᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨ." +msgstr "ᱥᱟᱫᱷᱤᱱ ᱠᱚᱸᱰ ᱠᱚ ᱥᱟᱸᱣ ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱥᱟᱨ ᱠᱚᱣᱟᱜ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱾" #: ../../magic/src/tint.c:74 msgid "Tint" -msgstr "ᱹᱰᱤ ᱞᱮᱠᱟᱱ ᱨᱚᱝ" +msgstr "ᱴᱤᱸᱴ" #: ../../magic/src/tint.c:75 msgid "Color & White" -msgstr " ᱨᱚᱝᱟᱜ & ᱯᱩᱸᱰᱟᱠ" +msgstr "ᱨᱚᱝᱟᱜ & ᱯᱩᱸᱰᱟᱠ" #: ../../magic/src/tint.c:79 -#, fuzzy msgid "" "Click and drag the mouse around to change the color of parts of your picture." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱦᱤᱸᱥ ᱨᱮᱭᱟᱜ ᱨᱚᱝ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱜᱚᱴᱟ ᱥᱮᱫ ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱦᱤᱸᱥ ᱨᱮᱭᱟᱜ ᱨᱚᱝ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱜᱚᱴᱟ ᱥᱮᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tint.c:80 msgid "Click to change the color of your entire picture." -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱨᱚᱝ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱨᱚᱝ ᱵᱚᱫᱚᱞ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tint.c:81 -#, fuzzy msgid "" "Click and drag the mouse around to turn parts of your picture into white and " "a color you choose." -msgstr "" -"ᱯᱩᱸᱰ ᱟᱨ ᱟᱢᱮᱢ ᱵᱟᱪᱷᱟᱣ ᱨᱚᱝ ᱨᱮ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱜᱮᱴᱟ ᱥᱮᱫ " -"ᱢᱟᱩᱥ ᱞᱟᱲᱟᱣ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱯᱩᱸᱰ ᱟᱨ ᱟᱢᱮᱢ ᱵᱟᱪᱷᱟᱣ ᱨᱚᱝ ᱨᱮ ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱟᱹᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱜᱮᱴᱟ ᱥᱮᱫ ᱢᱟᱩᱥ ᱚᱨ ᱨᱟᱠᱟᱵᱽ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tint.c:82 msgid "Click to turn your entire picture into white and a color you choose." -msgstr "ᱯᱩᱸᱰ ᱟᱨ ᱟᱢᱮᱢ ᱵᱟᱪᱷᱟᱣ ᱨᱚᱝ ᱨᱮ ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱟᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱯᱩᱸᱰ ᱟᱨ ᱟᱢᱮᱢ ᱵᱟᱪᱷᱟᱣ ᱨᱚᱝ ᱨᱮ ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱟᱪᱩᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/toothpaste.c:68 msgid "Toothpaste" @@ -1469,7 +1375,7 @@ msgstr "ᱰᱟᱴᱟ ᱢᱟᱡᱟᱣᱟᱠ" #: ../../magic/src/toothpaste.c:72 msgid "Click and drag to squirt toothpaste onto your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱰᱟᱴᱟ ᱢᱟᱡᱟᱣᱟᱜ ᱯᱚᱪᱚᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱰᱟᱴᱟ ᱢᱟᱡᱟᱣᱟᱜ ᱯᱚᱪᱚᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tornado.c:153 msgid "Tornado" @@ -1477,62 +1383,52 @@ msgstr "ᱦᱚᱭ ᱫᱟᱠ" #: ../../magic/src/tornado.c:159 msgid "Click and drag to draw a tornado funnel on your picture." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱢᱤᱫ ᱦᱚᱭ ᱫᱟᱜ ᱪᱤᱢᱱᱤ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱢᱤᱫ ᱦᱚᱭ ᱫᱟᱜ ᱪᱤᱢᱱᱤ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tv.c:96 msgid "TV" -msgstr "TV" +msgstr "ᱴᱤ ᱵᱷᱤ" #: ../../magic/src/tv.c:102 msgid "" "Click and drag to make parts of your picture look like they are on " "television." -msgstr "" -"ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱴᱮᱞᱤᱣᱤᱡᱟᱱ ᱨᱮ ᱧᱮᱞᱚᱜ ᱞᱮᱠᱟ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱴᱮᱞᱤᱣᱤᱡᱟᱱ ᱨᱮ ᱧᱮᱞᱚᱜ ᱞᱮᱠᱟ ᱨᱮᱭᱟᱜ ᱦᱤᱸᱥ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/tv.c:105 msgid "Click to make your picture look like it's on television." -msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱚᱱᱟ ᱴᱮᱞᱤᱣᱤᱡᱟᱱ ᱨᱮ ᱢᱮᱱᱟᱜ ᱞᱮᱠᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱟᱢᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱚᱱᱟ ᱴᱮᱞᱤᱣᱤᱡᱟᱱ ᱨᱮ ᱢᱮᱱᱟᱜ ᱞᱮᱠᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/waves.c:104 msgid "Waves" -msgstr "ᱦᱮᱞᱠᱟᱣ " +msgstr "ᱦᱮᱞᱠᱟᱣ ᱠᱚ" #: ../../magic/src/waves.c:106 msgid "Wavelets" -msgstr "ᱠᱟᱹᱪ ᱦᱮᱞᱠᱟᱣ" +msgstr "ᱠᱟᱹᱪ ᱦᱮᱞᱠᱟᱣ ᱠᱚ" #: ../../magic/src/waves.c:115 msgid "" "Click to make the picture horizontally wavy. Click toward the top for " "shorter waves, the bottom for taller waves, the left for small waves, and " "the right for long waves." -msgstr "" -"ᱪᱤᱛᱟᱹᱨ ᱜᱤᱛᱤᱪ ᱛᱮᱭᱟᱜ ᱠᱤᱲᱪᱚᱝ ᱠᱚᱲᱪᱚᱝ ᱦᱮᱞᱠᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ. ᱠᱷᱟᱴᱚ ᱦᱮᱞᱠᱟᱣ " -"ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱪᱚᱴ ᱥᱮᱫ , ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱟᱛᱟᱨ, ᱦᱩᱰᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ " -"ᱞᱮᱸᱜᱟ, ᱟᱨ ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱡᱚᱡᱚᱢ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱜᱤᱛᱤᱪ ᱛᱮᱭᱟᱜ ᱠᱤᱲᱪᱚᱝ ᱠᱚᱲᱪᱚᱝ ᱦᱮᱞᱠᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾ ᱠᱷᱟᱴᱚ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱪᱚᱴ ᱥᱮᱫ , ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱟᱛᱟᱨ, ᱦᱩᱰᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱮᱸᱜᱟ, ᱟᱨ ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱡᱚᱡᱚᱢ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/waves.c:118 msgid "" "Click to make the picture vertically wavy. Click toward the top for shorter " "waves, the bottom for taller waves, the left for small waves, and the right " "for long waves." -msgstr "" -"ᱪᱤᱛᱟᱹᱨ ᱛᱤᱸᱜᱩ ᱛᱮᱭᱟᱜ ᱠᱤᱲᱪᱚᱝ ᱠᱚᱲᱪᱚᱝ ᱦᱮᱞᱠᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ. ᱠᱷᱟᱴᱚ ᱦᱮᱞᱠᱟᱣ " -"ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱪᱚᱴ ᱥᱮᱫ , ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱟᱛᱟᱨ, ᱦᱩᱰᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ " -"ᱞᱮᱸᱜᱟ, ᱟᱨ ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱡᱚᱡᱚᱢ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱪᱤᱛᱟᱹᱨ ᱛᱤᱸᱜᱩ ᱛᱮᱭᱟᱜ ᱠᱤᱲᱪᱚᱝ ᱠᱚᱲᱪᱚᱝ ᱦᱮᱞᱠᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ ᱾ ᱠᱷᱟᱴᱚ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱪᱚᱴ ᱥᱮᱫ , ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱟᱛᱟᱨ, ᱦᱩᱰᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱞᱮᱸᱜᱟ, ᱟᱨ ᱡᱤᱞᱤᱧ ᱦᱮᱞᱠᱟᱣ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱡᱚᱡᱚᱢ ᱚᱛᱟᱭ ᱢᱮ ᱾" #: ../../magic/src/xor.c:93 -#, fuzzy msgid "Xor Colors" -msgstr "ᱨᱚᱝ ᱠᱚ" +msgstr "Xor ᱨᱚᱸᱝ ᱠᱚ" #: ../../magic/src/xor.c:99 -#, fuzzy msgid "Click and drag to draw a XOR effect" -msgstr "ᱛᱟᱸᱛ ᱦᱩᱱᱟᱹᱨ ᱛᱮ ᱛᱮᱭᱟᱨᱟᱜ ᱥᱟᱨ ᱜᱟᱨ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "XOR ᱯᱚᱨᱵᱷᱟᱣ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱢᱟᱩᱥ ᱛᱮ ᱚᱨ ᱟᱨ ᱚᱛᱟᱭ ᱢᱮ" #: ../../magic/src/xor.c:101 -#, fuzzy msgid "Click to draw a XOR effect on the whole picture" -msgstr "ᱟᱢᱟᱜ ᱜᱚᱴᱟ ᱪᱤᱛᱟᱹᱨ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱨᱱᱚ ᱯᱚᱨᱵᱷᱟᱣ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ." +msgstr "ᱯᱩᱨᱟᱹ ᱪᱤᱛᱟᱹᱨ ᱠᱚᱨᱮ XOR ᱯᱚᱨᱵᱷᱟᱣ ᱟᱹᱜᱩ ᱞᱟᱹᱜᱤᱫ ᱚᱛᱟᱭ ᱢᱮ" From 5bd27953e5bc426282665f0929757c019ccd3c15 Mon Sep 17 00:00:00 2001 From: prasantahembram Date: Sun, 25 Oct 2020 16:18:30 +0530 Subject: [PATCH 23/41] Signed-off-by: prasantahembram --- src/po/sat@olchiki.po | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/po/sat@olchiki.po b/src/po/sat@olchiki.po index 330093889..92edf2db9 100644 --- a/src/po/sat@olchiki.po +++ b/src/po/sat@olchiki.po @@ -1,12 +1,19 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# msgid "" -msgstr "Project-Id-Version: Santali tux\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-08-15 16:42-0700\n" -"Language: en\n" +"PO-Revision-Date: 2013-07-27 14:50+0530\n" +"Last-Translator: Prasanta Hembram \n" +"Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: POEditor.com\n" #. Response to Black (0, 0, 0) color selected #: ../colors.h:86 From 810d8e0c22c14f4c165ee6ba4ec6e5247938c56c Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 25 Oct 2020 15:51:36 -0700 Subject: [PATCH 24/41] Slight clean-up to CHANGES --- docs/CHANGES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index f7cf848a4..3826a2ed8 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -132,7 +132,6 @@ $Id$ TOYAMA Shin-ichi * Santali translation (Ol-Chiki) - Updated Santali Traslation, corrected some spelling mistakes. Prasanta Hembram * Misc From ba26daa6c6f9a87bf88af04d7fddf57e7f67eec5 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Thu, 29 Oct 2020 20:35:44 +0100 Subject: [PATCH 25/41] Adding Sardinian translation. --- docs/AUTHORS.txt | 3 + docs/CHANGES.txt | 6 + src/i18n.c | 5 + src/i18n.h | 1 + src/manpage/tuxpaint.1 | 4 + src/po/sc.po | 1480 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1499 insertions(+) create mode 100644 src/po/sc.po diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index 24740d864..97c392645 100644 --- a/docs/AUTHORS.txt +++ b/docs/AUTHORS.txt @@ -918,6 +918,9 @@ $Id$ Ganesh Murmu Prasanta Hembram + * Sardinian translation + Flavia Floris + * Scottish Gaelic Niall Tracey Michael "Akerbeltz" Bauer diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 3826a2ed8..b798e639b 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -114,6 +114,12 @@ $Id$ descriptions, if we failed to know what language to use (see above). + * New Translations: + ----------------- + + * Sardinian translation + Flavia Floris + * Translation Updates: -------------------- * Basque translation diff --git a/src/i18n.c b/src/i18n.c index 205e65140..4727551c7 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -155,6 +155,7 @@ const char *lang_prefixes[NUM_LANGS] = { "sat@olchiki", "sat", "sa", + "sc", "sd", "sd@devanagari", "shs", @@ -400,6 +401,8 @@ static const language_to_locale_struct language_to_locale_array[] = { {"sanskrit", "sa_IN.UTF-8"}, {"santali-devaganari", "sat_IN.UTF-8"}, {"santali-ol-chiki", "sat@olchiki"}, + {"sardinian", "sc_IT"}, + {"sardu", "sc_IT"}, {"serbian", "sr_RS.UTF-8"}, /* Was sr_YU, but that's not in /usr/share/i18n/SUPPORTED, and sr_RS is -bjk 2014.08.04 */ {"serbian-latin", "sr_RS@latin"}, {"shuswap", "shs_CA.UTF-8"}, @@ -546,6 +549,7 @@ static void show_lang_usage(int exitcode) /* sa */ " sanskrit\n" /* sat */ " santali-devaganari\n" /* sat@olchiki */ " santali-ol-chiki\n" +/* sc */ " sardinian sardu\n" /* gd */ " scottish scottish-gaelic ghaidhlig\n" /* sr */ " serbian\n" /* sr@latin */ " serbian-latin\n" @@ -694,6 +698,7 @@ static void show_locale_usage(FILE * f, const char *const prg) " sa_IN (Sanskrit)\n" " sat_IN (Santali)\n" " sat@olchiki (Santali (Ol-Chiki))\n" + " sc_IT (Sardinian)\n" " sd_IN@devanagari (Sindhi (Devanagari))\n" " sd_IN (Sindhii (Perso-Arabic))\n" " shs_CA (Shuswap Secwepemctin)\n" diff --git a/src/i18n.h b/src/i18n.h index 8d090833e..37b023b48 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -137,6 +137,7 @@ enum LANG_SAT_OL_CHIKI, LANG_SAT, /* Santali */ LANG_SA, /* Sanskrit */ + LANG_SC, /* Sardinian */ LANG_SD, /* Sindhi (Perso-Arabic) */ LANG_SD_DEVANAGARI, /* Sindhi (Devanagari) */ LANG_SHS, /* Shuswap */ diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index bd0b9444c..4569b3322 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -839,6 +839,9 @@ santali-devaganari santali-ol-chiki .TP 2 - +sardinian +.TP 2 +- scottish | scottish-gaelic | ghaidhlig .TP 2 - @@ -1227,6 +1230,7 @@ Damian Yerrick, Muhammad Najmi Ahmad Zabidi, Eugene Zelenko, Martin Zhekov, +Flavia Floris, and Huang Zuzhen. diff --git a/src/po/sc.po b/src/po/sc.po new file mode 100644 index 000000000..d9df52a5b --- /dev/null +++ b/src/po/sc.po @@ -0,0 +1,1480 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-15 16:42-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Response to Black (0, 0, 0) color selected +#: ../colors.h:86 +msgid "Black!" +msgstr "Nieddu!" + +#. Response to Dark grey (128, 128, 128) color selected +#: ../colors.h:89 +msgid "Dark grey! Some people spell it “dark gray”." +msgstr "Murru oscuru! Ddi narant puru “canu oscuru”." + +#. Response to Light grey (192, 192, 192) color selected +#: ../colors.h:92 +msgid "Light grey! Some people spell it “light gray”." +msgstr "Murru craru! Ddi narant puru “canu craru”." + +#. Response to White (255, 255, 255) color selected +#: ../colors.h:95 +msgid "White!" +msgstr "Biancu!" + +#. Response to Red (255, 0, 0) color selected +#: ../colors.h:98 +msgid "Red!" +msgstr "Ruju!" + +#. Response to Orange (255, 128, 0) color selected +#: ../colors.h:101 +msgid "Orange!" +msgstr "Aràngiu!" + +#. Response to Yellow (255, 255, 0) color selected +#: ../colors.h:104 +msgid "Yellow!" +msgstr "Grogu!" + +#. Response to Light green (160, 228, 128) color selected +#: ../colors.h:107 +msgid "Light green!" +msgstr "Birde craru!" + +#. Response to Dark green (33, 148, 70) color selected +#: ../colors.h:110 +msgid "Dark green!" +msgstr "Birde oscuru!" + +#. Response to "Sky" blue (138, 168, 205) color selected +#: ../colors.h:113 +msgid "Sky blue!" +msgstr "Biaitu!" + +#. Response to Blue (50, 100, 255) color selected +#: ../colors.h:116 +msgid "Blue!" +msgstr "Asulu!" + +#. Response to Lavender (186, 157, 255) color selected +#: ../colors.h:119 +msgid "Lavender!" +msgstr "Lavanda!" + +#. Response to Purple (128, 0, 128) color selected +#: ../colors.h:122 +msgid "Purple!" +msgstr "Tanadu!" + +#. Response to Pink (255, 165, 211) color selected +#: ../colors.h:125 +msgid "Pink!" +msgstr "Rosa!" + +#. Response to Brown (128, 80, 0) color selected +#: ../colors.h:128 +msgid "Brown!" +msgstr "Castàngiu!" + +#. Response to Tan (226, 189, 166) color selected +#: ../colors.h:131 +msgid "Tan!" +msgstr "Tannu!" + +#. Response to Beige (247, 228, 219) color selected +#: ../colors.h:134 +msgid "Beige!" +msgstr "Beige!" + +#. First, the blacklist. We list font families that can crash Tux Paint +#. via bugs in the SDL_ttf library. We also test fonts to be sure that +#. they have both uppercase and lowercase letters. Note that we do not +#. test for "Aa", because it is OK if uppercase and lowercase are the +#. same (but not nice -- such fonts get a low score later). +#. +#. Most locales leave the blacklist strings alone: "QX" and "qx" +#. (it is less destructive to use the scoring strings instead) +#. +#. Locales that absolutely require all fonts to have some +#. extra characters should use "QX..." and "qx...", where "..." +#. are some characters you absolutely require in all fonts. +#. +#. Locales with absolutely NO use for ASCII may use "..." and "...", +#. where "..." are some characters you absolutely require in +#. all fonts. This would be the case for a locale in which it is +#. impossible for a user to type ASCII letters. +#. +#. Most translators should use scoring instead. +#: ../dirwalk.c:177 +msgid "qx" +msgstr "qx" + +#: ../dirwalk.c:177 +msgid "QX" +msgstr "QX" + +#. TODO: weight specification +#. Now we score fonts to ensure that the best ones will be placed at +#. the top of the list. The user will see them first. This sorting is +#. especially important for users who have scroll buttons disabled. +#. Translators should do whatever is needed to put crummy fonts last. +#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') +#: ../dirwalk.c:202 +msgid "oO" +msgstr "oO" + +#. common punctuation (e.g., '?', '!', '.', ',', etc.) +#: ../dirwalk.c:205 +msgid ",.?!" +msgstr ",.?!" + +#. uncommon punctuation (e.g., '@', '#', '*', etc.) +#: ../dirwalk.c:208 +msgid "`%_@$~#{<(^&*" +msgstr "`%_@$~#{<(^&*" + +#. digits (e.g., '0', '1' and '7') +#: ../dirwalk.c:211 +msgid "017" +msgstr "017" + +#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) +#: ../dirwalk.c:214 +msgid "O0" +msgstr "O0" + +#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) +#: ../dirwalk.c:217 +msgid "1Il|" +msgstr "1Il|" + +#: ../dirwalk.c:221 +msgid "<1>spare-1a" +msgstr "<1>spare-1a" + +#: ../dirwalk.c:222 +msgid "<1>spare-1b" +msgstr "<1>spare-1b" + +#: ../dirwalk.c:223 +msgid "<9>spare-9a" +msgstr "<9>spare-9a" + +#: ../dirwalk.c:224 +msgid "<9>spare-9b" +msgstr "<9>spare-9b" + +#. Congratulations #1 +#: ../great.h:37 +msgid "Great!" +msgstr "Bene!" + +#. Congratulations #2 +#: ../great.h:40 +msgid "Cool!" +msgstr "Bellu!" + +#. Congratulations #3 +#: ../great.h:43 +msgid "Keep it up!" +msgstr "Sighi de aici!" + +#. Congratulations #4 +#: ../great.h:46 +msgid "Good job!" +msgstr "Bene fatu!" + +#. Input Method: English mode +#: ../im.c:74 +msgid "English" +msgstr "Inglesu" + +#. Input Method: Japanese Romanized Hiragana mode +#: ../im.c:77 +msgid "Hiragana" +msgstr "Hiragana" + +#. Input Method: Japanese Romanized Katakana mode +#: ../im.c:80 +msgid "Katakana" +msgstr "Katakana" + +#. Input Method: Korean Hangul 2-Bul mode +#: ../im.c:83 +msgid "Hangul" +msgstr "Hangul" + +#. Input Method: Thai mode +#: ../im.c:86 +msgid "Thai" +msgstr "Tailandesu" + +#. Input Method: Traditional Chinese mode +#: ../im.c:89 +msgid "ZH_TW" +msgstr "ZH_TW" + +#. Square shape tool (4 equally-lengthed sides at right angles) +#: ../shapes.h:234 ../shapes.h:235 +msgid "Square" +msgstr "Cuadradu" + +#. Rectangle shape tool (4 sides at right angles) +#: ../shapes.h:238 ../shapes.h:239 +msgid "Rectangle" +msgstr "Retàngulu" + +#. Circle shape tool (X radius and Y radius are the same) +#: ../shapes.h:242 ../shapes.h:243 +msgid "Circle" +msgstr "Tzircu" + +#. Ellipse shape tool (X radius and Y radius may differ) +#: ../shapes.h:246 ../shapes.h:247 +msgid "Ellipse" +msgstr "Ellisse" + +#. Triangle shape tool (3 sides) +#: ../shapes.h:250 ../shapes.h:251 +msgid "Triangle" +msgstr "Triàngulu" + +#. Pentagone shape tool (5 sides) +#: ../shapes.h:254 ../shapes.h:255 +msgid "Pentagon" +msgstr "Pentàgonu" + +#. Rhombus shape tool (4 sides, not at right angles) +#: ../shapes.h:258 ../shapes.h:259 +msgid "Rhombus" +msgstr "Rombu" + +#. Octagon shape tool (8 sides) +#: ../shapes.h:262 ../shapes.h:263 +msgid "Octagon" +msgstr "Otàgonu" + +#. Triangle star (3 points star) +#. Rhombus star (4 points star) +#. Pentagone star (5 points star) +#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 +#: ../shapes.h:278 ../shapes.h:281 +msgid "Star" +msgstr "Istella" + +#. Description of a square +#: ../shapes.h:289 ../shapes.h:290 +msgid "A square is a rectangle with four equal sides." +msgstr "Unu cuadradu est unu retàngulu cun lados uguales." + +#. Description of a rectangle +#: ../shapes.h:293 ../shapes.h:294 +msgid "A rectangle has four sides and four right angles." +msgstr "Unu retàngulu tenet bator lados e bator àngulos retos." + +#. Description of a circle +#: ../shapes.h:297 ../shapes.h:298 +msgid "" +"A circle is a curve where all points have the same distance from the center." +msgstr "" +"Unu tzircu est una curva de puntos chi tenent totus sa pròpria distàntzia dae su tzentru." + +#. Description of an ellipse +#: ../shapes.h:301 ../shapes.h:302 +msgid "An ellipse is a stretched circle." +msgstr "Un'ellisse est unu tzircu iscrefadu." + +#. Description of a triangle +#: ../shapes.h:305 ../shapes.h:306 +msgid "A triangle has three sides." +msgstr "Unu triàngulu tenet tres lados." + +#. Description of a pentagon +#: ../shapes.h:309 ../shapes.h:310 +msgid "A pentagon has five sides." +msgstr "Unu pentàgonu tenet chimbe lados." + +#. Description of a rhombus +#: ../shapes.h:313 ../shapes.h:314 +msgid "A rhombus has four equal sides, and opposite sides are parallel." +msgstr "Unu rombu tenet bator lados uguales e parallelos a duos a duos." + +#. Description of an octagon +#: ../shapes.h:317 ../shapes.h:318 +msgid "An octagon has eight equal sides." +msgstr "Un'otàgonu tenet oto lados uguales." + +#: ../shapes.h:320 ../shapes.h:321 +msgid "A star with 3 points." +msgstr "Un'istella a 3 puntas." + +#: ../shapes.h:322 ../shapes.h:323 +msgid "A star with 4 points." +msgstr "Un'istella a 4 puntas." + +#: ../shapes.h:324 ../shapes.h:325 +msgid "A star with 5 points." +msgstr "Un'istella a 5 puntas." + +#: ../shapes.h:372 +msgid "Draw shapes from the center." +msgstr "Disinna formas dae su tzentru." + +#: ../shapes.h:373 +msgid "Draw shapes from a corner." +msgstr "Disinna formas dae un'àngulu." + +#. Title of tool selector (buttons down the left) +#: ../titles.h:56 +msgid "Tools" +msgstr "Ainas" + +#. Title of color palette (buttons across the bottom) +#: ../titles.h:59 +msgid "Colors" +msgstr "Colores" + +#. Title of brush selector (buttons down the right for paint and line tools) +#: ../titles.h:62 +msgid "Brushes" +msgstr "Pinzellos" + +#. Title of eraser selector (buttons down the right for eraser tool) +#: ../titles.h:65 +msgid "Erasers" +msgstr "Gommas" + +#. Title of stamp selector (buttons down the right for stamps tool) +#: ../titles.h:68 +msgid "Stamps" +msgstr "Timbros" + +#. Title of shape selector (buttons down the right for shapes tool) +#. Shape creation tool (square, circle, etc.) +#: ../titles.h:71 ../tools.h:71 +msgid "Shapes" +msgstr "Formas" + +#. Title of font selector (buttons down the right for text and label tools) +#: ../titles.h:74 +msgid "Letters" +msgstr "Lìteras" + +#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) +#. "Magic" effects tools (blur, flip image, etc.) +#: ../titles.h:77 ../tools.h:83 +msgid "Magic" +msgstr "Màgia" + +#. Freehand painting tool +#: ../tools.h:62 +msgid "Paint" +msgstr "Pinta" + +#. Stamp tool (aka Rubber Stamps) +#: ../tools.h:65 +msgid "Stamp" +msgstr "Timbru" + +#. Line drawing tool +#: ../tools.h:68 +msgid "Lines" +msgstr "Lìnias" + +#. Text tool +#: ../tools.h:74 +msgid "Text" +msgstr "Testu" + +#. Label tool +#: ../tools.h:77 +msgid "Label" +msgstr "Eticheta" + +#. Fill tool +#: ../tools.h:80 +msgid "Fill" +msgstr "Prena" + +#. Undo last action +#: ../tools.h:86 +msgid "Undo" +msgstr "Iscontza" + +#. Redo undone action +#: ../tools.h:89 +msgid "Redo" +msgstr "Torra·ddu a fàghere" + +#. Eraser tool +#: ../tools.h:92 +msgid "Eraser" +msgstr "Gomma" + +#. Start a new picture +#: ../tools.h:95 +msgid "New" +msgstr "Nou" + +#. 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 +msgid "Open" +msgstr "Aberi" + +#. Save the current picture +#: ../tools.h:101 +msgid "Save" +msgstr "Sarva" + +#. Print the current picture +#: ../tools.h:104 +msgid "Print" +msgstr "Imprenta" + +#. Quit/exit Tux Paint application +#: ../tools.h:107 +msgid "Quit" +msgstr "Essi" + +#. Paint tool instructions +#: ../tools.h:115 +msgid "Pick a color and a brush shape to draw with." +msgstr "Sèbera unu colore e una forma de pinzellu pro disinnare." + +#. Stamp tool instructions +#: ../tools.h:118 +msgid "Pick a picture to stamp around your drawing." +msgstr "Sèbera un'immagine pro timbrare su disinnu." + +#. Line tool instructions +#: ../tools.h:121 +msgid "Click to start drawing a line. Let go to complete it." +msgstr "Incarca pro marcare una lìnia. Iscapa pro dda acabbare." + +#: ../tools.h:125 +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 "" +"Sèbera una forma. Incarca pro cumintzare a disinnare, traga e iscapa cando bides sa mannària " +"chi boles. Move su cursore pro rodeare e incarca pro disinnare." + +#: ../tools.h:129 +msgid "" +"Choose a style of text. Click on your drawing and you can start typing. " +"Press [Bae] or [Tab] to complete the text." +msgstr "" +"Sèbera un'istile de testu. Incarca subra su disinnu pro cumintzare a digitare. " +"Incarca [Bae] o [Tab] pro cumpletare su testu." + +#: ../tools.h:133 +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 existing label, you can move it, edit it and change its text " +"style." +msgstr "" +"Sèbera un'istile de testu. Incarca subra su disinnu pro cumintzare a digitare. " +"Incarca [Bae] o [Tab] pro cumpletare su testu. Impreende su butone de seletzione " +"e incarchende subra un'eticheta chi esistet, dda podes mòvere, modificare e cambiare s'istile suo " +"de testu." + +#. Fill tool instructions +#: ../tools.h:136 +msgid "Click in the picture to fill that area with color." +msgstr "Incarca subra s'immàgine pro colorare s'àrea." + +#. Magic tool instruction +#: ../tools.h:139 +msgid "Pick a magical effect to use on your drawing!" +msgstr "Sèbera un'efetu màgicu de impreare in su disinnu!" + +#. Response to 'undo' action +#: ../tools.h:142 +msgid "Undo!" +msgstr "Iscontza!" + +#. Response to 'redo' action +#: ../tools.h:145 +msgid "Redo!" +msgstr "Torra·ddu a fàghere!" + +#. Eraser tool +#: ../tools.h:148 +msgid "Eraser!" +msgstr "Gomma!" + +#. Response to 'start a new image' action +#: ../tools.h:151 +msgid "Pick a color or picture with which to start a new drawing." +msgstr "Sèbera unu colore o un'immàgine pro cumintzare unu disinnu nou." + +#. Response to 'open' action (while file dialog is being constructed) +#: ../tools.h:154 +msgid "Open…" +msgstr "Aberi..." + +#. Response to 'save' action +#: ../tools.h:157 +msgid "Your image has been saved!" +msgstr "S'immàgine tua est sarvada!" + +#. Response to 'print' action (while printing, or print dialog is being used) +#: ../tools.h:160 +msgid "Printing…" +msgstr "Imprentende..." + +#. Response to 'quit' (exit) action +#: ../tools.h:163 +msgid "Bye bye!" +msgstr "A si bìdere!" + +#. Instruction while using Line tool (after click, before release) +#: ../tools.h:167 +msgid "Let go of the button to complete the line." +msgstr "Iscapa su butone pro cumpletare sa lìnia." + +#. Instruction while using Shape tool (after first click, before release) +#: ../tools.h:170 +msgid "Hold the button to stretch the shape." +msgstr "Mantene incarcadu su butone pro allonghiare sa forma." + +#. Instruction while finishing Shape tool (after release, during rotation step before second click) +#: ../tools.h:173 +msgid "Move the mouse to rotate the shape. Click to draw it." +msgstr "Move su cursore pro rodeare sa forma. Incarca pro ddu disinnare." + +#. Notification that 'New' action was aborted (current image would have been lost) +#: ../tools.h:176 +msgid "OK then… Let’s keep drawing this one!" +msgstr "Andat bene... Sighimus a disinnare custu!" + +#. Prompt to confirm user wishes to quit +#: ../tuxpaint.c:2134 +msgid "Do you really want to quit?" +msgstr "A beru boles essire?" + +#. Quit prompt positive response (quit) +#: ../tuxpaint.c:2137 +msgid "Yes, I’m done!" +msgstr "Eja, apo fatu!" + +#. Quit prompt negative response (don't quit) +#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 +msgid "No, take me back!" +msgstr "No, torra in segus!" + +#. Current picture is not saved; user is quitting +#: ../tuxpaint.c:2144 +msgid "If you quit, you’ll lose your picture! Save it?" +msgstr "Si essis, as a pèrdere s'immàgine tua! Boles sarvare?" + +#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 +msgid "Yes, save it!" +msgstr "Eja, sarva!" + +#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 +msgid "No, don’t bother saving!" +msgstr "No, non bògio sarvare!" + +#. Current picture is not saved; user is opening another picture +#: ../tuxpaint.c:2149 +msgid "Save your picture first?" +msgstr "Boles sarvare s'immàgine, prima?" + +#. Error opening picture +#: ../tuxpaint.c:2154 +msgid "Can’t open that picture!" +msgstr "Impossìbile abèrrere s'immàgine!" + +#. Generic dialog dismissal +#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 +#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 +msgid "OK" +msgstr "AB" + +#. Notification that 'Open' dialog has nothing to show +#: ../tuxpaint.c:2161 +msgid "There are no saved files!" +msgstr "Perunu archìviu sarvadu!" + +#. Verification of print action +#: ../tuxpaint.c:2165 +msgid "Print your picture now?" +msgstr "Boles imprentare s'immàgine immoe?" + +#: ../tuxpaint.c:2166 +msgid "Yes, print it!" +msgstr "Eja, imprenta!" + +#. Confirmation of successful (we hope) printing +#: ../tuxpaint.c:2170 +msgid "Your picture has been printed!" +msgstr "Immàgine imprentada!" + +#. We got an error printing +#: ../tuxpaint.c:2174 +msgid "Sorry! Your picture could not be printed!" +msgstr "Impossìbile imprentare s'immàgine!" + +#. Notification that it's too soon to print again (--printdelay option is in effect) +#: ../tuxpaint.c:2177 +msgid "You can’t print yet!" +msgstr "Non podes ancora imprentare!" + +#. Prompt to confirm erasing a picture in the Open dialog +#: ../tuxpaint.c:2181 +msgid "Erase this picture?" +msgstr "Boles cantzellare s'immàgine?" + +#: ../tuxpaint.c:2182 +msgid "Yes, erase it!" +msgstr "Eja, cantzella!" + +#: ../tuxpaint.c:2183 +msgid "No, don’t erase it!" +msgstr "No, non bògio cantzellare!" + +#. Reminder that Mouse Button 1 is the button to use in Tux Paint +#: ../tuxpaint.c:2186 +msgid "Remember to use the left mouse button!" +msgstr "Regorda·ti de impreare su butone de manca de su cursore!" + +#. Confirmation of successful (we hope) image export +#: ../tuxpaint.c:2190 +msgid "Your picture has been exported!" +msgstr "Immàgine esportada!" + +#: ../tuxpaint.c:2191 +msgid "Your slideshow GIF has been exported!" +msgstr "GIF de presentatzione esportada!" + +#. We got an error exporting +#: ../tuxpaint.c:2195 +msgid "Sorry! Your picture could not be exported!" +msgstr "Impossìbile esportare s'immàgine!" + +#: ../tuxpaint.c:2196 +msgid "Sorry! Your slideshow GIF could not be exported!" +msgstr "Impossìbile esportare sa GIF de presentatzione!" + +#. Slideshow instructions +#: ../tuxpaint.c:2200 +msgid "Choose the pictures you want, then click “Play”." +msgstr "Sèbera is immàgines chi boles, poi incarca “Reprodue”." + +#. Sound has been muted (silenced) via keyboard shortcut +#: ../tuxpaint.c:2407 +msgid "Sound muted." +msgstr "A sa muda." + +#. Sound has been unmuted (unsilenced) via keyboard shortcut +#: ../tuxpaint.c:2412 +msgid "Sound unmuted." +msgstr "Sonu ativu." + +#. Wait while Text tool finishes loading fonts +#: ../tuxpaint.c:3167 +msgid "Please wait…" +msgstr "Iseta…" + +#. Open dialog: 'Erase' button, to erase/deleted the selected picture +#: ../tuxpaint.c:7923 +msgid "Erase" +msgstr "Cantzella" + +#. Open dialog: 'Slides' button, to switch to slide show mode +#: ../tuxpaint.c:7926 +msgid "Slides" +msgstr "Diapositivas" + +#. Open dialog: 'Export' button, to copy an image to an easily-accessible location +#: ../tuxpaint.c:7929 +msgid "Export" +msgstr "Esporta" + +#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture +#: ../tuxpaint.c:7932 +msgid "Back" +msgstr "In segus" + +#. Slideshow: 'Play' button, to begin a slideshow sequence +#: ../tuxpaint.c:7935 +msgid "Play" +msgstr "Reprodue" + +#. Slideshow: 'GIF Export' button, to create an animated GIF +#: ../tuxpaint.c:7938 +msgid "GIF Export" +msgstr "Esporta GIF" + +#. Slideshow: 'Next' button, to load next slide (image) +#: ../tuxpaint.c:7941 +msgid "Next" +msgstr "Sighi" + +#. 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 +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 +msgid "Yes" +msgstr "Eja" + +#: ../tuxpaint.c:12073 +msgid "No" +msgstr "Nono" + +#. Prompt to ask whether user wishes to save over old version of their file +#: ../tuxpaint.c:13190 +msgid "Replace the picture with your changes?" +msgstr "Boles cambiare s'immàgine cun is mudas noas?" + +#. Positive response to saving over old version +#. (like a 'File:Save' action in other applications) +#: ../tuxpaint.c:13194 +msgid "Yes, replace the old one!" +msgstr "Eja, càmbia dae sa de in antis!" + +#. Negative response to saving over old version (saves a new image) +#. (like a 'File:Save As...' action in other applications) +#: ../tuxpaint.c:13198 +msgid "No, save a new file!" +msgstr "No, sarva un'archìviu nou!" + +#. Let user choose an image: +#. Instructions for 'Open' file dialog +#: ../tuxpaint.c:14454 +msgid "Choose the picture you want, then click “Open”." +msgstr "Sèbera s'immàgine chi boles, poi incarca “Aberi”." + +#. 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 "Seletziona duos o prus disinnos pro nde fàghere una GIF." + +#: ../tuxpaint.c:23539 +msgid "Select a color from your drawing." +msgstr "Seletziona unu colore dae su disinnu." + +#: ../tuxpaint.c:23551 +msgid "Pick a color." +msgstr "Sèbera unu colore." + +#: ../tuxpaint.desktop.in.h:1 +msgid "Tux Paint" +msgstr "Tux Paint" + +#: ../tuxpaint.desktop.in.h:2 +msgid "Drawing program" +msgstr "Programma de disinnu" + +#: ../tuxpaint.desktop.in.h:3 +msgid "A drawing program for children." +msgstr "Programma de disinnu pro sa pitzocalla." + +#: ../../magic/src/alien.c:68 +msgid "Color Shift" +msgstr "Càmbiu de colore" + +#: ../../magic/src/alien.c:72 +msgid "Click and drag the mouse to change the colors in parts of your picture." +msgstr "Incarca e traga su cursore pro mudare colore in partes de s'immàgine." + +#: ../../magic/src/alien.c:73 +msgid "Click to change the colors in your entire picture." +msgstr "Incarca pro mudare is colores in totu s'immàgine." + +#: ../../magic/src/blind.c:116 +msgid "Blind" +msgstr "Persiana" + +#: ../../magic/src/blind.c:123 +msgid "" +"Click towards the edge of your picture to pull window blinds over it. Move " +"perpendicularly to open or close the blinds." +msgstr "" +"Incarca conca a s'oru de s'immàgine pro nche ddi calare is persianas de sa bentana. Move·ti " +"in manera perpendiculare pro abèrrere o serrare is persianas." + +#: ../../magic/src/blocks_chalk_drip.c:129 +msgid "Blocks" +msgstr "Blocos" + +#: ../../magic/src/blocks_chalk_drip.c:131 +msgid "Chalk" +msgstr "Ghisu" + +#: ../../magic/src/blocks_chalk_drip.c:133 +msgid "Drip" +msgstr "Gùtiu" + +#: ../../magic/src/blocks_chalk_drip.c:142 +msgid "Click and drag the mouse around to make the picture blocky." +msgstr "Incarca e traga su cursore in tundu pro fàghere s'immàgine a blocos." + +#: ../../magic/src/blocks_chalk_drip.c:144 +msgid "" +"Click and drag the mouse around to turn the picture into a chalk drawing." +msgstr "" +"Incarca e traga su cursore pro furriare s'immàgine in disinnu de ghisu." + +#: ../../magic/src/blocks_chalk_drip.c:146 +msgid "Click and drag the mouse around to make the picture drip." +msgstr "Incarca e traga su cursore in tundu pro fàghere s'immàgine a gùtios." + +#: ../../magic/src/blur.c:80 +msgid "Blur" +msgstr "Isfoca" + +#: ../../magic/src/blur.c:84 +msgid "Click and drag the mouse around to blur the image." +msgstr "Incarca e traga su cursore pro isfocare s'immàgine." + +#: ../../magic/src/blur.c:85 +msgid "Click to blur the entire image." +msgstr "Incarca pro isfocare totu s'immàgine." + +#. Both are named "Bricks", at the moment: +#: ../../magic/src/bricks.c:120 +msgid "Bricks" +msgstr "Matones" + +#: ../../magic/src/bricks.c:127 +msgid "Click and drag to draw large bricks." +msgstr "Incarca e traga pro disinnare matones mannos." + +#: ../../magic/src/bricks.c:129 +msgid "Click and drag to draw small bricks." +msgstr "Incarca e traga pro disinnare matones minores." + +#: ../../magic/src/calligraphy.c:124 +msgid "Calligraphy" +msgstr "Calligrafia" + +#: ../../magic/src/calligraphy.c:131 +msgid "Click and drag the mouse around to draw in calligraphy." +msgstr "Incarca e traga su cursore pro disinnare in calligrafia." + +#: ../../magic/src/cartoon.c:103 +msgid "Cartoon" +msgstr "Cartone" + +#: ../../magic/src/cartoon.c:109 +msgid "Click and drag the mouse around to turn the picture into a cartoon." +msgstr "Incarca e traga su cursore pro furriare s'immàgine in cartone." + +#: ../../magic/src/confetti.c:83 +msgid "Confetti" +msgstr "Coriàndulos" + +#: ../../magic/src/confetti.c:88 +msgid "Click to throw confetti!" +msgstr "Incarca pro ghetare coriàndulos!" + +#: ../../magic/src/distortion.c:134 +msgid "Distortion" +msgstr "Torchidura" + +#: ../../magic/src/distortion.c:143 +msgid "Click and drag the mouse to cause distortion in your picture." +msgstr "Incarca e traga su cursore pro tòrchere in s'immàgine." + +#: ../../magic/src/emboss.c:101 +msgid "Emboss" +msgstr "Rilievu" + +#: ../../magic/src/emboss.c:107 +msgid "Click and drag the mouse to emboss the picture." +msgstr "Incarca e traga su cursore pro pònnere s'immàgine in rilievu." + +#: ../../magic/src/fade_darken.c:114 +msgid "Lighten" +msgstr "Lughe" + +#: ../../magic/src/fade_darken.c:116 +msgid "Darken" +msgstr "Oscura" + +#: ../../magic/src/fade_darken.c:127 +msgid "Click and drag the mouse to lighten parts of your picture." +msgstr "Incarca e traga su cursore pro lùghere partes de s'immàgine." + +#: ../../magic/src/fade_darken.c:129 +msgid "Click to lighten your entire picture." +msgstr "Incarca pro lùghere totu s'immàgine." + +#: ../../magic/src/fade_darken.c:134 +msgid "Click and drag the mouse to darken parts of your picture." +msgstr "Incarca e traga su cursore pro oscurare partes de s'immàgine." + +#: ../../magic/src/fade_darken.c:136 +msgid "Click to darken your entire picture." +msgstr "Incarca pro oscurare totu s'immàgine." + +#: ../../magic/src/fisheye.c:101 +msgid "Fisheye" +msgstr "Grandàngulu" + +#: ../../magic/src/fisheye.c:106 +msgid "Click on part of your picture to create a fisheye effect." +msgstr "Incarta in una parte de s'immàgine pro s'efetu grandàngulu." + +#: ../../magic/src/flower.c:144 +msgid "Flower" +msgstr "Frore" + +#: ../../magic/src/flower.c:150 +msgid "Click and drag to draw a flower stalk. Let go to finish the flower." +msgstr "Incarca e traga pro disinnare unu cambu de frore. Iscapa pro acabbare su frore." + +#: ../../magic/src/foam.c:114 +msgid "Foam" +msgstr "Ispuma" + +#: ../../magic/src/foam.c:120 +msgid "Click and drag the mouse to cover an area with foamy bubbles." +msgstr "Incarca e traga su cursore pro cobèrrere un'ispàtziu cun bollas de ispuma." + +#: ../../magic/src/fold.c:103 +msgid "Fold" +msgstr "Pinniga" + +#: ../../magic/src/fold.c:108 +msgid "" +"Choose a background color and click to turn the corner of the page over." +msgstr "" +"Sèbera unu colore de isfundu e incarca pro furriare s'àngulu de sa pàgina." + +#: ../../magic/src/fretwork.c:176 +msgid "Fretwork" +msgstr "Intàlliu" + +#: ../../magic/src/fretwork.c:182 +msgid "Click and drag to draw repetitive patterns. " +msgstr "Incarca e traga pro disinnare modellos in ripetitzione. " + +#: ../../magic/src/fretwork.c:184 +msgid "Click to surround your picture with repetitive patterns." +msgstr "Incarca pro incordonare s'immàgine cun modellos in ripetitzione." + +#: ../../magic/src/glasstile.c:104 +msgid "Glass Tile" +msgstr "Matone de birdu" + +#: ../../magic/src/glasstile.c:111 +msgid "Click and drag the mouse to put glass tile over your picture." +msgstr "Incarca e traga su cursore pro pònnere matones de birdu in s'immàgine." + +#: ../../magic/src/glasstile.c:113 +msgid "Click to cover your entire picture in glass tiles." +msgstr "Incarca pro cobèrrere totu s'immàgine de matones de birdu." + +#: ../../magic/src/grass.c:107 +msgid "Grass" +msgstr "Erba" + +#: ../../magic/src/grass.c:113 +msgid "Click and drag to draw grass. Don’t forget the dirt!" +msgstr "Incarca e traga pro disinnare s'erba. Regorda·ti sa terra!" + +#: ../../magic/src/halftone.c:35 +msgid "Halftone" +msgstr "Retinadura" + +#: ../../magic/src/halftone.c:39 +msgid "Click and drag to turn your drawing into a newspaper." +msgstr "Incarca e traga pro furriare su disinnu in unu giornale." + +#: ../../magic/src/kalidescope.c:119 +msgid "Symmetric Left/Right" +msgstr "Simmètricu a manca/dereta" + +#: ../../magic/src/kalidescope.c:123 +msgid "Symmetric Up/Down" +msgstr "Simmètricu in susu/bàsciu" + +#: ../../magic/src/kalidescope.c:127 +msgid "Pattern" +msgstr "Motivu" + +#: ../../magic/src/kalidescope.c:131 +msgid "Tiles" +msgstr "Matones" + +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:135 +msgid "Kaleidoscope" +msgstr "Caleidoscòpiu" + +#: ../../magic/src/kalidescope.c:146 +msgid "" +"Click and drag the mouse to draw with two brushes that are symmetric across " +"the left and right of your picture." +msgstr "" +"Incarca e traga su cursore pro disinnare cun duos pinzellos simmètricos rugrende " +"s'immàgine a manca e a dereta." + +#: ../../magic/src/kalidescope.c:152 +msgid "" +"Click and drag the mouse to draw with two brushes that are symmetric across " +"the top and bottom of your picture." +msgstr "" +"Incarca e traga su cursore pro disinnare cun duos pinzellos simmètricos rugrende " +"s'immàgine in artu e in bàsciu." + +#: ../../magic/src/kalidescope.c:156 +msgid "Click and drag the mouse to draw a pattern across the picture." +msgstr "Incarca e traga su cursore pro disinnare unu motivu rugrende s'immàgine." + +#: ../../magic/src/kalidescope.c:160 +msgid "" +"Click and drag the mouse to draw a pattern that is symmetric across the " +"picture." +msgstr "" +"Incarca e traga su cursore pro disinnare unu motivu chi siat simmètricu " +"rugrende s'immàgine." + +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:164 +msgid "" +"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." +msgstr "" +"Incarca e traga su cursore pro disinnare cun pinzellos simmètricos (unu caleidoscòpiu)." + +#: ../../magic/src/light.c:103 +msgid "Light" +msgstr "Lughe" + +#: ../../magic/src/light.c:109 +msgid "Click and drag to draw a beam of light on your picture." +msgstr "Incarca e traga pro disinnare unu bìculu de lughe in s'immàgine." + +#: ../../magic/src/metalpaint.c:98 +msgid "Metal Paint" +msgstr "Pintura metàllica" + +#: ../../magic/src/metalpaint.c:105 +msgid "Click and drag the mouse to paint with a metallic color." +msgstr "Incarca e traga su cursore pro pintare cun colore metàllicu." + +#: ../../magic/src/mirror_flip.c:110 +msgid "Mirror" +msgstr "Ispricu" + +#: ../../magic/src/mirror_flip.c:112 +msgid "Flip" +msgstr "Borta" + +#: ../../magic/src/mirror_flip.c:121 +msgid "Click to make a mirror image." +msgstr "Incarca pro creare un immàgine a ispricu." + +#: ../../magic/src/mirror_flip.c:123 +msgid "Click to flip the picture upside-down." +msgstr "Incarca pro bortare s'immàgine conca a bàsciu." + +#: ../../magic/src/mosaic.c:96 +msgid "Mosaic" +msgstr "Mosàicu" + +#: ../../magic/src/mosaic.c:100 +msgid "" +"Click and drag the mouse to add a mosaic effect to parts of your picture." +msgstr "" +"Incarca e traga su cursore pro ddi agiùnghere un'efetu mosàicu a partes de s'immàgine." + +#: ../../magic/src/mosaic.c:101 +msgid "Click to add a mosaic effect to your entire picture." +msgstr "Incarca pro ddi agiùnghere un'efetu mosàicu a totu s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:132 +msgid "Square Mosaic" +msgstr "Mosàicu cuadradu" + +#: ../../magic/src/mosaic_shaped.c:133 +msgid "Hexagon Mosaic" +msgstr "Mosàicu esagonale" + +#: ../../magic/src/mosaic_shaped.c:134 +msgid "Irregular Mosaic" +msgstr "Mosàicu irregulare" + +#: ../../magic/src/mosaic_shaped.c:140 +msgid "" +"Click and drag the mouse to add a square mosaic to parts of your picture." +msgstr "" +"Incarca e traga su cursore pro ddi agiùnghere unu mosàicu cuadradu a partes de s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:141 +msgid "Click to add a square mosaic to your entire picture." +msgstr "Incarca pro ddi agiùnghere unu mosàicu cuadradu a totu s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:145 +msgid "" +"Click and drag the mouse to add a hexagonal mosaic to parts of your picture." +msgstr "" +"Incarca e traga su cursore pro ddi agiùnghere unu mosàicu esagonale a partes de s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:146 +msgid "Click to add a hexagonal mosaic to your entire picture." +msgstr "Incarca pro ddi agiùnghere unu mosàicu esagonale a totu s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:150 +msgid "" +"Click and drag the mouse to add an irregular mosaic to parts of your picture." +msgstr "" +"Incarca e traga su cursore pro ddi agiùnghere unu mosàicu irregulare a partes de s'immàgine." + +#: ../../magic/src/mosaic_shaped.c:151 +msgid "Click to add an irregular mosaic to your entire picture." +msgstr "Incarca pro ddi agiùnghere unu mosàicu irregulare a totu s'immàgine." + +#: ../../magic/src/negative.c:94 +msgid "Negative" +msgstr "Negativu" + +#: ../../magic/src/negative.c:101 +msgid "Click and drag the mouse around to make your painting negative." +msgstr "Incarca e traga su cursore in tundu pro fàghere s'immàgine in negativu." + +#: ../../magic/src/negative.c:103 +msgid "Click to turn your painting into its negative." +msgstr "Incarca pro furriare sa pintura a su negativu suo." + +#: ../../magic/src/noise.c:66 +msgid "Noise" +msgstr "Remore" + +#: ../../magic/src/noise.c:70 +msgid "Click and drag the mouse to add noise to parts of your picture." +msgstr "Incarca e traga su cursore pro ddi agiùnghere unu remore a partes de s'immàgine." + +#: ../../magic/src/noise.c:71 +msgid "Click to add noise to your entire picture." +msgstr "Incarca pro ddi agiùnghere unu remore a totu s'immàgine." + +#: ../../magic/src/perspective.c:147 +msgid "Perspective" +msgstr "Prospetiva" + +#: ../../magic/src/perspective.c:148 +msgid "Zoom" +msgstr "Ingrandimentu" + +#: ../../magic/src/perspective.c:153 +msgid "Click on the corners and drag where you want to stretch the picture." +msgstr "Incarca subra de is àngulos e disinna in ue boles pro tirare s'immàgine." + +#: ../../magic/src/perspective.c:156 +msgid "Click and drag up to zoom in or drag down to zoom out the picture." +msgstr "Incarca e traga a susu pro ingrandire o pro fàghere prus minore s'immàgine." + +#: ../../magic/src/puzzle.c:103 +msgid "Puzzle" +msgstr "Puzzle" + +#: ../../magic/src/puzzle.c:110 +msgid "Click the part of your picture where would you like a puzzle." +msgstr "Incarca in una parte de s'immàgine in ue bi dias bòlere unu puzzle." + +#: ../../magic/src/puzzle.c:111 +msgid "Click to make a puzzle in fullscreen mode." +msgstr "Incarca pro pònnere su puzzle a ischermu prenu." + +#: ../../magic/src/rails.c:129 +msgid "Rails" +msgstr "Binàrios" + +#: ../../magic/src/rails.c:134 +msgid "Click and drag to draw train track rails on your picture." +msgstr "Incarca e traga pro disinnare binàrios de ferrovia in s'immàgine." + +#: ../../magic/src/rainbow.c:133 +msgid "Rainbow" +msgstr "Arcu de chelu" + +#: ../../magic/src/rainbow.c:139 +msgid "You can draw in rainbow colors!" +msgstr "Podes disinnare is colores de s'arcu de chelu!" + +#: ../../magic/src/rain.c:68 +msgid "Rain" +msgstr "Pròida" + +#: ../../magic/src/rain.c:72 +msgid "Click to place a rain drop onto your picture." +msgstr "Incarca pro collocare pròida in s'immàgine." + +#: ../../magic/src/rain.c:73 +msgid "Click to cover your picture with rain drops." +msgstr "Incarca pro cobèrrere s'immàgine de gùtios de abba pròida." + +#: ../../magic/src/realrainbow.c:98 +msgid "Real Rainbow" +msgstr "Arcu de chelu beru" + +#: ../../magic/src/realrainbow.c:100 +msgid "ROYGBIV Rainbow" +msgstr "Arcu de chelu ROYGBIV" + +#: ../../magic/src/realrainbow.c:108 +msgid "" +"Click where you want your rainbow to start, drag to where you want it to " +"end, and then let go to draw a rainbow." +msgstr "" +"Incarca dae ue cheres cumintzare s'arcu de chelu, traga finas a ue ddu cheres " +"acabbare, e iscapa pro ddu disinnare." + +#: ../../magic/src/ripples.c:102 +msgid "Ripples" +msgstr "Incrispaduras" + +#: ../../magic/src/ripples.c:108 +msgid "Click to make ripples appear over your picture." +msgstr "Incarca pro mustrare incrispaduras subra de s'immàgine." + +#: ../../magic/src/rosette.c:115 +msgid "Rosette" +msgstr "Roseddas" + +#: ../../magic/src/rosette.c:117 +msgid "Picasso" +msgstr "Picasso" + +#: ../../magic/src/rosette.c:123 +msgid "Click and start drawing your rosette." +msgstr "Incarca e cumintza a disinnare is roseddas." + +#: ../../magic/src/rosette.c:125 +msgid "You can draw just like Picasso!" +msgstr "Podes pintare che a Picasso etotu!" + +#: ../../magic/src/sharpen.c:76 +msgid "Edges" +msgstr "Oros" + +#: ../../magic/src/sharpen.c:77 +msgid "Sharpen" +msgstr "Nididare" + +#: ../../magic/src/sharpen.c:78 +msgid "Silhouette" +msgstr "Puba" + +#: ../../magic/src/sharpen.c:82 +msgid "Click and drag the mouse to trace edges in parts of your picture." +msgstr "Incarca e traga su cursore pro marcare is oros in partes de s'immàgine." + +#: ../../magic/src/sharpen.c:83 +msgid "Click to trace edges in your entire picture." +msgstr "Incarca pro marcare is oros in totu s'immàgine." + +#: ../../magic/src/sharpen.c:84 +msgid "Click and drag the mouse to sharpen parts of your picture." +msgstr "Incarca e traga su cursore pro fàghere prus nìdidas partes de s'immàgine." + +#: ../../magic/src/sharpen.c:85 +msgid "Click to sharpen the entire picture." +msgstr "Incarca pro fàghere prus nìdida totu s'immàgine." + +#: ../../magic/src/sharpen.c:86 +msgid "Click and drag the mouse to create a black and white silhouette." +msgstr "Incarca e traga su cursore pro creare una puba bianca e niedda." + +#: ../../magic/src/sharpen.c:87 +msgid "Click to create a black and white silhouette of your entire picture." +msgstr "Incarca pro creare una puba bianca e niedda de totu s'immàgine." + +#: ../../magic/src/shift.c:106 +msgid "Shift" +msgstr "Move" + +#: ../../magic/src/shift.c:112 +msgid "Click and drag to shift your picture around on the canvas." +msgstr "Incarca e traga pro cambiare s'immàgine in sa tela." + +#: ../../magic/src/smudge.c:102 +msgid "Smudge" +msgstr "Isbauladura" + +#. if (which == 1) +#: ../../magic/src/smudge.c:104 +msgid "Wet Paint" +msgstr "Tintura frisca" + +#: ../../magic/src/smudge.c:111 +msgid "Click and drag the mouse around to smudge the picture." +msgstr "Incarca e traga su cursore in tundu pro isbaulare s'immàgine." + +#. if (which == 1) +#: ../../magic/src/smudge.c:113 +msgid "Click and drag the mouse around to draw with wet, smudgy paint." +msgstr "Incarca e traga su cursore in tundu pro disinnare cun tintura frisca e isbaulada." + +#: ../../magic/src/snow.c:71 +msgid "Snow Ball" +msgstr "Botza de nie" + +#: ../../magic/src/snow.c:72 +msgid "Snow Flake" +msgstr "Froca de nie" + +#: ../../magic/src/snow.c:76 +msgid "Click to add snow balls to your picture." +msgstr "Incarca pro agiùnghere botzas de nie a s'immàgine." + +#: ../../magic/src/snow.c:77 +msgid "Click to add snow flakes to your picture." +msgstr "Incarca pro agiùnghere frocas de nie a s'immàgine." + +#: ../../magic/src/string.c:129 +msgid "String edges" +msgstr "Oros de filos" + +#: ../../magic/src/string.c:132 +msgid "String corner" +msgstr "Àngulu de filos" + +#: ../../magic/src/string.c:135 +msgid "String 'V'" +msgstr "'V' de filos" + +#: ../../magic/src/string.c:147 +msgid "" +"Click and drag to draw string art. Drag top-bottom to draw less or more " +"lines, left or right to make a bigger hole." +msgstr "" +"Incarca e traga pro disinnare s'arte de is filos. In artu pro disinnare prus " +"o prus pagas lìnias, a manca o a dereta pro fàghere un'istampu prus mannu." + +#: ../../magic/src/string.c:150 +msgid "Click and drag to draw arrows made of string art." +msgstr "Incarca e traga pro disinnare fritzas fatas cun s'arte de is filos." + +#: ../../magic/src/string.c:153 +msgid "Draw string art arrows with free angles." +msgstr "Disinna fritzas a àngulu lìberu cun s'arte de is filos." + +#: ../../magic/src/tint.c:74 +msgid "Tint" +msgstr "Tintura" + +#: ../../magic/src/tint.c:75 +msgid "Color & White" +msgstr "Colore e biancu" + +#: ../../magic/src/tint.c:79 +msgid "" +"Click and drag the mouse around to change the color of parts of your picture." +msgstr "" +"Incarca e traga su cursore in tundu pro modificare su colore de partes de s'immàgine." + +#: ../../magic/src/tint.c:80 +msgid "Click to change the color of your entire picture." +msgstr "Incarca pro modificare su colore de totu s'immàgine." + +#: ../../magic/src/tint.c:81 +msgid "" +"Click and drag the mouse around to turn parts of your picture into white and " +"a color you choose." +msgstr "" +"Incarca e traga su cursore in tundu pro furriare partes de s'immàgine in biancu e " +"in is colores chi preferis." + +#: ../../magic/src/tint.c:82 +msgid "Click to turn your entire picture into white and a color you choose." +msgstr "Incarca pro furriare totu s'immàgine in biancu e in is colores chi preferis." + +#: ../../magic/src/toothpaste.c:68 +msgid "Toothpaste" +msgstr "Dentifrìtziu" + +#: ../../magic/src/toothpaste.c:72 +msgid "Click and drag to squirt toothpaste onto your picture." +msgstr "Incarca e traga pro nche ischitzinare su dentifrìtziu subra de s'immàgine." + +#: ../../magic/src/tornado.c:153 +msgid "Tornado" +msgstr "Tornado" + +#: ../../magic/src/tornado.c:159 +msgid "Click and drag to draw a tornado funnel on your picture." +msgstr "Incarca e traga pro disinnare su trumugione de unu tornado in s'immàgine." + +#: ../../magic/src/tv.c:96 +msgid "TV" +msgstr "TV" + +#: ../../magic/src/tv.c:102 +msgid "" +"Click and drag to make parts of your picture look like they are on " +"television." +msgstr "" +"Incarca e traga pro chi partes de s'immàgine pàrgiant essinde in " +"televisione." + +#: ../../magic/src/tv.c:105 +msgid "Click to make your picture look like it's on television." +msgstr "Incarca pro chi s'immàgine pàrgiat essinde in televisione." + +#: ../../magic/src/waves.c:104 +msgid "Waves" +msgstr "Undas" + +#: ../../magic/src/waves.c:106 +msgid "Wavelets" +msgstr "Incrispadura" + +#: ../../magic/src/waves.c:115 +msgid "" +"Click to make the picture horizontally wavy. Click toward the top for " +"shorter waves, the bottom for taller waves, the left for small waves, and " +"the right for long waves." +msgstr "" +"Incarca pro fàghere s'immàgine a undas oritzontales. Incarca artziende " +"pro undas prus cùrtzias, calende pro undas prus artas, a manu manca pro undas prus piticas, " +"a manu dereta pro undas longas." + +#: ../../magic/src/waves.c:118 +msgid "" +"Click to make the picture vertically wavy. Click toward the top for shorter " +"waves, the bottom for taller waves, the left for small waves, and the right " +"for long waves." +msgstr "" +"Incarca pro fàghere s'immàgine a undas verticales. Incarca artziende pro undas " +"prus cùrtzias, calende pro undas prus artas, a manu manca pro undas prus piticas, a manu dereta " +"pro undas longas." + +#: ../../magic/src/xor.c:93 +msgid "Xor Colors" +msgstr "Colores Xor" + +#: ../../magic/src/xor.c:99 +msgid "Click and drag to draw a XOR effect" +msgstr "Incarca e traga pro disinnare un'efetu XOR" + +#: ../../magic/src/xor.c:101 +msgid "Click to draw a XOR effect on the whole picture" +msgstr "Incarca pro disinnare un'efetu XOR in totu s'immàgine" From 71116ecf1f58c8ca9b14a3b6ae02ffa022225eea Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 30 Oct 2020 13:16:49 -0700 Subject: [PATCH 26/41] Mention 'nostereo' option in the FAQ --- docs/en/FAQ.txt | 13 ++++++++++++- docs/en/html/FAQ.html | 24 +++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/docs/en/FAQ.txt b/docs/en/FAQ.txt index f72de02b5..02fd6aa8b 100644 --- a/docs/en/FAQ.txt +++ b/docs/en/FAQ.txt @@ -5,7 +5,7 @@ Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ - September 14, 2002 - July 27, 2020 + September 14, 2002 - October 30, 2020 Drawing-related @@ -394,6 +394,17 @@ Audio Problems or desktop icon. * 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? + + Run Tux Paint with the "no stereo" option: + + * Use Tux Paint Config to uncheck the "Enable Stereo Sound" option + (under "Video & Sound"). + * Edit Tux Paint's configuration file (see OPTIONS for details) and + add a line containing "nostereo=yes". + * Run "tuxpaint --nostereo" from the command line or shortcut or + desktop icon. * The sound effects sound strange This could have to do with how SDL and SDL_mixer were initialized. diff --git a/docs/en/html/FAQ.html b/docs/en/html/FAQ.html index ff3df3486..30f75307b 100644 --- a/docs/en/html/FAQ.html +++ b/docs/en/html/FAQ.html @@ -32,7 +32,7 @@

- September 14, 2002 - July 27, 2020 + September 14, 2002 - October 30, 2020

@@ -776,6 +776,28 @@ +
  • + The stereo panning of sound effects is bothersome; can sound + effects be monophonic? +

    + Run Tux Paint with the "no stereo" option: +

    +
      +
    • Use Tux Paint Config to uncheck the + "Enable Stereo Sound" option (under "Video & Sound"). +
      • + +
    • Edit Tux Paint's configuration file (see + OPTIONS for details) and + add a line containing "nostereo=yes". +
      • + +
    • Run "tuxpaint --nostereo" from + the command line or shortcut or desktop icon. +
      • +
    +
    • +
  • The sound effects sound strange

    From de96578f2296e10d3b5fcdf24e822d5929f99d23 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 30 Oct 2020 13:46:25 -0700 Subject: [PATCH 27/41] Converted FAQ from bullet lists to definition lists. --- docs/en/FAQ.txt | 853 ++++++++++++++++++++++-------------------- docs/en/html/FAQ.html | 374 +++++++++--------- 2 files changed, 637 insertions(+), 590 deletions(-) diff --git a/docs/en/FAQ.txt b/docs/en/FAQ.txt index 02fd6aa8b..90ea594cb 100644 --- a/docs/en/FAQ.txt +++ b/docs/en/FAQ.txt @@ -7,600 +7,643 @@ September 14, 2002 - October 30, 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 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. + This means that Tux Paint either couldn't find any stamp images, + or was asked not to load them. - If you installed Tux Paint, but did not install the separate, optional - "Stamps" collection, quit Tux Paint and install it now. It should be - available from the same place you got the main Tux Paint program. - (Note: As of version 0.9.14, Tux Paint comes with a small collection - of example stamps.) + If you installed Tux Paint, but did not install the separate, + optional "Stamps" collection, quit Tux Paint and install it now. + It should be available from the same place you got the main + Tux Paint program. (Note: As of version 0.9.14, Tux Paint comes + with a small collection of example stamps.) - If you don't want to install the default collection of stamps, you can - just create your own. See the EXTENDING TUX PAINT documentation for - more on creating PNG and SVG image files, TXT text description files, - Ogg Vorbis, MP3 or WAV sound files, and DAT text data files that make - up stamps. + If you don't want to install the default collection of stamps, you + can just create your own. See the EXTENDING TUX PAINT + documentation for more on creating PNG and SVG image files, TXT + text description files, Ogg Vorbis, MP3 or WAV sound files, and + DAT text data files that make up stamps. - Finally, if you installed stamps, and think they should be loading, - check to see that the "nostamps" option isn't being set. (Either via a - "--nostamps" option to Tux Paint's command line, or "nostamps=yes" in - the configuration file.) + Finally, if you installed stamps, and think they should be + loading, check to see that the "nostamps" option isn't being set. + (Either via a "--nostamps" option to Tux Paint's command line, or + "nostamps=yes" in the configuration file.) - If so, either change/remove the "nostamps" option, or you can override - it with "--stamps" on the command line or "nostamps=no" or - "stamps=yes" in a configuration file. + If so, either change/remove the "nostamps" option, or you can + 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 "tuxpaint --version" from - a command line, and you should see, amongst the other output: "Low - Quality Flood Fill enabled". + Tux Paint is probably comparing exact pixel colors when filling. + This is faster, but looks worse. Run the command + "tuxpaint --version" from a command line, and you should see, + amongst the other output: "Low Quality Flood Fill enabled". - To change this, you must rebuild Tux Paint from source. Be sure to - remove or comment out any line that says: + To change this, you must rebuild Tux Paint from source. Be sure to + remove or comment out any line that says: - #define LOW_QUALITY_FLOOD_FILL + #define LOW_QUALITY_FLOOD_FILL - in the "tuxpaint.c" file in the "src" directory. + 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. + Tux Paint was built with low-quality (but faster) stamp outlines. - Rebuild Tux Paint from source. Be sure to remove or comment out any - line that says: + Rebuild Tux Paint from source. Be sure to remove or comment out + any line that says: - #define LOW_QUALITY_STAMP_OUTLINE + #define LOW_QUALITY_STAMP_OUTLINE - in the "tuxpaint.c" file in the "src" directory. + in the "tuxpaint.c" file in the "src" directory. + + ---------------------------------------------------------------------- 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 a - command line. If, amongst the other output, you see the text: "Low - Quality Thumbnails enabled", then this is what's happening. + Tux Paint was probably compiled with the faster, lower quality + thumbnail code enabled. Run the command: "tuxpaint --version" from + a command line. If, amongst the other output, you see the text: + "Low Quality Thumbnails enabled", then this is what's happening. - Rebuild Tux Paint from source. Be sure to remove or comment out any - line that says: + Rebuild Tux Paint from source. Be sure to remove or comment out + any line that says: - #define LOW_QUALITY_THUMBNAILS + #define LOW_QUALITY_THUMBNAILS - in the "tuxpaint.c" file in the "src" directory. + 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. + "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" from a command - line. If, amongst the other output, you see the text: "Low Quality - Color Selector enabled", then this is what's happening. + Tux Paint was probably compiled with the nice looking color + selector buttons disabled. Run the command: "tuxpaint --version" + from a command line. If, amongst the other output, you see the + text: "Low Quality Color Selector enabled", then this is what's + happening. - Rebuild Tux Paint from source. Be sure to remove or comment out any - line that says: + Rebuild Tux Paint from source. Be sure to remove or comment out + any line that says: - #define LOW_QUALITY_COLOR_SELECTOR + #define LOW_QUALITY_COLOR_SELECTOR - in the "tuxpaint.c" file in the "src" directory. + 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. + The "uppercase" option is on. - If you're running Tux Paint from a command-line, make sure you're not - giving it an "--uppercase" option. + If you're running Tux Paint from a command-line, make sure you're + not giving it an "--uppercase" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--uppercase" is listed as a - command-line argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--uppercase" is listed as a + command-line argument. - If "--uppercase" isn't being sent on the command line, check - Tux Paint's configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "uppercase=yes". + If "--uppercase" isn't being sent on the command line, check + Tux Paint's configuration file ("~/.tuxpaintrc" under Linux and + Unix, "tuxpaint.cfg" under Windows) for a line reading: + "uppercase=yes". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--mixedcase", which will override the uppercase setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--mixedcase", which will override the + uppercase setting. - Or use Tux Paint Config. and make sure "Show Uppercase Text Only" - (under "Languages") is not checked. + 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. + 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 - * Linux and Unix users: Make sure the locale is available + Tux Paint won't switch to my language - Make sure the locale you want is available. Check your - "/etc/locale.gen" file. See the OPTIONS documentation for the - locales Tux Paint uses (especially when using the "--lang" - option). + * Linux and Unix users: Make sure the locale is available - Note: Debian users can simply run "dpkg-reconfigure locales" if - the locales are managed by "dpkg." + Make sure the locale you want is available. Check your + "/etc/locale.gen" file. See the OPTIONS documentation for the + locales Tux Paint uses (especially when using the "--lang" + option). - * If you're using the "--lang" command-line option + Note: Debian and derivative (e.g., Ubuntu) users can simply + run "dpkg-reconfigure locales" if the locales are managed by + "dpkg." - Try using the "--locale" command-line option, or your - operating system's locale settings (e.g., the "$LANG" - environment variable), and please e-mail us regarding your - trouble. + * If you're using the "--lang" command-line option - * If you're using the "--locale" command-line option + Try using the "--locale" command-line option, or your + operating system's locale settings (e.g., the "$LANG" + environment variable), and please e-mail us regarding your + trouble. - If this doesn't work, please e-mail us regarding your - trouble. + * If you're using the "--locale" command-line option - * If you're trying to use your Operating System's locale + If this doesn't work, please e-mail us regarding your + trouble. - If this doesn't work, please e-mail us regarding your - trouble. + * If you're trying to use your Operating System's locale - * Make sure you have the necessary font + If this doesn't work, please e-mail us regarding your + trouble. - 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. + * Make sure you have the necessary font - The appropriate fonts for such locales can be downloaded - from the Tux Paint website: + 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. - http://www.tuxpaint,org/download/fonts/ + The appropriate fonts for such locales can be downloaded from + the Tux Paint website: + + http://www.tuxpaint,org/download/fonts/ + + ---------------------------------------------------------------------- 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 the - "lpr" printing tool. + Tux Paint prints by creating a PostScript rendition of the picture + and sending it to an external command. By default, this command is + the "lpr" printing tool. - If that program is not available (for example, you're using CUPS, the - Common Unix Printing System, and do not have "cups-lpr" installed), - you will need to specify an appropriate command using the - "printcommand" option in Tux Paint's configuration file. (See the - OPTIONS documentation.) + If that program is not available (for example, you're using CUPS, + the Common Unix Printing System, and do not have "cups-lpr" + installed), you will need to specify an appropriate command using + the "printcommand" option in Tux Paint's configuration file. (See + the OPTIONS documentation.) - Note: Versions of Tux Paint prior to 0.9.15 used a different default - command for printing, "pngtopnm | pnmtops | lpr", as Tux Paint output - PNG format, rather than PostScript. + Note: Versions of Tux Paint prior to 0.9.15 used a different + default command for printing, "pngtopnm | pnmtops | lpr", as + Tux Paint output PNG format, rather than PostScript. - If you had changed your "printcommand" option prior to Tux Paint - 0.9.15, you will need to go back and alter it to accept PostScript. + If you had changed your "printcommand" option prior to Tux Paint + 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. + The "print delay" option is on. You can only print once every + X seconds. - If you're running Tux Paint from a command-line, make sure you're not - giving it a "--printdelay=..." option. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--printdelay=..." option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--printdelay=..." is listed as a - command-line argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--printdelay=..." is listed as a + command-line argument. - If a "--printdelay=..." option isn't being sent on the command line, - check Tux Paint's configuration file ("~/.tuxpaintrc" under Linux and - Unix, "tuxpaint.cfg" under Windows) for a line reading: - "printdelay=...". + If a "--printdelay=..." option isn't being sent on the command + line, check Tux Paint's configuration file ("~/.tuxpaintrc" under + Linux and Unix, "tuxpaint.cfg" under Windows) for a line reading: + "printdelay=...". - Either remove that line, set the delay value to 0 (no delay), or - decrease the delay to a value you prefer. (See the OPTIONS - documentation). + Either remove that line, set the delay value to 0 (no delay), or + decrease the delay to a value you prefer. (See the OPTIONS + documentation). - Or, you can simply run Tux Paint with the command-line argument: - "--printdelay=0", which will override the configuration file's - setting, and allow unlimited printing. (You won't have to wait between - prints.) + Or, you can simply run Tux Paint with the command-line argument: + "--printdelay=0", which will override the configuration file's + setting, and allow unlimited printing. (You won't have to wait + between prints.) - Or use Tux Paint Config. and make sure "Print Delay" (under - "Printing") is set to "0 seconds." + 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. + The "no print" option is on. - If you're running Tux Paint from a command-line, make sure you're not - giving it a "--noprint" option. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--noprint" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--noprint" is listed as an argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--noprint" is listed as an + argument. - If "--noprint" isn't on the command-line, check Tux Paint's - configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "noprint=yes". + If "--noprint" isn't on the command-line, check Tux Paint's + configuration file ("~/.tuxpaintrc" under Linux and Unix, + "tuxpaint.cfg" under Windows) for a line reading: "noprint=yes". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--print", which will override the configuration file's - setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--print", which will override the + configuration file's setting. - Or use Tux Paint Config. and make sure "Allow Printing" (under - "Printing") is checked. + Or use Tux Paint Config. and make sure "Allow Printing" (under + "Printing") is checked. + + ---------------------------------------------------------------------- Saving - * Where are my pictures? + 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 your - local drive: + Unless you asked Tux Paint to save into a specific location (using + the 'savedir' option), Tux Paint saves into a standard location on + your local drive: - Windows Vista - In the user's "AppData" folder: - e.g., C:\Users\Username\AppData\Roaming\TuxPaint\saved + Windows Vista, Windows 8, Windows 10 + In the user's "AppData" folder: + e.g., + C:\Users\Username\AppData\Roaming\TuxPaint\saved - Windows 95, 98, ME, 2000, XP - In the user's "Application Data" folder: - e.g., C:\Documents and Settings\Username\Application - Data\TuxPaint\saved + Windows 95, 98, ME, 2000, XP + In the user's "Application Data" folder: + e.g., C:\Documents and Settings\Username\Application + Data\TuxPaint\saved - Mac OS X - In the user's "Application Support" folder: - e.g., /Users/Username/Library/Applicaton - Support/TuxPaint/saved/ + Mac OS X + In the user's "Application Support" folder: + e.g., /Users/Username/Library/Applicaton + Support/TuxPaint/saved/ - Linux / Unix - In the user's $HOME directory, under a ".tuxpaint" - subfolder: - e.g., /home/username/.tuxpaint/saved/ + Linux / Unix + In the user's $HOME directory, under a ".tuxpaint" + subfolder: + e.g., /home/username/.tuxpaint/saved/ - The images are stored as PNG bitmaps, which most modern programs - should be able to load (image editors, word processors, web browsers, - etc.) + The images are stored as PNG bitmaps, which most modern programs + 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.') + The "save over" option is enabled. (This disables the prompt that + would appear when you click 'Save.') - If you're running Tux Paint from a command-line, make sure you're not - giving it a "--saveover" option. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--saveover" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--saveover" is listed as an - argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--saveover" is listed as an + argument. - If "--saveover" isn't on the command-line, check Tux Paint's - configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "saveover=yes". + If "--saveover" isn't on the command-line, check Tux Paint's + configuration file ("~/.tuxpaintrc" under Linux and Unix, + "tuxpaint.cfg" under Windows) for a line reading: "saveover=yes". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--saveoverask", which will override the configuration - file's setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--saveoverask", which will override the + configuration file's setting. - Or use Tux Paint Config. and make sure "Ask Before Overwriting" (under - "Saving") is checked. + Or use Tux Paint Config. and make sure "Ask Before Overwriting" + (under "Saving") is checked. - Also, see "Tux Paint always saves a new picture!", below. + 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.') + The "never save over" option is enabled. (This disables the prompt + that would appear when you click 'Save.') - If you're running Tux Paint from a command-line, make sure you're not - giving it a "--saveovernew" option. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--saveovernew" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--saveovernew" is listed as an - argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--saveovernew" is listed as an + argument. - If "--saveovernew" isn't on the command-line, check Tux Paint's - configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "saveover=new". + If "--saveovernew" isn't on the command-line, check Tux Paint's + configuration file ("~/.tuxpaintrc" under Linux and Unix, + "tuxpaint.cfg" under Windows) for a line reading: "saveover=new". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--saveoverask", which will override the configuration - file's setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--saveoverask", which will override the + configuration file's setting. - Or use Tux Paint Config. and make sure "Ask Before Overwriting" (under - "Saving") is checked. + Or use Tux Paint Config. and make sure "Ask Before Overwriting" + (under "Saving") is checked. - Also, see "Tux Paint always saves over my old picture!", above. + Also, see "Tux Paint always saves over my old picture!", above. + + ---------------------------------------------------------------------- Audio Problems - * There's no sound! - * First, check the obvious: - * Are your speakers connected and turned on? - * Is the volume turned up on your speakers? - * Is the volume turned up in your Operating System's "mixer?" - * Are you certain you're using a computer with a sound card? - * Are any other programs running that use sound? (They may be - 'blocking' Tux Paint from accessing your sound device) - * (Unix/Linux) Are you using a sound system, such as aRts, ESD - or GStreamer? If so, try setting the "SDL_AUDIODRIVER" - environment variable before running Tux Paint (e.g., - "export SDL_AUDIODRIVER=arts"). Or, run Tux Paint through - the system's rerouter (e.g., run "artsdsp tuxpaint" or - "esddsp tuxpaint", instead of simply "tuxpaint"). - * Is sound disabled in Tux Paint? + There's no sound! - If sound seems to work otherwise (and you're sure no other - program is "blocking" the sound device), then Tux Paint may be - running with a "no sound" option. + * First, check the obvious: + * Are your speakers connected and turned on? + * Is the volume turned up on your speakers? + * Is the volume turned up in your Operating System's + "mixer?" + * Are you certain you're using a computer with a sound + card? + * Are any other programs running that use sound? (They may + be 'blocking' Tux Paint from accessing your sound + device) + * (Unix/Linux) Are you using a sound system, such as aRts, + ESD or GStreamer? If so, try setting the + "SDL_AUDIODRIVER" environment variable before running + Tux Paint (e.g., "export SDL_AUDIODRIVER=arts"). Or, run + Tux Paint through the system's rerouter (e.g., run + "artsdsp tuxpaint" or "esddsp tuxpaint", instead of + simply "tuxpaint"). + * Is sound disabled in Tux Paint? - Make sure you're not running Tux Paint with the "--nosound" - option as a command-line argument. (See the OPTIONS documentation - for details.) + If sound seems to work otherwise (and you're sure no other + program is "blocking" the sound device), then Tux Paint may + be running with a "no sound" option. - If it's not, then check the configuration file - ("/etc/tuxpaint/tuxpaint.conf" and "~/.tuxpaintrc" under Linux - and Unix, and "tuxpaint.cfg" under Windows) for a line reading: - "nosound=yes". + Make sure you're not running Tux Paint with the "--nosound" + option as a command-line argument. (See the OPTIONS + documentation for details.) - Either remove that line, or simply run Tux Paint with the - command-line argument: "--sound", which will override the - configuration file's setting. + If it's not, then check the configuration file + ("/etc/tuxpaint/tuxpaint.conf" and "~/.tuxpaintrc" under + Linux and Unix, and "tuxpaint.cfg" under Windows) for a line + reading: "nosound=yes". - Alternatively, you can use Tux Paint Config. to change the - configuration file. Make sure "Enable Sound Effects" (under - "Video & Sound") is checked, then click "Apply". + Either remove that line, or simply run Tux Paint with the + command-line argument: "--sound", which will override the + configuration file's setting. - * Were sounds temporarily disabled? + Alternatively, you can use Tux Paint Config. to change the + configuration file. Make sure "Enable Sound Effects" (under + "Video & Sound") is checked, then click "Apply". - Even if sounds are enabled in Tux Paint, it is possible to - disable and re-enable them temporarily using the [Alt] + [S] key - sequence. Try pressing those keys to see if sounds begin working - again. + * Were sounds temporarily disabled? - * Was Tux Paint built without sound support? + Even if sounds are enabled in Tux Paint, it is possible to + disable and re-enable them temporarily using the [Alt] + [S] + key sequence. Try pressing those keys to see if sounds begin + working again. - Tux Paint may have been compiled with sound support disabled. To - test whether sound support was enabled when Tux Paint was - compiled, run Tux Paint from a command line, like so: + * Was Tux Paint built without sound support? - tuxpaint --version + Tux Paint may have been compiled with sound support disabled. + To test whether sound support was enabled when Tux Paint was + compiled, run Tux Paint from a command line, like so: - If, amongst the other information, you see "Sound disabled", then - the version of Tux Paint you're running has sound disabled. - Recompile Tux Paint, and be sure NOT to build the "nosound" - target. (i.e., don't run "make nosound") Be sure the SDL_mixer - library and its development headers are available! + tuxpaint --version - * Tux Paint makes too much noise! Can I turn them off? + If, amongst the other information, you see "Sound disabled", + then the version of Tux Paint you're running has sound + disabled. Recompile Tux Paint, and be sure NOT to build the + "nosound" target. (i.e., don't run "make nosound") Be sure + the SDL_mixer library and its development headers are + available! - Yes, there are a number of ways to disable sounds in Tux Paint: + Tux Paint makes too much noise! Can I turn them off? - * Press [Alt] + [S] while in Tux Paint to temporarily disable - sounds. (Press that key sequence again to re-enable sounds.) - * Run Tux Paint with the "no sound" option: - * Use Tux Paint Config to uncheck the "Enable Sound Effects" - option (under "Video & Sound"). - * Edit Tux Paint's configuration file (see OPTIONS for - details) and add a line containing "nosound=yes". - * Run "tuxpaint --nosound" from the command line or shortcut - or desktop icon. - * 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? + Yes, there are a number of ways to disable sounds in Tux Paint: - Run Tux Paint with the "no stereo" option: + * Press [Alt] + [S] while in Tux Paint to temporarily disable + sounds. (Press that key sequence again to re-enable sounds.) + * Run Tux Paint with the "no sound" option: + * Use Tux Paint Config to uncheck the "Enable Sound + Effects" option (under "Video & Sound"). + * Edit Tux Paint's configuration file (see OPTIONS for + details) and add a line containing "nosound=yes". + * Run "tuxpaint --nosound" from the command line or + shortcut or desktop icon. + * Recompile Tux Paint with sound support disabled. (See + above and INSTALL.txt.) - * Use Tux Paint Config to uncheck the "Enable Stereo Sound" option - (under "Video & Sound"). - * Edit Tux Paint's configuration file (see OPTIONS for details) and - add a line containing "nostereo=yes". - * Run "tuxpaint --nostereo" from the command line or shortcut or - desktop icon. - * The sound effects sound strange + The stereo panning of sound effects is bothersome; can sound effects be + monophonic? - This could have to do with how SDL and SDL_mixer were initialized. - (The buffer size chosen.) + Run Tux Paint with the "no stereo" option: - Please e-mail us with details about your computer system. (Operating - system and version, sound card, which version of Tux Paint you're - running (run "tuxpaint --version" to verify), and so on.) + * Use Tux Paint Config to uncheck the "Enable Stereo Sound" + option (under "Video & Sound"). + * Edit Tux Paint's configuration file (see OPTIONS for details) + and add a line containing "nostereo=yes". + * Run "tuxpaint --nostereo" from the command line or shortcut + or desktop icon. + + The sound effects sound strange + + This could have to do with how SDL and SDL_mixer were initialized. + (The buffer size chosen.) + + Please e-mail us with details about your computer system. + (Operating system and version, sound card, which version of + Tux Paint you're running (run "tuxpaint --version" to verify), and + so on.) + + ---------------------------------------------------------------------- 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. + 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 - resolution you have Tux Paint set to run at.) (This is typically done - manually under the X-Window server by pressing [Ctrl]-[Alt]-[KeyPad - Plus] and -[KeyPad Minus].) + Linux users - Your X-Window server is probably not set with the + ability to switch to the desired resolution: 800×600. (or whatever + resolution you have Tux Paint set to run at.) (This is typically + done manually under the X-Window server by pressing + [Ctrl]-[Alt]-[KeyPad Plus] and -[KeyPad Minus].) - For this to work, your monitor must support that resolution, and you - need to have it listed in your X server configuration. + For this to work, your monitor must support that resolution, and + you need to have it listed in your X server configuration. - Check the "Display" subsection of the "Screen" section of your XFree86 - or X.org configuration file (typically "/etc/X11/XF86Config-4" or - "/etc/X11/XF86Config", depending on the version of XFree86 you're - using; 3.x or 4.x, respectively, or "/etc/X11/xorg.conf" for X.org). + Check the "Display" subsection of the "Screen" section of your + XFree86 or X.org configuration file (typically + "/etc/X11/XF86Config-4" or "/etc/X11/XF86Config", depending on the + version of XFree86 you're using; 3.x or 4.x, respectively, or + "/etc/X11/xorg.conf" for X.org). - Add "800x600" (or whatever resolution(s) you want) to the appropriate - "Modes" line. (e.g., in the "Display" subsection that contains 24-bit - color depth ("Depth 24"), which is what Tux Paint tries to use.) e.g.: + Add "800x600" (or whatever resolution(s) you want) to the + appropriate "Modes" line. (e.g., in the "Display" subsection that + contains 24-bit color depth ("Depth 24"), which is what Tux Paint + tries to use.) e.g.: - Modes "1280x1024" "1024x768" "800x600" "640x480" + Modes "1280x1024" "1024x768" "800x600" "640x480" - Note that some Linux distributions have tools that can make these - changes for you. Debian users can run the command "dpkg-reconfigure - xserver-xfree86" as root, for example. + Note that some Linux distributions have tools that can make these + 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. + The "fullscreen" option is set. - If you're running Tux Paint from a command-line, make sure you're not - giving it a "--fullscreen" option. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--fullscreen" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--fullscreen" is listed as an - argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--fullscreen" is listed as an + argument. - If "--fullscreen" isn't on the command-line, check Tux Paint's - configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "fullscreen=yes". + If "--fullscreen" isn't on the command-line, check Tux Paint's + configuration file ("~/.tuxpaintrc" under Linux and Unix, + "tuxpaint.cfg" under Windows) for a line reading: + "fullscreen=yes". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--windowed", which will override the configuration file's - setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--windowed", which will override the + configuration file's setting. - Or use Tux Paint Config. and make sure "Fullscreen" (under "Video & - Sound") is not checked. + Or use Tux Paint Config. and make sure "Fullscreen" (under "Video + & Sound") is not checked. + + ---------------------------------------------------------------------- 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 30 - seconds. (On Unix/Linux, this message would appear in a terminal - console if you ran Tux Paint from a command-line. On Windows, this - message would appear in a file named "stdout.txt" in the same folder - where TuxPaint.exe resides (e.g., in C:\Program Files\TuxPaint). + 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 + 30 seconds. (On Unix/Linux, this message would appear in a + terminal console if you ran Tux Paint from a command-line. On + Windows, this message would appear in a file named "stdout.txt" in + the same folder where TuxPaint.exe resides (e.g., in + C:\Program Files\TuxPaint). - A lockfile ("~/.tuxpaint/lockfile.dat" on Linux and Unix, - "userdata\lockfile.dat" on Windows) is used to make sure Tux Paint - isn't run too many times at once (e.g., due to a child impatiently - clicking its icon more than once). + A lockfile ("~/.tuxpaint/lockfile.dat" on Linux and Unix, + "userdata\lockfile.dat" on Windows) is used to make sure Tux Paint + isn't run too many times at once (e.g., due to a child impatiently + clicking its icon more than once). - Even if the lockfile exists, it contains the 'time' Tux Paint was last - run. If it's been more than 30 seconds, Tux Paint should run fine, and - simply update the lockfile with the current time. + Even if the lockfile exists, it contains the 'time' Tux Paint was + last run. If it's been more than 30 seconds, Tux Paint should run + fine, and simply update the lockfile with the current time. - If multiple users are sharing the directory where this file is stored - (e.g., on a shared network drive), then you'll need to disable this - feature. + If multiple users are sharing the directory where this file is + stored (e.g., on a shared network drive), then you'll need to + disable this feature. - To disable the lockfile, add the "--nolockfile" argument to - Tux Paint's command-line. + 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 - being quit using the [Escape] key. + The "noquit" option is set. This disables the "Quit" button in + Tux Paint's toolbar (greying it out), and prevents Tux Paint from + being quit using the [Escape] key. - If Tux Paint is not in fullscreen mode, simply click the window close - button on Tux Paint's title bar. (i.e., the "(x)" at the upper right.) + If Tux Paint is not in fullscreen mode, simply click the window + close button on Tux Paint's title bar. (i.e., the "(x)" at the + upper right.) - If Tux Paint is in fullscreen mode, you will need to use the [Shift] + - [Control] + [Escape] sequence on the keyboard to quit Tux Paint. + If Tux Paint is in fullscreen mode, you will need to use the + [Shift] + [Control] + [Escape] sequence on the keyboard to quit + Tux Paint. - (Note: with or without "noquit" set, you can always use the [Alt] + - [F4] combination on your keyboard to quit Tux Paint.) + (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. + If you're running Tux Paint from a command-line, make sure you're + not giving it a "--noquit" option. - If you're running Tux Paint by double-clicking an icon, check the - properties of the icon to see if "--noquit" is listed as an argument. + If you're running Tux Paint by double-clicking an icon, check the + properties of the icon to see if "--noquit" is listed as an + argument. - If "--noquit" isn't on the command-line, check Tux Paint's - configuration file ("~/.tuxpaintrc" under Linux and Unix, - "tuxpaint.cfg" under Windows) for a line reading: "noquit=yes". + If "--noquit" isn't on the command-line, check Tux Paint's + configuration file ("~/.tuxpaintrc" under Linux and Unix, + "tuxpaint.cfg" under Windows) for a line reading: "noquit=yes". - Either remove that line, or simply run Tux Paint with the command-line - argument: "--quit", which will override the configuration file's - setting. + Either remove that line, or simply run Tux Paint with the + command-line argument: "--quit", which will override the + configuration file's setting. - Or use Tux Paint Config. and make sure "Disable Quit Button and - [Escape] Key" (under "Simplification") is not checked. + 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 finds while - loading them), then it was probably compiled with debugging output - turned on. + A few messages are normal, but if Tux Paint is being extremely + verbose (like listing the name of every rubber-stamp image it + finds while loading them), then it was probably compiled with + debugging output turned on. - Rebuild Tux Paint from source. Be sure to remove or comment out any - line that says: + Rebuild Tux Paint from source. Be sure to remove or comment out + any line that says: - #define DEBUG + #define DEBUG - in the "tuxpaint.c" file in the "src" directory. + 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. + By default, Tux Paint first looks at configuration files for + options. - * Unix and Linux + * Unix and Linux - Under Unix and Linux, it first examines the system-wide - configuration file, located here: + Under Unix and Linux, it first examines the system-wide + configuration file, located here: - /etc/tuxpaint/tuxpaint.conf + /etc/tuxpaint/tuxpaint.conf - It then examines the user's personal configuration file: + It then examines the user's personal configuration file: - ~/.tuxpaintrc + ~/.tuxpaintrc - Finally, any options sent as command-line arguments are used. + Finally, any options sent as command-line arguments are used. - * Windows + * Windows - Under Windows, Tux Paint first examines the configuration file: + Under Windows, Tux Paint first examines the configuration + file: - tuxpaint.cfg + tuxpaint.cfg - Then, any options sent as command-line arguments are used. + Then, any options sent as command-line arguments are used. - This means that if anything is set in a configuration file that you - don't want set, you'll need to either change the config. file (if you - can), or override the option on the command-line. + This means that if anything is set in a configuration file that + you don't want set, you'll need to either change the config. file + (if you can), or override the option on the command-line. - For example, if "/etc/tuxpaint/tuxpaint.conf" includes an option to - disable sound: + For example, if "/etc/tuxpaint/tuxpaint.conf" includes an option + to disable sound: - nosound=yes + nosound=yes - You can reenable sound by either adding this option to your own - ".tuxpainrc" file: + You can reenable sound by either adding this option to your own + ".tuxpainrc" file: - sound=yes + sound=yes - Or by using this command-line argument: + Or by using this command-line argument: - --sound + --sound - Linux and Unix users can also disable the system-wide configuration - file by including the following command-line argument: + Linux and Unix users can also disable the system-wide + configuration file by including the following command-line + argument: - --nosysconfig + --nosysconfig - Tux Paint will then only look at "~/.tuxpaintrc" and command-line - arguments to determine what options should be set. + Tux Paint will then only look at "~/.tuxpaintrc" and command-line + arguments to determine what options should be set. + + ---------------------------------------------------------------------- Help / Contact - Any questions you don't see answered? Let me know! - - bill@newbreedsoftware.com - - Or 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: http://www.tuxpaint.org/lists/ + + Or, contact lead developer Bill Kendrick directly: + + bill@newbreedsoftware.com diff --git a/docs/en/html/FAQ.html b/docs/en/html/FAQ.html index 30f75307b..5e8811dfb 100644 --- a/docs/en/html/FAQ.html +++ b/docs/en/html/FAQ.html @@ -36,25 +36,25 @@

    +
    +

    Drawing-related

    -
      -
    • - 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.) -

      -
      • +
      +

      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. @@ -92,10 +92,10 @@ 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 @@ -119,10 +119,10 @@

      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. @@ -142,16 +142,18 @@

      in the "tuxpaint.c" file in the "src" directory.

      -
      • -
    + + + +

    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: @@ -175,19 +177,16 @@

      in the "tuxpaint.c" file in the "src" directory.

      -
      • + -
    • - Pictures in the 'Open' dialog look bad -

      - "Low Quality Thumbnails" is probably enabled. See: "Stamp - thumbnails in the Stamp Selector look bad", above. -

      -
      • +

      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: @@ -211,10 +210,10 @@

      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.

      @@ -251,18 +250,16 @@ Or use Tux Paint Config. and make sure "Show Uppercase Text Only" (under "Languages") is not checked.

      -
      • + -
    • - 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 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 @@ -276,73 +273,73 @@

        - Note: Debian users can simply run + Note: Debian and derivative (e.g., Ubuntu) users can simply run "dpkg-reconfigure locales" if the locales are managed by "dpkg."

        +
        • + +
      • If you're using the "--lang" + command-line option +

        + Try using the "--locale" + command-line option, or your operating system's + locale settings (e.g., the "$LANG" + environment variable), and please e-mail us + regarding your trouble. +

        +
        • -
          -
        • If you're using the "--lang" - command-line option -

          - Try using the "--locale" - command-line option, or your operating system's - locale settings (e.g., the "$LANG" - environment variable), and please e-mail us - regarding your trouble. -

          -
          • +
        • If you're using the "--locale" + command-line option +

          + If this doesn't work, please e-mail us regarding + your trouble. +

          +
          • -
        • If you're using the "--locale" - command-line option -

          - If this doesn't work, please e-mail us regarding - your trouble. -

          -
          • +
        • If you're trying to use your Operating System's + locale +

          + If this doesn't work, please e-mail us regarding + your trouble. +

          +
          • -
        • If you're trying to use your Operating System's - locale -

          - If this doesn't work, please e-mail us regarding - your trouble. -

          -
          • +
        • Make sure you have the necessary font +

          + 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. +

          -
        • Make sure you have the necessary font -

          - 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. -

          +

          + The appropriate fonts for such locales can be + downloaded from the Tux Paint website: +

          -

          - The appropriate fonts for such locales can be - downloaded from the Tux Paint website: -

          - -
          -

          - http://www.tuxpaint,org/download/fonts/ -

          -
          -
          • -
        +
        +

        + http://www.tuxpaint,org/download/fonts/ +

        +
      -
      • -
    + + + +

    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 @@ -370,11 +367,11 @@ Tux Paint 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. @@ -419,10 +416,10 @@ 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.

      @@ -457,16 +454,18 @@ Or use Tux Paint Config. and make sure "Allow Printing" (under "Printing") is checked.

      -
      • -
    + + + +

    Saving

    -
      -
    • - Where are my pictures? +
      +

      Where does Tux Paint save my drawings?

      +

      Unless you asked Tux Paint to save into a specific location (using the 'savedir' option), Tux Paint @@ -475,7 +474,7 @@

      - Windows Vista + Windows Vista, Windows 8, Windows 10
      @@ -522,10 +521,10 @@ programs 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.') @@ -567,10 +566,10 @@ 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.') @@ -612,16 +611,18 @@ Also, see "Tux Paint always saves over my old picture!", above.

      -
      • -
    + + + +

    Audio Problems

    -
      -
    • - There's no sound! +
      +

      There's no sound!

      +
      • First, check the obvious: @@ -735,11 +736,10 @@

      -
      • + -
    • - 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: @@ -774,11 +774,10 @@

    • - + -
  • - 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:

    @@ -796,10 +795,10 @@ 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.) @@ -812,25 +811,25 @@ "tuxpaint --version" to verify), and so on.)

    -
    • - + + + +

    Fullscreen Mode Problems

    -
      -
    • - 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 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: @@ -875,11 +874,11 @@ 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.

      @@ -914,16 +913,18 @@ Or use Tux Paint Config. and make sure "Fullscreen" (under "Video & Sound") is not checked.

      -
      • -
    + + + +

    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 @@ -962,10 +963,10 @@ "--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 @@ -990,10 +991,10 @@ 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" @@ -1025,11 +1026,11 @@ 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 @@ -1051,10 +1052,10 @@

      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. @@ -1167,26 +1168,18 @@ command-line arguments to determine what options should be set.

      -
      • -
    + + + +

    Help / Contact

    - Any questions you don't see answered? Let me know! -

    - -
    -

    - bill@newbreedsoftware.com -

    -
    - -

    - Or 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:

    @@ -1195,5 +1188,16 @@ "http://www.tuxpaint.org/lists/">http://www.tuxpaint.org/lists/

    + +

    + Or, contact lead developer Bill Kendrick directly: +

    + +
    +

    + bill@newbreedsoftware.com +

    +
    From df7d402cc288d70e6d0c11b3101d4cdc674853d0 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 30 Oct 2020 13:46:40 -0700 Subject: [PATCH 28/41] Converted FAQ from bullet lists to definition lists. (Forgot to include CHANGES.txt itself) --- docs/CHANGES.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index b798e639b..5891b6ff8 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.October.25 (0.9.25) +2020.October.30 (0.9.25) * New Features ------------ * Export drawings: @@ -104,6 +104,8 @@ $Id$ * EXTENDING docs cleaned up and Table of Contents added. + * Converted FAQ from bullet lists to definition lists. + * Bug Fixes --------- * Mended issue where stamp descriptions were not loading From aae22f05933192c8347ffb5150ecb4f62dcd7d92 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Thu, 5 Nov 2020 03:38:42 +0100 Subject: [PATCH 29/41] Correcting Devaganari to Devanagari --- docs/AUTHORS.txt | 4 ++-- docs/CHANGES.txt | 4 ++-- docs/en/OPTIONS.txt | 8 ++++---- docs/en/html/OPTIONS.html | 8 ++++---- src/i18n.c | 10 +++++----- src/i18n.h | 2 +- src/manpage/tuxpaint.1 | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index 97c392645..1b8c30b03 100644 --- a/docs/AUTHORS.txt +++ b/docs/AUTHORS.txt @@ -756,7 +756,7 @@ $Id$ Donatien NSENGIYUMVA , and Antoine Bigirimana .) - * Konkani (Devaganari and Roman) + * Konkani (Devanagari and Roman) Rahul Borade * Korean @@ -909,7 +909,7 @@ $Id$ * Sanskrit translation Babita Shinde - * Santali translation (Devaganari) + * Santali translation (Devanagari) Chandrakant Dhutadmal Ganesh Murmu diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 5891b6ff8..25be699f4 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -848,7 +848,7 @@ $Id$ Savitha Provided by Vrundesh Waghmare - * Konkani (Devaganari and Roman) + * Konkani (Devanagari and Roman) Rahul Borade * Luganda translation @@ -925,7 +925,7 @@ $Id$ * Sanskrit translation Babita Shinde - * Santali translation (Devaganari) + * Santali translation (Devanagari) Chandrakant Dhutadmal Ganesh Murmu diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt index d59d7befc..0f4e07829 100644 --- a/docs/en/OPTIONS.txt +++ b/docs/en/OPTIONS.txt @@ -836,7 +836,7 @@ Windows Users |---------------------+---------------------+---------------| |klingon |tlhIngan | | |---------------------+---------------------+---------------| - |konkani-devaganari | | | + |konkani-devanagari | | | |---------------------+---------------------+---------------| |konkani-roman | | | |---------------------+---------------------+---------------| @@ -898,7 +898,7 @@ Windows Users |---------------------+---------------------+---------------| |sanskrit | | | |---------------------+---------------------+---------------| - |santali-devaganari | | | + |santali-devanagari | | | |---------------------+---------------------+---------------| |santali-ol-chiki | | | |---------------------+---------------------+---------------| @@ -1312,7 +1312,7 @@ Available Languages | | | |left [Alt] | |----------------+-------------------+----------------+--------------| |kok_IN | |Konkani | | - | | |(Devaganari) | | + | | |(Devanagari) | | |----------------+-------------------+----------------+--------------| |kok@roman | |Konkani (Roman) | | |----------------+-------------------+----------------+--------------| @@ -1387,7 +1387,7 @@ Available Languages |sa_IN | |Sanskrit | | |----------------+-------------------+----------------+--------------| |sat_IN | |Santali | | - | | |(Devaganari) | | + | | |(Devanagari) | | |----------------+-------------------+----------------+--------------| |sat@olchiki | |Santali | | | | |(Ol-Chikii) | | diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index 43d4819f1..2b9ef6dbd 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -2222,7 +2222,7 @@ - konkani-devaganari + konkani-devanagari   @@ -2594,7 +2594,7 @@ - santali-devaganari + santali-devanagari   @@ -4304,7 +4304,7 @@   - Konkani (Devaganari) + Konkani (Devanagari)   @@ -4814,7 +4814,7 @@   - Santali (Devaganari) + Santali (Devanagari)   diff --git a/src/i18n.c b/src/i18n.c index 4727551c7..8110dcd4c 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -363,7 +363,7 @@ static const language_to_locale_struct language_to_locale_array[] = { {"luganda", "lg_UG.UTF-8"}, {"luxembourgish", "lb_LU.UTF-8"}, {"letzebuergesch", "lb_LU.UTF-8"}, - {"konkani-devaganari", "kok_IN.UTF-8"}, + {"konkani-devanagari", "kok_IN.UTF-8"}, {"konkani-roman", "kok@roman"}, {"maithili", "mai_IN.UTF-8"}, {"macedonian", "mk_MK.UTF-8"}, @@ -399,7 +399,7 @@ static const language_to_locale_struct language_to_locale_array[] = { {"russian", "ru_RU.UTF-8"}, {"russkiy", "ru_RU.UTF-8"}, {"sanskrit", "sa_IN.UTF-8"}, - {"santali-devaganari", "sat_IN.UTF-8"}, + {"santali-devanagari", "sat_IN.UTF-8"}, {"santali-ol-chiki", "sat@olchiki"}, {"sardinian", "sc_IT"}, {"sardu", "sc_IT"}, @@ -516,7 +516,7 @@ static void show_lang_usage(int exitcode) /* cgg */ " kiga chiga\n" /* rw */ " kinyarwanda\n" /* tlh */ " klingon tlhIngan\n" -/* kok */ " konkani-devaganari\n" +/* kok */ " konkani-devanagari\n" /* kok@roman */ " konkani-roman\n" /* ko */ " korean\n" /* ku */ " kurdish\n" @@ -547,7 +547,7 @@ static void show_lang_usage(int exitcode) /* ro */ " romanian\n" /* ru */ " russian russkiy\n" /* sa */ " sanskrit\n" -/* sat */ " santali-devaganari\n" +/* sat */ " santali-devanagari\n" /* sat@olchiki */ " santali-ol-chiki\n" /* sc */ " sardinian sardu\n" /* gd */ " scottish scottish-gaelic ghaidhlig\n" @@ -674,7 +674,7 @@ static void show_locale_usage(FILE * f, const char *const prg) " lb_LU (Luxembourgish Letzebuergesch)\n" " lv_LV (Latvian)\n" " lt_LT (Lithuanian Lietuviu)\n" - " kok_IN (Konkani (Devaganari))\n" + " kok_IN (Konkani (Devanagari))\n" " kok@roman (Konkani (Roman))\n" " mai_IN (Maithili)\n" " mk_MK (Macedonian)\n" diff --git a/src/i18n.h b/src/i18n.h index 37b023b48..8a0ef346c 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -101,7 +101,7 @@ enum LANG_KN, /* Kannada */ LANG_KM, /* Khmer */ LANG_KOK_ROMAN, /* Konkani (Roman) */ - LANG_KOK, /* Konkani (Devaganari) */ + LANG_KOK, /* Konkani (Devanagari) */ LANG_KO, /* Korean */ LANG_KS_DEVANAGARI, /* Kashmiri (Devanagari script) */ LANG_KS, /* Kashmiri (Perso-Arabic script) */ diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 4569b3322..1ea5bc350 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -740,7 +740,7 @@ khmer klingon | tlhIngan .TP 2 - -konkani-devaganari +konkani-devanagari .TP 2 - konkani-roman @@ -833,7 +833,7 @@ russian | russkiy sanskrit .TP 2 - -santali-devaganari +santali-devanagari .TP 2 - santali-ol-chiki From 5a1a80ff69180640cd0294297980e36d9c53c1eb Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Tue, 10 Nov 2020 09:54:50 -0800 Subject: [PATCH 30/41] Correct locked shapes' rotation after corner drag When using the new (on 0.9.25) corner-drag option for creating a new shape, "shape-locked" (1:1 aspect ratio) shapes -- square and octagon -- would only rotate in a few positions, based on the angle of ther vertices. Corrected this, with no apparent adverse effect on other shapes, in either drag mode (classic "from-center", and new "from-corner"). Also, removed extranous whitespace before EOLs in src/tuxpaint.c. --- src/tuxpaint.c | 81 +++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index c08b32d76..da91f03e4 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - October 15, 2020 + June 14, 2002 - November 10, 2020 */ @@ -1533,7 +1533,7 @@ static SDL_Surface *render_text(TuxPaint_Font * restrict font, const char *restr /** * Convert a wide-character string to string of Uint16's. - * + * * This conversion is required on platforms where Uint16 doesn't match wchar_t. * On Windows, wchar_t is 16-bit, elsewhere it is 32-bit. * Mismatch caused by the use of Uint16 for unicode characters by SDL, SDL_ttf. @@ -2220,7 +2220,7 @@ int brushflag, xnew, ynew, eraflag, lineflag, magicflag, keybd_flag, keybd_posit int cur_thing; /** - * --- MAIN LOOP! --- + * --- MAIN LOOP! --- */ static void mainloop(void) { @@ -9274,7 +9274,7 @@ static void draw_shapes(void) /* Show shape-from-center button: */ - if (shape_mode == SHAPEMODE_CENTER) + if (shape_mode == SHAPEMODE_CENTER) button_color = img_btn_down; else button_color = img_btn_up; @@ -9292,7 +9292,7 @@ static void draw_shapes(void) /* Show shape-from-corner button: */ - if (shape_mode == SHAPEMODE_CORNER) + if (shape_mode == SHAPEMODE_CORNER) button_color = img_btn_down; else button_color = img_btn_up; @@ -11447,7 +11447,7 @@ static int SDLCALL NondefectiveBlit(SDL_Surface * src, SDL_Rect * srcrect, SDL_S /** * Copy an image, scaling and smearing, as needed, into a new surface. * Free the original surface. - * + * * @param SDL_Surface * src -- source surface (will be freed by this function!) * @param SDL_Surface * dst -- destination surface * @param int SDCALL(*blit) -- function for blitting; "NondefectiveBlit" or "SDL_BlitSurface" @@ -13181,22 +13181,22 @@ static void do_shape(int sx, int sy, int nx, int ny, int rotn, int use_brush) if (rotn != 0) { rotn_rad = rotn * M_PI / 180; - + xp = (x1 + offx) * cos(rotn_rad) - (y1 + offy) * sin(rotn_rad); yp = (x1 + offx) * sin(rotn_rad) + (y1 + offy) * cos(rotn_rad); - + x1 = xp - offx; y1 = yp - offy; - + xp = (x2 + offx) * cos(rotn_rad) - (y2 + offy) * sin(rotn_rad); yp = (x2 + offx) * sin(rotn_rad) + (y2 + offy) * cos(rotn_rad); - + x2 = xp - offx; y2 = yp - offy; - + xp = (xv + offx) * cos(rotn_rad) - (yv + offy) * sin(rotn_rad); yp = (xv + offx) * sin(rotn_rad) + (yv + offy) * cos(rotn_rad); - + xv = xp - offx; yv = yp - offy; } @@ -13271,6 +13271,10 @@ static int shape_rotation(int ctr_x, int ctr_y, int ox, int oy) else if (shape_radius < 100) deg = ((deg - 7) / 15) * 15; + /* Disabled b/c it adversely affected shape_locked shapes (square & octagon) + with corner-dragged shapes; disabling doesn't seem to cause problems + with any shape, in either drag mode... -bjk 2020-11-10 */ +/* if (shape_locked[cur_shape]) { int angle_skip; @@ -13278,6 +13282,7 @@ static int shape_rotation(int ctr_x, int ctr_y, int ox, int oy) angle_skip = 360 / shape_sides[cur_shape]; deg = deg % angle_skip; } +*/ return (deg); } @@ -16003,19 +16008,19 @@ static int do_slideshow(void) draw_toolbar(); draw_colors(COLORSEL_CLOBBER_WIPE); draw_none(); - + /* Show a message depending on success */ if (export_successful) do_prompt_snd(PROMPT_GIF_EXPORT_TXT, PROMPT_EXPORT_YES, "", SND_TUXOK, screen->w / 2, screen->h / 2); else do_prompt_snd(PROMPT_GIF_EXPORT_FAILED_TXT, PROMPT_EXPORT_YES, "", SND_YOUCANNOT, screen->w / 2, screen->h / 2); - + freeme = textdir(TUX_TIP_SLIDESHOW); draw_tux_text(TUX_BORED, freeme, 1); free(freeme); - + SDL_Flip(screen); - + update_list = 1; } } @@ -22971,7 +22976,7 @@ static void setup_config(char *argv[]) free(picturesdir); exportdir = strdup(str); } - + /* Load options from user's own configuration (".rc" / ".cfg") file: */ #if defined(_WIN32) @@ -25575,12 +25580,12 @@ char * get_xdg_user_dir(const char * dir_type, const char * fallback) { } else { safe_strncpy(return_path, found, MAX_PATH); } - + /* Trim trailing " */ if (return_path[strlen(return_path) - 1] == '\"') { return_path[strlen(return_path) - 1] = '\0'; } - + found_it = TRUE; } } @@ -25672,34 +25677,34 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n if (bitmap != NULL) { done = 0; - + for (i = 0; i < num_selected && !done; i++) { which = selected[i]; show_progress_bar(screen); - - + + /* Figure out filename: */ safe_snprintf(fname, sizeof(fname), "%s/%s%s", dirname, d_names[which], d_exts[which]); - + /* Load and scale the image */ img = myIMG_Load(fname); - + if (img != NULL) { autoscale_copy_smear_free(img, screen, SDL_BlitSurface); - + safe_strncpy(file_id, d_names[which], sizeof(file_id)); - + /* See if this saved image was based on a 'starter' */ load_starter_id(d_names[which], NULL); if (starter_id[0] != '\0') { load_starter(starter_id); - + if (starter_mirrored) mirror_starter(); - + if (starter_flipped) flip_starter(); } @@ -25715,7 +25720,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n for (y = 0; y < overall_h; y++) { for (x = 0; x < overall_w; x++) { SDL_GetRGBA(getpixels[screen->format->BytesPerPixel](screen, x, y), screen->format, &r, &g, &b, &a); - + bitmap[((i * overall_area) + (y * overall_w) + x) * 4 + 0] = r; bitmap[((i * overall_area) + (y * overall_w) + x) * 4 + 1] = g; bitmap[((i * overall_area) + (y * overall_w) + x) * 4 + 2] = b; @@ -25724,7 +25729,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n } SDL_Flip(screen); - done = export_gif_monitor_events(); + done = export_gif_monitor_events(); } @@ -25732,7 +25737,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n { /* Quantize to max 256 (8bpp) colors and generate a suitable palette */ liq_handle = liq_attr_create(); - input_image = liq_image_create_rgba(liq_handle, bitmap, overall_w, num_selected * overall_h, 0); + input_image = liq_image_create_rgba(liq_handle, bitmap, overall_w, num_selected * overall_h, 0); liq_set_max_colors(liq_handle, 256); show_progress_bar(screen); @@ -25750,7 +25755,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n pixels_size = num_selected * overall_area; raw_8bit_pixels = malloc(pixels_size); liq_set_dithering_level(quantization_result, 1.0); - + liq_write_remapped_image(quantization_result, input_image, raw_8bit_pixels, pixels_size); palette = liq_get_palette(quantization_result); free(bitmap); @@ -25769,24 +25774,24 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n 8, /* 256 colors */ 0 /* infinite loop */ ); - + /* Export each frame */ for (i = 0; i < num_selected && !done; i++) { memcpy(gif->frame, raw_8bit_pixels + i * overall_area, overall_area); ge_add_frame(gif, gif_speed); - + show_progress_bar(screen); - done = export_gif_monitor_events(); + done = export_gif_monitor_events(); } - + /* Close the GIF */ ge_close_gif(gif); } else { fprintf(stderr, "Quantization failed\n"); done = 1; } - + if (done) { /* Aborted; discard the partially-saved GIF */ @@ -25816,7 +25821,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n starter_flipped = tmp_starter_flipped; starter_personal = tmp_starter_personal; - + free(gif_fname); /* Success if we didn't have an error, and user didn't abort */ From a36dcee3218c282eeed84e316657006b18b4d33b Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 13 Nov 2020 20:36:35 -0800 Subject: [PATCH 31/41] Mend personal Template loading bug in New dialog Mended bug where a personal Template could not be loaded due to how we tracked which entry in the "New" dialog was the first template image. Also, don't track directories when searching for Starters and Templates (e.g., ".", "..", and ".thumbs"), since it's just a waste of time/space. --- docs/CHANGES.txt | 4 ++++ src/tuxpaint.c | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 25be699f4..ad2be6ef6 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -116,6 +116,10 @@ $Id$ descriptions, if we failed to know what language to use (see above). + * Mended bug where a personal Template could not be loaded + due to how we tracked which entry in the "New" dialog + was the first template image. + * New Translations: ----------------- diff --git a/src/tuxpaint.c b/src/tuxpaint.c index da91f03e4..09326a0f1 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - November 10, 2020 + June 14, 2002 - November 13, 2020 */ @@ -11635,6 +11635,7 @@ static SDL_Surface *load_starter_helper(char *path_and_basename, const char *ext ext = strdup(extension); safe_snprintf(fname, sizeof(fname), "%s.%s", path_and_basename, ext); + surf = (*load_func) (fname); if (surf == NULL) @@ -16194,6 +16195,7 @@ static void play_slideshow(int *selected, int num_selected, char *dirname, char SDL_Surface *img; char *tmp_starter_id, *tmp_template_id, *tmp_file_id; int tmp_starter_mirrored, tmp_starter_flipped, tmp_starter_personal; + /* FIXME: Do we want to keep `template_personal` safe, too? */ char fname[1024]; SDL_Event event; SDLKey key; @@ -16211,6 +16213,7 @@ static void play_slideshow(int *selected, int num_selected, char *dirname, char tmp_starter_mirrored = starter_mirrored; tmp_starter_flipped = starter_flipped; tmp_starter_personal = starter_personal; + /* FIXME: Do we want to keep `template_personal` safe, too? */ do_setcursor(cursor_tiny); @@ -19063,7 +19066,7 @@ static int do_new_dialog(void) DIR *d; struct dirent *f; struct dirent2 *fs; - int place, oldplace; + int place; char *dirname[NUM_PLACES_TO_LOOK]; char **d_names = NULL, **d_exts = NULL; int *d_places; @@ -19149,7 +19152,7 @@ static int do_new_dialog(void) { f = readdir(d); - if (f != NULL) + if (f != NULL && f->d_type != DT_DIR) { memcpy(&(fs[num_files_in_dirs].f), f, sizeof(struct dirent)); fs[num_files_in_dirs].place = places_to_look; @@ -19204,19 +19207,14 @@ static int do_new_dialog(void) /* Read directory of images and build thumbnails: */ - oldplace = -1; - for (j = 0; j < num_files_in_dirs; j++) { f = &(fs[j].f); place = fs[j].place; - if ((place == PLACE_PERSONAL_TEMPLATES_DIR || place == PLACE_TEMPLATES_DIR) && oldplace != place) + if ((place == PLACE_PERSONAL_TEMPLATES_DIR || place == PLACE_TEMPLATES_DIR) && first_template == -1) first_template = num_files; - oldplace = place; - - show_progress_bar(screen); if (f != NULL) From 968de6f0ea960ea66563028768e8d97eb04c8160 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 15 Nov 2020 13:47:29 +0900 Subject: [PATCH 32/41] Enabled compiling on John Popplewell's build environment (for Windows 2000 & XP) --- Makefile | 12 +++++++++++- src/tuxpaint.c | 9 +++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7fb2e6fe6..7d238793a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,12 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf - MINGW_DIR:=/mingw32 + ifeq ($(findstring NT-6.2, $(SYSNAME)),NT-6.2) + BDIST_2KXP:=True + MINGW_DIR:=/usr/local + else + MINGW_DIR:=/mingw32 + endif else ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) OS:=windows @@ -888,6 +893,11 @@ install-dlls: @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll + @if [ "x$(BDIST_2KXP)" = "xTrue" ]; then \ + mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ + cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ + strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \ + fi # Install symlink: .PHONY: install-haiku diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 09326a0f1..183fa93db 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -455,7 +455,9 @@ static void mtw(wchar_t * wtok, char *tok) #else #include -/* #include -- Deprecated */ +#if defined (__MINGW32__) && (__GNUC__ <= 4 ) +#include +#endif #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H) #error "---------------------------------------------------" @@ -16915,8 +16917,11 @@ static void do_render_cur_text(int do_blit) { #if defined(_FRIBIDI_H) || defined(FRIBIDI_H) //FriBidiCharType baseDir = FRIBIDI_TYPE_LTR; - //FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal , 2009-01-14 */ +#if defined (__MINGW32__) && (__GNUC__ <= 4 ) + FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal , 2009-01-14 */ +#else FriBidiParType baseDir = FRIBIDI_TYPE_WL; //EP to avoid warning on types in now commented line above +#endif FriBidiChar *unicodeIn, *unicodeOut; unsigned int i; From 612c7cae46d588ce78d1529250d9a95684a317f5 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 15 Nov 2020 22:11:18 +0900 Subject: [PATCH 33/41] install-dlls.sh does not collect all required dlls on JP's build env. --- Makefile | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7d238793a..706f4b3c0 100644 --- a/Makefile +++ b/Makefile @@ -883,7 +883,50 @@ install-dlls: @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) @cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) - @src/install-dlls.sh tuxpaint.exe $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX) + @if [ "x$(BDIST_2KXP)" = "xTrue" ]; then \ + cp $(MINGW_DIR)/bin/libintl-8.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libiconv-2.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpng12.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/SDL.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/SDL_image.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/SDL_mixer.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/SDL_ttf.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libfreetype-6.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/zlib1.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libogg-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libvorbis-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libvorbisfile-3.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libjpeg-8.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libfribidi-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libxml2-2.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libcairo-2.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libfontconfig-1.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libSDL_Pango-1.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgobject-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgthread-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/librsvg-2-2.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libcroco-0.6-3.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgdk_pixbuf-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libglib-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgsf-1-114.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpango-1.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpangocairo-1.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpangoft2-1.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgmodule-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpangowin32-1.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libpixman-1-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libgio-2.0-0.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/bz2-1.dll $(BIN_PREFIX); \ + cp $(MINGW_DIR)/bin/libimagequant.dll $(BIN_PREFIX); \ + cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX); \ + cp `which libstdc++-6.dll` $(BIN_PREFIX); \ + cp `which libpthread-2.dll` $(BIN_PREFIX); \ + mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ + cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ + strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \ + else \ + src/install-dlls.sh tuxpaint.exe $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX); \ + fi @strip -s $(BIN_PREFIX)/*.dll @echo @echo "...Installing Configuration Files..." @@ -893,11 +936,6 @@ install-dlls: @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll - @if [ "x$(BDIST_2KXP)" = "xTrue" ]; then \ - mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \ - fi # Install symlink: .PHONY: install-haiku From de907326cfa129295b3bb5952a9d1de0e575a9ce Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Sun, 15 Nov 2020 22:36:05 +0900 Subject: [PATCH 34/41] Reverted to Inno Setup Version 5 (for Windows 2000 & XP) --- win32/tuxpaint.iss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index 43de5bc8e..e4c23da4b 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -85,7 +85,7 @@ PrivilegesRequired=admin Name: "afr"; MessagesFile: "compiler:Languages\Afrikaans.isl" Name: "alb"; MessagesFile: "compiler:Languages\Albanian.isl" Name: "ara"; MessagesFile: "compiler:Languages\Arabic.isl" -Name: "arm"; MessagesFile: "compiler:Languages\Armenian.isl" +Name: "arm"; MessagesFile: "compiler:Languages\Armenian.islu" Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-es-COPIADO.txt" Name: "baq"; MessagesFile: "compiler:Languages\Basque.isl" Name: "bel"; MessagesFile: "compiler:Languages\Belarusian.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-be.txt" @@ -96,7 +96,7 @@ Name: "bul"; MessagesFile: "compiler:Languages\Bulgarian.isl"; LicenseFile: "{#B Name: "cat"; MessagesFile: "compiler:Languages\Catalan.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-ca.txt" Name: "chs"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_cn.txt" Name: "cht"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-zh_tw_GNU_GPL_Chinese.txt" -Name: "cnr"; MessagesFile: "compiler:Languages\Montenegrin.isl" +Name: "cnr"; MessagesFile: "compiler:Languages\Montenegrian.isl" Name: "cos"; MessagesFile: "compiler:Languages\Corsican.isl" Name: "cze"; MessagesFile: "compiler:Languages\Czech.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-cs.txt" Name: "dan"; MessagesFile: "compiler:Languages\Danish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-da.txt" @@ -110,7 +110,7 @@ Name: "fas"; MessagesFile: "compiler:Languages\Farsi.isl" Name: "fin"; MessagesFile: "compiler:Languages\Finnish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fi.txt" Name: "fre"; MessagesFile: "compiler:Languages\French.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-fr-COPIER.txt" Name: "gal"; MessagesFile: "compiler:Languages\Galician.isl" -Name: "geo"; MessagesFile: "compiler:Languages\Georgian.isl" +Name: "geo"; MessagesFile: "compiler:Languages\Georgian.islu" Name: "ger"; MessagesFile: "compiler:Languages\German.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-de-KOPIE.txt" Name: "gla"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" Name: "gre"; MessagesFile: "compiler:Languages\Greek.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-el.txt" @@ -151,8 +151,7 @@ Name: "tai"; MessagesFile: "compiler:Languages\Thai.isl" Name: "tat"; MessagesFile: "compiler:Languages\Tatar.isl" Name: "tur"; MessagesFile: "compiler:Languages\Turkish.isl"; LicenseFile: "{#BdistDir}\docs\COPYING\COPYING-tr.txt" Name: "uig"; MessagesFile: "compiler:Languages\Uyghur.islu" -Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" -Name: "urd"; MessagesFile: "compiler:Languages\Urdu.isl" +Name: "ukr"; MessagesFile: "compiler:Languages\Ukrainian.isl" Name: "uzb"; MessagesFile: "compiler:Languages\Uzbek.isl" Name: "vie"; MessagesFile: "compiler:Languages\Vietnamese.isl" From 032c89a65ec394e5da3f8ee812f8e55ebf732fc7 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 21 Nov 2020 14:26:08 -0800 Subject: [PATCH 35/41] Fix: struct dirent has no "d_type" on MinGW/MSYS2 I found current git tree does not compile on Windows because struct dirent has no member "d_type" on MinGW/MSYS2. (TOYAMA Shin-ich via Tuxpaint-devel list) --- src/tuxpaint.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 183fa93db..18aa01552 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -19071,6 +19071,7 @@ static int do_new_dialog(void) DIR *d; struct dirent *f; struct dirent2 *fs; + struct stat sbuf; int place; char *dirname[NUM_PLACES_TO_LOOK]; char **d_names = NULL, **d_exts = NULL; @@ -19157,18 +19158,22 @@ static int do_new_dialog(void) { f = readdir(d); - if (f != NULL && f->d_type != DT_DIR) + if (f !=NULL) { - memcpy(&(fs[num_files_in_dirs].f), f, sizeof(struct dirent)); - fs[num_files_in_dirs].place = places_to_look; - - num_files_in_dirs++; - - if (num_files_in_dirs >= things_alloced) + safe_snprintf(fname, sizeof(fname), "%s/%s", dirname[places_to_look], f->d_name); + if (!stat(fname, &sbuf) && S_ISREG(sbuf.st_mode)) { - things_alloced = things_alloced + 32; + memcpy(&(fs[num_files_in_dirs].f), f, sizeof(struct dirent)); + fs[num_files_in_dirs].place = places_to_look; - fs = (struct dirent2 *)realloc(fs, sizeof(struct dirent2) * things_alloced); + num_files_in_dirs++; + + if (num_files_in_dirs >= things_alloced) + { + things_alloced = things_alloced + 32; + + fs = (struct dirent2 *)realloc(fs, sizeof(struct dirent2) * things_alloced); + } } } } From 71152d136963f68ad8dc5689f82c56d9755292cd Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 21 Nov 2020 14:27:26 -0800 Subject: [PATCH 36/41] Bump latest mod. date in docs and tuxpaint.c --- docs/CHANGES.txt | 2 +- docs/en/README.txt | 2 +- docs/en/html/README.html | 2 +- src/tuxpaint.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index ad2be6ef6..ff83bbc76 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.October.30 (0.9.25) +2020.November.21 (0.9.25) * New Features ------------ * Export drawings: diff --git a/docs/en/README.txt b/docs/en/README.txt index 85d0e57cd..9041ff022 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -6,7 +6,7 @@ Copyright 2002-2020 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ - June 14, 2002 - August 25, 2020 + June 14, 2002 - November 21, 2020 ---------------------------------------------------------------------- diff --git a/docs/en/html/README.html b/docs/en/html/README.html index bad42f684..3d9222455 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -35,7 +35,7 @@

    - June 14, 2002 - August 25, 2020 + June 14, 2002 - November 21, 2020

    diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 18aa01552..11e0ab82e 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - November 13, 2020 + June 14, 2002 - November 21, 2020 */ From 9b974311cf362276e792a36be5f75035da86cc6c Mon Sep 17 00:00:00 2001 From: jimmy Date: Tue, 8 Dec 2020 10:52:22 +0100 Subject: [PATCH 37/41] =?UTF-8?q?jacques.chion@orange.fr=20=09modifi=C3=A9?= =?UTF-8?q?=C2=A0:=20=20=20=20=20=20=20=20=20fr.po?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/po/fr.po | 59 +++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/src/po/fr.po b/src/po/fr.po index 1e0183d37..d50389953 100644 --- a/src/po/fr.po +++ b/src/po/fr.po @@ -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 \n" "Language-Team: \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" From 387f1ed06d485e76fdf17b94f596f9d5a0455e65 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Tue, 8 Dec 2020 09:45:06 -0800 Subject: [PATCH 38/41] Doc'ing French update --- docs/CHANGES.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index ff83bbc76..d6150353b 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2020.November.21 (0.9.25) +2020.December.8 (0.9.25) * New Features ------------ * Export drawings: @@ -134,6 +134,9 @@ $Id$ * Catalan translation Pere Pujal i Carabantes + * French translation + Chion Jacques + * Galician translation Miguel Bouzada From c7ed85cd8863b0621d7f09b7d73d5ef171e4a860 Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Thu, 10 Dec 2020 16:47:05 -0500 Subject: [PATCH 39/41] Change "echo -n" to "printf" in Makefile The `echo` command built into the default macOS shell doesn't understand -n. This commit changes it to use "printf" instead which should be fairly portable across other OS's. Feel free to change it back if it breaks anything. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 706f4b3c0..455080f9e 100644 --- a/Makefile +++ b/Makefile @@ -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 $@ ) ; \ From 60e064b34fae10353439dcd2f8414319b8346bd6 Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Thu, 10 Dec 2020 17:40:34 -0500 Subject: [PATCH 40/41] Change osx_ prefix to macos_ in Makefile Apple has changed the name of their OS from OS X to macOS a loooong time ago. It's about time to update it in the Makefile. --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 455080f9e..484f0d3e2 100644 --- a/Makefile +++ b/Makefile @@ -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."; \ @@ -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) From 49d76283709ed74169e90083a817df196f22b9e9 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Fri, 11 Dec 2020 19:07:23 +0100 Subject: [PATCH 41/41] Icelandic update by Sveinn. --- src/po/is.po | 3290 +++++++++++++++++++++++++------------------------- 1 file changed, 1646 insertions(+), 1644 deletions(-) diff --git a/src/po/is.po b/src/po/is.po index 0a9a50a5b..086d5663b 100644 --- a/src/po/is.po +++ b/src/po/is.po @@ -1,1644 +1,1646 @@ -# Tux Paint Translation to Icelandic. -# Íslensk þýðing á TuxPaint -# Copyright (C) 2002-2017. -# This file is distributed under the same license as the tuxpaint package. -# -# Pjetur G. Hjaltason , 2002, 2003, 2004, 2014. -# Sveinn í Felli , 2015, 2017, 2020. -msgid "" -msgstr "" -"Project-Id-Version: tuxpaint\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-15 16:42-0700\n" -"PO-Revision-Date: 2020-08-16 09:37+0000\n" -"Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" -"Language: is\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" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#. Response to Black (0, 0, 0) color selected -#: ../colors.h:86 -msgid "Black!" -msgstr "Svart!" - -#. Response to Dark grey (128, 128, 128) color selected -#: ../colors.h:89 -msgid "Dark grey! Some people spell it “dark gray”." -msgstr "Dökkgrátt!" - -#. Response to Light grey (192, 192, 192) color selected -#: ../colors.h:92 -msgid "Light grey! Some people spell it “light gray”." -msgstr "Ljósgrátt!" - -#. Response to White (255, 255, 255) color selected -#: ../colors.h:95 -msgid "White!" -msgstr "Hvítt!" - -#. Response to Red (255, 0, 0) color selected -#: ../colors.h:98 -msgid "Red!" -msgstr "Rautt!" - -#. Response to Orange (255, 128, 0) color selected -#: ../colors.h:101 -msgid "Orange!" -msgstr "Appelsínugult!" - -#. Response to Yellow (255, 255, 0) color selected -#: ../colors.h:104 -msgid "Yellow!" -msgstr "Gult!" - -#. Response to Light green (160, 228, 128) color selected -#: ../colors.h:107 -msgid "Light green!" -msgstr "Ljósgrænt!" - -#. Response to Dark green (33, 148, 70) color selected -#: ../colors.h:110 -msgid "Dark green!" -msgstr "Dökkgrænt!" - -#. Response to "Sky" blue (138, 168, 205) color selected -#: ../colors.h:113 -msgid "Sky blue!" -msgstr "Himinblátt" - -#. Response to Blue (50, 100, 255) color selected -#: ../colors.h:116 -msgid "Blue!" -msgstr "Blátt!" - -#. Response to Lavender (186, 157, 255) color selected -#: ../colors.h:119 -msgid "Lavender!" -msgstr "Lillablátt!" - -#. Response to Purple (128, 0, 128) color selected -#: ../colors.h:122 -msgid "Purple!" -msgstr "Fjólublátt!" - -#. Response to Pink (255, 165, 211) color selected -#: ../colors.h:125 -msgid "Pink!" -msgstr "Bleikt!" - -#. Response to Brown (128, 80, 0) color selected -#: ../colors.h:128 -msgid "Brown!" -msgstr "Brúnt!" - -#. Response to Tan (226, 189, 166) color selected -#: ../colors.h:131 -msgid "Tan!" -msgstr "Ljósbrúnt!" - -#. Response to Beige (247, 228, 219) color selected -#: ../colors.h:134 -msgid "Beige!" -msgstr "Fölbrúnt!" - -#. First, the blacklist. We list font families that can crash Tux Paint -#. via bugs in the SDL_ttf library. We also test fonts to be sure that -#. they have both uppercase and lowercase letters. Note that we do not -#. test for "Aa", because it is OK if uppercase and lowercase are the -#. same (but not nice -- such fonts get a low score later). -#. -#. Most locales leave the blacklist strings alone: "QX" and "qx" -#. (it is less destructive to use the scoring strings instead) -#. -#. Locales that absolutely require all fonts to have some -#. extra characters should use "QX..." and "qx...", where "..." -#. are some characters you absolutely require in all fonts. -#. -#. Locales with absolutely NO use for ASCII may use "..." and "...", -#. where "..." are some characters you absolutely require in -#. all fonts. This would be the case for a locale in which it is -#. impossible for a user to type ASCII letters. -#. -#. Most translators should use scoring instead. -#: ../dirwalk.c:177 -msgid "qx" -msgstr "qx" - -#: ../dirwalk.c:177 -msgid "QX" -msgstr "QX" - -#. TODO: weight specification -#. Now we score fonts to ensure that the best ones will be placed at -#. the top of the list. The user will see them first. This sorting is -#. especially important for users who have scroll buttons disabled. -#. Translators should do whatever is needed to put crummy fonts last. -#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') -#: ../dirwalk.c:202 -msgid "oO" -msgstr "oO" - -#. common punctuation (e.g., '?', '!', '.', ',', etc.) -#: ../dirwalk.c:205 -msgid ",.?!" -msgstr ",.?!" - -#. uncommon punctuation (e.g., '@', '#', '*', etc.) -#: ../dirwalk.c:208 -msgid "`%_@$~#{<(^&*" -msgstr "€`%_@$~#{<(^&*" - -#. digits (e.g., '0', '1' and '7') -#: ../dirwalk.c:211 -msgid "017" -msgstr "017" - -#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) -#: ../dirwalk.c:214 -msgid "O0" -msgstr "O0" - -#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) -#: ../dirwalk.c:217 -msgid "1Il|" -msgstr "1Il|" - -#: ../dirwalk.c:221 -msgid "<1>spare-1a" -msgstr "aa" - -#: ../dirwalk.c:222 -msgid "<1>spare-1b" -msgstr "AA" - -#: ../dirwalk.c:223 -msgid "<9>spare-9a" -msgstr "ðéíóúþæö" - -#: ../dirwalk.c:224 -msgid "<9>spare-9b" -msgstr "ÐÉÍÓÚÞÆÖ" - -#. Congratulations #1 -#: ../great.h:37 -msgid "Great!" -msgstr "Frábært!" - -#. Congratulations #2 -#: ../great.h:40 -msgid "Cool!" -msgstr "Flott!" - -#. Congratulations #3 -#: ../great.h:43 -msgid "Keep it up!" -msgstr "Haltu þessu áfram!" - -#. Congratulations #4 -#: ../great.h:46 -msgid "Good job!" -msgstr "Vel gert!" - -#. Input Method: English mode -#: ../im.c:74 -msgid "English" -msgstr "Enska" - -#. Input Method: Japanese Romanized Hiragana mode -#: ../im.c:77 -msgid "Hiragana" -msgstr "Hiragana" - -#. Input Method: Japanese Romanized Katakana mode -#: ../im.c:80 -msgid "Katakana" -msgstr "Katakana" - -#. Input Method: Korean Hangul 2-Bul mode -#: ../im.c:83 -msgid "Hangul" -msgstr "Hangul" - -#. Input Method: Thai mode -#: ../im.c:86 -msgid "Thai" -msgstr "Tælenska" - -#. Input Method: Traditional Chinese mode -#: ../im.c:89 -msgid "ZH_TW" -msgstr "ZH_TW kínverska" - -#. Square shape tool (4 equally-lengthed sides at right angles) -#: ../shapes.h:234 ../shapes.h:235 -msgid "Square" -msgstr "Ferningur" - -#. Rectangle shape tool (4 sides at right angles) -#: ../shapes.h:238 ../shapes.h:239 -msgid "Rectangle" -msgstr "Rétthyrningur" - -#. Circle shape tool (X radius and Y radius are the same) -#: ../shapes.h:242 ../shapes.h:243 -msgid "Circle" -msgstr "Hringur" - -#. Ellipse shape tool (X radius and Y radius may differ) -#: ../shapes.h:246 ../shapes.h:247 -msgid "Ellipse" -msgstr "Sporbaugur" - -#. Triangle shape tool (3 sides) -#: ../shapes.h:250 ../shapes.h:251 -msgid "Triangle" -msgstr "Þríhyrningur" - -#. Pentagone shape tool (5 sides) -#: ../shapes.h:254 ../shapes.h:255 -msgid "Pentagon" -msgstr "Fimmhyrningur" - -#. Rhombus shape tool (4 sides, not at right angles) -#: ../shapes.h:258 ../shapes.h:259 -msgid "Rhombus" -msgstr "Tígull" - -#. Octagon shape tool (8 sides) -#: ../shapes.h:262 ../shapes.h:263 -msgid "Octagon" -msgstr "Átthyrningur" - -#. Triangle star (3 points star) -#. Rhombus star (4 points star) -#. Pentagone star (5 points star) -#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 -#: ../shapes.h:278 ../shapes.h:281 -msgid "Star" -msgstr "Stjarna" - -#. Description of a square -#: ../shapes.h:289 ../shapes.h:290 -msgid "A square is a rectangle with four equal sides." -msgstr "Rétthyrningur hefur fjórar jafnlangar hliðar." - -#. Description of a rectangle -#: ../shapes.h:293 ../shapes.h:294 -msgid "A rectangle has four sides and four right angles." -msgstr "Rétthyrningur hefur fjórar hliðar og öll horn hornrétt." - -#. Description of a circle -#: ../shapes.h:297 ../shapes.h:298 -msgid "" -"A circle is a curve where all points have the same distance from the center." -msgstr "Hringur er ferill þar sem allir punktar eru í sömu fjarlægð frá miðju." - -#. Description of an ellipse -#: ../shapes.h:301 ../shapes.h:302 -msgid "An ellipse is a stretched circle." -msgstr "Sporbaugur er teygður hringur" - -#. Description of a triangle -#: ../shapes.h:305 ../shapes.h:306 -msgid "A triangle has three sides." -msgstr "Þríhyrningur hefur þrjár hliðar." - -#. Description of a pentagon -#: ../shapes.h:309 ../shapes.h:310 -msgid "A pentagon has five sides." -msgstr "Fimmhyrningur hefur fimm hliðar." - -#. Description of a rhombus -#: ../shapes.h:313 ../shapes.h:314 -msgid "A rhombus has four equal sides, and opposite sides are parallel." -msgstr "" -"Tígull hefur fjórar jafnlangar hliðar, og andstæðar hliðar eru samsíða." - -#. Description of an octagon -#: ../shapes.h:317 ../shapes.h:318 -msgid "An octagon has eight equal sides." -msgstr "Átthyrningur hefur átta hliðar." - -#: ../shapes.h:320 ../shapes.h:321 -msgid "A star with 3 points." -msgstr "Stjarna með 3 arma." - -#: ../shapes.h:322 ../shapes.h:323 -msgid "A star with 4 points." -msgstr "Stjarna með 4 arma." - -#: ../shapes.h:324 ../shapes.h:325 -msgid "A star with 5 points." -msgstr "Stjarna með 5 arma." - -#: ../shapes.h:372 -msgid "Draw shapes from the center." -msgstr "Teikna form frá miðju." - -#: ../shapes.h:373 -msgid "Draw shapes from a corner." -msgstr "Teikna form frá horni." - -#. Title of tool selector (buttons down the left) -#: ../titles.h:56 -msgid "Tools" -msgstr "Áhöld" - -#. Title of color palette (buttons across the bottom) -#: ../titles.h:59 -msgid "Colors" -msgstr "Litir" - -#. Title of brush selector (buttons down the right for paint and line tools) -#: ../titles.h:62 -msgid "Brushes" -msgstr "Penslar" - -# Strokleður is the same in plural as singular -#. Title of eraser selector (buttons down the right for eraser tool) -#: ../titles.h:65 -msgid "Erasers" -msgstr "Strokleður" - -#. Title of stamp selector (buttons down the right for stamps tool) -#: ../titles.h:68 -msgid "Stamps" -msgstr "Stimplar" - -#. Title of shape selector (buttons down the right for shapes tool) -#. Shape creation tool (square, circle, etc.) -#: ../titles.h:71 ../tools.h:71 -msgid "Shapes" -msgstr "Form" - -#. Title of font selector (buttons down the right for text and label tools) -#: ../titles.h:74 -msgid "Letters" -msgstr "Stafir" - -#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) -#. "Magic" effects tools (blur, flip image, etc.) -#: ../titles.h:77 ../tools.h:83 -msgid "Magic" -msgstr "Töfrar" - -#. Freehand painting tool -#: ../tools.h:62 -msgid "Paint" -msgstr "Teikna" - -#. Stamp tool (aka Rubber Stamps) -#: ../tools.h:65 -msgid "Stamp" -msgstr "Stimpla" - -#. Line drawing tool -#: ../tools.h:68 -msgid "Lines" -msgstr "Línur" - -#. Text tool -#: ../tools.h:74 -msgid "Text" -msgstr "Texti" - -#. Label tool -#: ../tools.h:77 -msgid "Label" -msgstr "Skýring" - -#. Fill tool -#: ../tools.h:80 -msgid "Fill" -msgstr "Fylla" - -#. Undo last action -#: ../tools.h:86 -msgid "Undo" -msgstr "Hætta við" - -#. Redo undone action -#: ../tools.h:89 -msgid "Redo" -msgstr "Gera aftur" - -#. Eraser tool -#: ../tools.h:92 -msgid "Eraser" -msgstr "Strokleður" - -#. Start a new picture -#: ../tools.h:95 -msgid "New" -msgstr "Nýtt" - -#. 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 -msgid "Open" -msgstr "Opna" - -#. Save the current picture -#: ../tools.h:101 -msgid "Save" -msgstr "Geyma" - -#. Print the current picture -#: ../tools.h:104 -msgid "Print" -msgstr "Prenta" - -#. Quit/exit Tux Paint application -#: ../tools.h:107 -msgid "Quit" -msgstr "Hætta" - -#. Paint tool instructions -#: ../tools.h:115 -msgid "Pick a color and a brush shape to draw with." -msgstr "Veldu lit og pensil til að teikna með." - -#. Stamp tool instructions -#: ../tools.h:118 -msgid "Pick a picture to stamp around your drawing." -msgstr "Veldu mynd til að nota sem stimpil." - -#. Line tool instructions -#: ../tools.h:121 -msgid "Click to start drawing a line. Let go to complete it." -msgstr "Smelltu til að byrja línu. Slepptu til að enda línuna." - -#: ../tools.h:125 -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 "" -"Veldu form. Smelltu til að byrja að teikna, dragðu músina til, slepptu þegar " -"það er af réttri stærð. Hreyfðu til að snúa forminu, og smelltu til að " -"teikna það." - -#: ../tools.h:129 -msgid "" -"Choose a style of text. Click on your drawing and you can start typing. " -"Press [Enter] or [Tab] to complete the text." -msgstr "" -"Veldu letur. Smelltu á myndina og þú getur byrjað að skrifa. Ýttu á [Enter] " -"eða [Tab] til að ljúka texta." - -#: ../tools.h:133 -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 existing label, you can move it, edit it and change its text " -"style." -msgstr "" -"Veldu stíl á letur. Smelltu á myndina og þú getur byrjað að skrifa. Ýttu á " -"[Enter] eða [Tab] til að ljúka texta. Með því að nota valhnappinn og smella " -"á texta sem fyrir er, þá getur þú fært textann, breytt honum og breytt " -"útliti og stíl." - -#. Fill tool instructions -#: ../tools.h:136 -msgid "Click in the picture to fill that area with color." -msgstr "Smelltu og hreyfðu músina til að fylla svæðið með lit." - -#. Magic tool instruction -#: ../tools.h:139 -msgid "Pick a magical effect to use on your drawing!" -msgstr "Veldu töfraaðferð sem þú ætlar að nota á myndina!" - -#. Response to 'undo' action -#: ../tools.h:142 -msgid "Undo!" -msgstr "Hætta við!" - -#. Response to 'redo' action -#: ../tools.h:145 -msgid "Redo!" -msgstr "Gera aftur!" - -#. Eraser tool -#: ../tools.h:148 -msgid "Eraser!" -msgstr "Strokleður!" - -#. Response to 'start a new image' action -#: ../tools.h:151 -msgid "Pick a color or picture with which to start a new drawing." -msgstr "Veldu lit eða mynd sem þú ætlar að nota til að búa til nýja mynd." - -#. Response to 'open' action (while file dialog is being constructed) -#: ../tools.h:154 -msgid "Open…" -msgstr "Opna..." - -#. Response to 'save' action -#: ../tools.h:157 -msgid "Your image has been saved!" -msgstr "Búið að geyma myndina þína!" - -#. Response to 'print' action (while printing, or print dialog is being used) -#: ../tools.h:160 -msgid "Printing…" -msgstr "Prenta..." - -#. Response to 'quit' (exit) action -#: ../tools.h:163 -msgid "Bye bye!" -msgstr "Bless!" - -#. Instruction while using Line tool (after click, before release) -#: ../tools.h:167 -msgid "Let go of the button to complete the line." -msgstr "Slepptu hnappnum til að enda línuna." - -#. Instruction while using Shape tool (after first click, before release) -#: ../tools.h:170 -msgid "Hold the button to stretch the shape." -msgstr "Haltu hnappnum niðri til að teygja formið." - -#. Instruction while finishing Shape tool (after release, during rotation step before second click) -#: ../tools.h:173 -msgid "Move the mouse to rotate the shape. Click to draw it." -msgstr "Hreyfðu músina til að snúa forminu. Smelltu til að teikna það." - -#. Notification that 'New' action was aborted (current image would have been lost) -#: ../tools.h:176 -msgid "OK then… Let’s keep drawing this one!" -msgstr "Allt í lagi... Höldum þá áfram með þessa!" - -#. Prompt to confirm user wishes to quit -#: ../tuxpaint.c:2134 -msgid "Do you really want to quit?" -msgstr "Viltu í alvöru hætta?" - -#. Quit prompt positive response (quit) -#: ../tuxpaint.c:2137 -msgid "Yes, I’m done!" -msgstr "Já, ég er búin!" - -#. Quit prompt negative response (don't quit) -#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 -msgid "No, take me back!" -msgstr "Nei, ég vil halda áfram!" - -#. Current picture is not saved; user is quitting -#: ../tuxpaint.c:2144 -msgid "If you quit, you’ll lose your picture! Save it?" -msgstr "Ef þú hættir, tapast myndin! Viltu geyma hana?" - -#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 -msgid "Yes, save it!" -msgstr "Já, geyma hana!" - -#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 -msgid "No, don’t bother saving!" -msgstr "Nei, ekki geyma þetta!" - -#. Current picture is not saved; user is opening another picture -#: ../tuxpaint.c:2149 -msgid "Save your picture first?" -msgstr "Geyma myndina fyrst?" - -#. Error opening picture -#: ../tuxpaint.c:2154 -msgid "Can’t open that picture!" -msgstr "Get ekki opnað þessa mynd!" - -#. Generic dialog dismissal -#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 -#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 -msgid "OK" -msgstr "Í lagi" - -#. Notification that 'Open' dialog has nothing to show -#: ../tuxpaint.c:2161 -msgid "There are no saved files!" -msgstr "Fann engar geymdar myndir!" - -#. Verification of print action -#: ../tuxpaint.c:2165 -msgid "Print your picture now?" -msgstr "Prenta myndina núna?" - -#: ../tuxpaint.c:2166 -msgid "Yes, print it!" -msgstr "Já, prentaðu hana!" - -#. Confirmation of successful (we hope) printing -#: ../tuxpaint.c:2170 -msgid "Your picture has been printed!" -msgstr "Búið að prenta myndina þína!" - -#. We got an error printing -#: ../tuxpaint.c:2174 -msgid "Sorry! Your picture could not be printed!" -msgstr "Því miður! Það var ekki hægt að prenta myndina þína!" - -#. Notification that it's too soon to print again (--printdelay option is in effect) -#: ../tuxpaint.c:2177 -msgid "You can’t print yet!" -msgstr "Þú getur ekki prentað strax!" - -#. Prompt to confirm erasing a picture in the Open dialog -#: ../tuxpaint.c:2181 -msgid "Erase this picture?" -msgstr "Eyða myndinni?" - -#: ../tuxpaint.c:2182 -msgid "Yes, erase it!" -msgstr "Já, eyða henni!" - -#: ../tuxpaint.c:2183 -msgid "No, don’t erase it!" -msgstr "Nei, ekki eyða henni!" - -#. Reminder that Mouse Button 1 is the button to use in Tux Paint -#: ../tuxpaint.c:2186 -msgid "Remember to use the left mouse button!" -msgstr "Muna eftir að nota vinstri músarhnappinn!" - -#. Confirmation of successful (we hope) image export -#: ../tuxpaint.c:2190 -msgid "Your picture has been exported!" -msgstr "Búið að flytja út myndina þína!" - -#: ../tuxpaint.c:2191 -msgid "Your slideshow GIF has been exported!" -msgstr "Búið að flytja út GIF-skyggnusýninguna þína!" - -#. We got an error exporting -#: ../tuxpaint.c:2195 -msgid "Sorry! Your picture could not be exported!" -msgstr "Því miður! Það var ekki hægt að flytja út myndina þína!" - -#: ../tuxpaint.c:2196 -msgid "Sorry! Your slideshow GIF could not be exported!" -msgstr "Því miður! Það var ekki hægt að flytja út GIF-skyggnusýninguna þína!" - -#. Slideshow instructions -#: ../tuxpaint.c:2200 -msgid "Choose the pictures you want, then click “Play”." -msgstr "Veldu myndirnar sem þú vilt, og smelltu svo á \"Spila\"." - -#. Sound has been muted (silenced) via keyboard shortcut -#: ../tuxpaint.c:2407 -msgid "Sound muted." -msgstr "Slökkt á hljóði." - -#. Sound has been unmuted (unsilenced) via keyboard shortcut -#: ../tuxpaint.c:2412 -msgid "Sound unmuted." -msgstr "Kveikt á hljóði." - -#. Wait while Text tool finishes loading fonts -#: ../tuxpaint.c:3167 -msgid "Please wait…" -msgstr "Bíddu aðeins..." - -#. Open dialog: 'Erase' button, to erase/deleted the selected picture -#: ../tuxpaint.c:7923 -msgid "Erase" -msgstr "Eyða" - -#. Open dialog: 'Slides' button, to switch to slide show mode -#: ../tuxpaint.c:7926 -msgid "Slides" -msgstr "Myndasýning" - -#. Open dialog: 'Export' button, to copy an image to an easily-accessible location -#: ../tuxpaint.c:7929 -msgid "Export" -msgstr "Flytja út" - -#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture -#: ../tuxpaint.c:7932 -msgid "Back" -msgstr "Til baka" - -#. Slideshow: 'Play' button, to begin a slideshow sequence -#: ../tuxpaint.c:7935 -msgid "Play" -msgstr "Spila" - -#. Slideshow: 'GIF Export' button, to create an animated GIF -#: ../tuxpaint.c:7938 -msgid "GIF Export" -msgstr "GIF-útflutningur" - -#. Slideshow: 'Next' button, to load next slide (image) -#: ../tuxpaint.c:7941 -msgid "Next" -msgstr "Áfram" - -#. 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 -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 -msgid "Yes" -msgstr "Já" - -#: ../tuxpaint.c:12073 -msgid "No" -msgstr "Nei" - -#. Prompt to ask whether user wishes to save over old version of their file -#: ../tuxpaint.c:13190 -msgid "Replace the picture with your changes?" -msgstr "Skipta út eldri myndinni með þeirri nýju?" - -#. Positive response to saving over old version -#. (like a 'File:Save' action in other applications) -#: ../tuxpaint.c:13194 -msgid "Yes, replace the old one!" -msgstr "Já, skipta út þeirri gömlu!" - -#. Negative response to saving over old version (saves a new image) -#. (like a 'File:Save As...' action in other applications) -#: ../tuxpaint.c:13198 -msgid "No, save a new file!" -msgstr "Nei, geyma nýja mynd!" - -#. Let user choose an image: -#. Instructions for 'Open' file dialog -#: ../tuxpaint.c:14454 -msgid "Choose the picture you want, then click “Open”." -msgstr "Veldu teikningu, og smelltu svo á '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 -msgid "Select 2 or more drawings to turn into an animated GIF." -msgstr "Veldu 2 eða fleiri teikningar sem á að breyta í GIF-hreyfimynd." - -#: ../tuxpaint.c:23539 -msgid "Select a color from your drawing." -msgstr "Veldu lit úr teikningunni þinni." - -#: ../tuxpaint.c:23551 -msgid "Pick a color." -msgstr "Veldu lit." - -#: ../tuxpaint.desktop.in.h:1 -msgid "Tux Paint" -msgstr "Tux Paint" - -#: ../tuxpaint.desktop.in.h:2 -msgid "Drawing program" -msgstr "Teikniforrit" - -#: ../tuxpaint.desktop.in.h:3 -msgid "A drawing program for children." -msgstr "Teikniforrit fyrir krakka." - -#: ../../magic/src/alien.c:68 -msgid "Color Shift" -msgstr "Litskipti" - -#: ../../magic/src/alien.c:72 -msgid "Click and drag the mouse to change the colors in parts of your picture." -msgstr "Smelltu og dragðu músina til að breyta litunum í hluta myndarinnar." - -#: ../../magic/src/alien.c:73 -msgid "Click to change the colors in your entire picture." -msgstr "Smelltu og hreyfðu músina til að breyta litunum í allri myndinni." - -#: ../../magic/src/blind.c:116 -msgid "Blind" -msgstr "Rimlagluggar" - -#: ../../magic/src/blind.c:123 -msgid "" -"Click towards the edge of your picture to pull window blinds over it. Move " -"perpendicularly to open or close the blinds." -msgstr "" -"Smelltu við jaðar myndarinnar til að draga rimlagluggatjöld fyrir myndina. " -"Færðu músina þvert til að opna og loka gluggatjöldunum." - -#: ../../magic/src/blocks_chalk_drip.c:129 -msgid "Blocks" -msgstr "Blokkir" - -#: ../../magic/src/blocks_chalk_drip.c:131 -msgid "Chalk" -msgstr "Krít" - -#: ../../magic/src/blocks_chalk_drip.c:133 -msgid "Drip" -msgstr "Leka" - -#: ../../magic/src/blocks_chalk_drip.c:142 -msgid "Click and drag the mouse around to make the picture blocky." -msgstr "Smelltu og dragðu músina til að gera myndina alla í blokkum." - -#: ../../magic/src/blocks_chalk_drip.c:144 -msgid "" -"Click and drag the mouse around to turn the picture into a chalk drawing." -msgstr "Smelltu og dragðu músina til að breyta myndinni í krítarmynd!" - -#: ../../magic/src/blocks_chalk_drip.c:146 -msgid "Click and drag the mouse around to make the picture drip." -msgstr "Smelltu og dragðu músina til að láta myndina leka." - -#: ../../magic/src/blur.c:80 -msgid "Blur" -msgstr "Móða" - -#: ../../magic/src/blur.c:84 -msgid "Click and drag the mouse around to blur the image." -msgstr "Smelltu og dragðu músina til að gera myndina óskýrari." - -#: ../../magic/src/blur.c:85 -msgid "Click to blur the entire image." -msgstr "Smelltu til að gera alla myndina óskýrari." - -#. Both are named "Bricks", at the moment: -#: ../../magic/src/bricks.c:120 -msgid "Bricks" -msgstr "Kassar" - -#: ../../magic/src/bricks.c:127 -msgid "Click and drag to draw large bricks." -msgstr "Smelltu og dragðu músina til að búa til stóra kassa." - -#: ../../magic/src/bricks.c:129 -msgid "Click and drag to draw small bricks." -msgstr "Smelltu og dragðu músina til að búa til litla kassa." - -#: ../../magic/src/calligraphy.c:124 -msgid "Calligraphy" -msgstr "Skrautritun" - -#: ../../magic/src/calligraphy.c:131 -msgid "Click and drag the mouse around to draw in calligraphy." -msgstr "Smelltu og dragðu músina til að teikna eins og skrautskrift." - -#: ../../magic/src/cartoon.c:103 -msgid "Cartoon" -msgstr "Teiknimynd" - -#: ../../magic/src/cartoon.c:109 -msgid "Click and drag the mouse around to turn the picture into a cartoon." -msgstr "Smelltu og dragðu músina til að breyta myndinni í teiknimynd." - -#: ../../magic/src/confetti.c:83 -msgid "Confetti" -msgstr "Pappírsskraut" - -#: ../../magic/src/confetti.c:88 -msgid "Click to throw confetti!" -msgstr "Smelltu til að kasta skrauti!" - -#: ../../magic/src/distortion.c:134 -msgid "Distortion" -msgstr "Afmynda" - -#: ../../magic/src/distortion.c:143 -msgid "Click and drag the mouse to cause distortion in your picture." -msgstr "Smelltu og dragðu músina til að afmynda hluta myndarinnar." - -#: ../../magic/src/emboss.c:101 -msgid "Emboss" -msgstr "Upphleypt" - -#: ../../magic/src/emboss.c:107 -msgid "Click and drag the mouse to emboss the picture." -msgstr "Smelltu og dragðu músina til að upphleypa myndina." - -#: ../../magic/src/fade_darken.c:114 -msgid "Lighten" -msgstr "Birta" - -#: ../../magic/src/fade_darken.c:116 -msgid "Darken" -msgstr "Dekkja" - -#: ../../magic/src/fade_darken.c:127 -msgid "Click and drag the mouse to lighten parts of your picture." -msgstr "Smelltu og dragðu músina til að gera hluta myndarinnar bjartari." - -#: ../../magic/src/fade_darken.c:129 -msgid "Click to lighten your entire picture." -msgstr "Smelltu til að gera myndina bjartari" - -#: ../../magic/src/fade_darken.c:134 -msgid "Click and drag the mouse to darken parts of your picture." -msgstr "Smelltu og dragðu músina til að gera hluta myndarinnar dekkri." - -#: ../../magic/src/fade_darken.c:136 -msgid "Click to darken your entire picture." -msgstr "Smelltu til að gera myndina dekkri." - -#: ../../magic/src/fisheye.c:101 -msgid "Fisheye" -msgstr "Fiskauga" - -#: ../../magic/src/fisheye.c:106 -msgid "Click on part of your picture to create a fisheye effect." -msgstr "Smelltu á svæði amyndinni til að framkalla fiskauga-áhrif." - -#: ../../magic/src/flower.c:144 -msgid "Flower" -msgstr "Blóm" - -#: ../../magic/src/flower.c:150 -msgid "Click and drag to draw a flower stalk. Let go to finish the flower." -msgstr "Smelltu og dragðu til að teikna blómstilk. Förum svo og klárum blómið." - -#: ../../magic/src/foam.c:114 -msgid "Foam" -msgstr "Froða" - -#: ../../magic/src/foam.c:120 -msgid "Click and drag the mouse to cover an area with foamy bubbles." -msgstr "Smelltu og dragðu músina yfir svæði til að þekja það með froðu." - -#: ../../magic/src/fold.c:103 -msgid "Fold" -msgstr "Brot" - -#: ../../magic/src/fold.c:108 -msgid "" -"Choose a background color and click to turn the corner of the page over." -msgstr "Veldu bakgrunnslit og smelltu til að snúa við horni myndarinnar" - -#: ../../magic/src/fretwork.c:176 -msgid "Fretwork" -msgstr "Mynstur" - -#: ../../magic/src/fretwork.c:182 -msgid "Click and drag to draw repetitive patterns. " -msgstr "Smelltu og dragðu músina til að búa til endurtekin mynstur. " - -#: ../../magic/src/fretwork.c:184 -msgid "Click to surround your picture with repetitive patterns." -msgstr "" -"Smelltu til að ramma myndina inn myndina þína með endurteknum mynstrum." - -#: ../../magic/src/glasstile.c:104 -msgid "Glass Tile" -msgstr "Glerflísar" - -#: ../../magic/src/glasstile.c:111 -msgid "Click and drag the mouse to put glass tile over your picture." -msgstr "Smelltu og dragðu músina til að draga glerflísar yfir myndina." - -#: ../../magic/src/glasstile.c:113 -msgid "Click to cover your entire picture in glass tiles." -msgstr "Smelltu til að brjóta myndina þína upp í glerflísar." - -#: ../../magic/src/grass.c:107 -msgid "Grass" -msgstr "Gras" - -#: ../../magic/src/grass.c:113 -msgid "Click and drag to draw grass. Don’t forget the dirt!" -msgstr "Smelltu og dragðu músina til að teikna gras. Ekki gleyma drullunni!" - -#: ../../magic/src/halftone.c:35 -msgid "Halftone" -msgstr "Hálftónað" - -#: ../../magic/src/halftone.c:39 -msgid "Click and drag to turn your drawing into a newspaper." -msgstr "Smelltu og dragðu músina til að breyta myndinni þinni í dagblað." - -#: ../../magic/src/kalidescope.c:119 -msgid "Symmetric Left/Right" -msgstr "Samhverft Vinstri/Hægri" - -#: ../../magic/src/kalidescope.c:123 -msgid "Symmetric Up/Down" -msgstr "Samhverft Efri/Neðri" - -#: ../../magic/src/kalidescope.c:127 -msgid "Pattern" -msgstr "Mynstur" - -#: ../../magic/src/kalidescope.c:131 -msgid "Tiles" -msgstr "Flísar" - -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:135 -msgid "Kaleidoscope" -msgstr "Kviksjá" - -#: ../../magic/src/kalidescope.c:146 -msgid "" -"Click and drag the mouse to draw with two brushes that are symmetric across " -"the left and right of your picture." -msgstr "" -"Smelltu og dragðu músina til teikna með tveimur penslum sem eru samhverfir " -"hægra og vinstri meginn á myndinni - um lóðréttan ás." - -#: ../../magic/src/kalidescope.c:152 -msgid "" -"Click and drag the mouse to draw with two brushes that are symmetric across " -"the top and bottom of your picture." -msgstr "" -"Smelltu og dragðu músina til teikna með tveimur penslum sem eru samhverfir " -"um efri og neðri hluta myndarinnar - um láréttan ás." - -#: ../../magic/src/kalidescope.c:156 -msgid "Click and drag the mouse to draw a pattern across the picture." -msgstr "Smelltu og dragðu músina til að draga mynstur yfir myndina." - -#: ../../magic/src/kalidescope.c:160 -msgid "" -"Click and drag the mouse to draw a pattern that is symmetric across the " -"picture." -msgstr "Smelltu og dragðu músina til teikna samhverft mynstur á myndina." - -#. KAL_BOTH -#: ../../magic/src/kalidescope.c:164 -msgid "" -"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." -msgstr "" -"Smelltu og dragðu músina til að teikna með samhverfum penslum (kviksjá)." - -#: ../../magic/src/light.c:103 -msgid "Light" -msgstr "Ljós" - -#: ../../magic/src/light.c:109 -msgid "Click and drag to draw a beam of light on your picture." -msgstr "Smelltu og dragðu til að teikna ljósgeisla á myndina þína." - -#: ../../magic/src/metalpaint.c:98 -msgid "Metal Paint" -msgstr "Málm-áferð" - -#: ../../magic/src/metalpaint.c:105 -msgid "Click and drag the mouse to paint with a metallic color." -msgstr "Smelltu og dragðu músina til að teikna með málmáferð." - -#: ../../magic/src/mirror_flip.c:110 -msgid "Mirror" -msgstr "Spegla" - -#: ../../magic/src/mirror_flip.c:112 -msgid "Flip" -msgstr "Fletta" - -#: ../../magic/src/mirror_flip.c:121 -msgid "Click to make a mirror image." -msgstr "Smelltu til að gera spegilmynd." - -#: ../../magic/src/mirror_flip.c:123 -msgid "Click to flip the picture upside-down." -msgstr "Smelltu til að setja myndina á hvolf." - -#: ../../magic/src/mosaic.c:96 -msgid "Mosaic" -msgstr "Tígulsteinar" - -#: ../../magic/src/mosaic.c:100 -msgid "" -"Click and drag the mouse to add a mosaic effect to parts of your picture." -msgstr "" -"Smelltu og dragðu músina til að bæta við tígulsteina-áhrifum á hluta " -"myndarinnar." - -#: ../../magic/src/mosaic.c:101 -msgid "Click to add a mosaic effect to your entire picture." -msgstr "Smelltu til að bæta við tígulsteina-áhrifum á myndina þína." - -#: ../../magic/src/mosaic_shaped.c:132 -msgid "Square Mosaic" -msgstr "Ferhyrndur tígulsteinn" - -#: ../../magic/src/mosaic_shaped.c:133 -msgid "Hexagon Mosaic" -msgstr "Sexhyrndur tígulsteinn" - -#: ../../magic/src/mosaic_shaped.c:134 -msgid "Irregular Mosaic" -msgstr "Óreglulegur tígulsteinn" - -#: ../../magic/src/mosaic_shaped.c:140 -msgid "" -"Click and drag the mouse to add a square mosaic to parts of your picture." -msgstr "" -"Smelltu og dragðu músina til að bæta við ferhyrndum mósaík-áhrifum á myndina." - -#: ../../magic/src/mosaic_shaped.c:141 -msgid "Click to add a square mosaic to your entire picture." -msgstr "" -"Smelltu og hreyfðu músina til að bæta við ferhyrndum tígulsteina-áhrifum á " -"alla myndina þína." - -#: ../../magic/src/mosaic_shaped.c:145 -msgid "" -"Click and drag the mouse to add a hexagonal mosaic to parts of your picture." -msgstr "" -"Smelltu og dragðu músina til að bæta við sexhyrndum tígulsteina-áhrifum á " -"myndina." - -#: ../../magic/src/mosaic_shaped.c:146 -msgid "Click to add a hexagonal mosaic to your entire picture." -msgstr "" -"Smelltu til að bæta við sexhyrndum tígulsteina-áhrifum á alla myndina þína." - -#: ../../magic/src/mosaic_shaped.c:150 -msgid "" -"Click and drag the mouse to add an irregular mosaic to parts of your picture." -msgstr "" -"Smelltu og dragðu músina til að bæta við óreglulegum tígulsteina-áhrifum á " -"hluta myndarinnar." - -#: ../../magic/src/mosaic_shaped.c:151 -msgid "Click to add an irregular mosaic to your entire picture." -msgstr "" -"Smelltu til að bæta við óreglulegum tígulsteina-áhrifum á myndina þína." - -#: ../../magic/src/negative.c:94 -msgid "Negative" -msgstr "Andhverfa" - -#: ../../magic/src/negative.c:101 -msgid "Click and drag the mouse around to make your painting negative." -msgstr "Smelltu og dragðu músina til að andhverfa litum myndarinnar." - -#: ../../magic/src/negative.c:103 -msgid "Click to turn your painting into its negative." -msgstr "Smelltu til að andhverfa litum myndarinnar." - -#: ../../magic/src/noise.c:66 -msgid "Noise" -msgstr "Óregla" - -#: ../../magic/src/noise.c:70 -msgid "Click and drag the mouse to add noise to parts of your picture." -msgstr "Smelltu og dragðu músina til bæta við óreglu í myndina." - -#: ../../magic/src/noise.c:71 -msgid "Click to add noise to your entire picture." -msgstr "Smelltu til bæta við óreglu í alla myndina." - -#: ../../magic/src/perspective.c:147 -msgid "Perspective" -msgstr "Sjónarhorn" - -#: ../../magic/src/perspective.c:148 -msgid "Zoom" -msgstr "Renna" - -#: ../../magic/src/perspective.c:153 -msgid "Click on the corners and drag where you want to stretch the picture." -msgstr "Smelltu á hornin og dragðu myndina til að teygja hana." - -#: ../../magic/src/perspective.c:156 -msgid "Click and drag up to zoom in or drag down to zoom out the picture." -msgstr "" -"Smelltu og dragðu músina upp til að renna að eða niður til að renna frá " -"myndinni." - -#: ../../magic/src/puzzle.c:103 -msgid "Puzzle" -msgstr "Púsluspil" - -#: ../../magic/src/puzzle.c:110 -msgid "Click the part of your picture where would you like a puzzle." -msgstr "Smelltu á hluta myndarinnar sem þú vilt líkja púsluspili." - -#: ../../magic/src/puzzle.c:111 -msgid "Click to make a puzzle in fullscreen mode." -msgstr "Smelltu til að búa til púsluspil yfir allan skjáinn." - -#: ../../magic/src/rails.c:129 -msgid "Rails" -msgstr "Teinar" - -#: ../../magic/src/rails.c:134 -msgid "Click and drag to draw train track rails on your picture." -msgstr "" -"Smelltu og dragðu músina til að teikna járnbrautarteina á myndina þína." - -#: ../../magic/src/rainbow.c:133 -msgid "Rainbow" -msgstr "Regnbogi" - -#: ../../magic/src/rainbow.c:139 -msgid "You can draw in rainbow colors!" -msgstr "Þú getur teiknað með regnboga-litum!" - -#: ../../magic/src/rain.c:68 -msgid "Rain" -msgstr "Regn" - -#: ../../magic/src/rain.c:72 -msgid "Click to place a rain drop onto your picture." -msgstr "Smelltu til að setja regndropa á myndina þína." - -#: ../../magic/src/rain.c:73 -msgid "Click to cover your picture with rain drops." -msgstr "Smelltu til að setja regndropa á alla myndina þína." - -#: ../../magic/src/realrainbow.c:98 -msgid "Real Rainbow" -msgstr "Raunverulegur Regnbogi" - -#: ../../magic/src/realrainbow.c:100 -msgid "ROYGBIV Rainbow" -msgstr "RAGGBLF Regnbogi" - -#: ../../magic/src/realrainbow.c:108 -msgid "" -"Click where you want your rainbow to start, drag to where you want it to " -"end, and then let go to draw a rainbow." -msgstr "" -"Smelltu þar sem þú vilt að regnboginn byrji, dragðu þangað sem þú vilt að " -"regnboginn endi, og slepptu músahnappnum til að teikna regnboga." - -#: ../../magic/src/ripples.c:102 -msgid "Ripples" -msgstr "Gárur" - -#: ../../magic/src/ripples.c:108 -msgid "Click to make ripples appear over your picture." -msgstr "Smelltu til að gera gárur á myndina þína." - -#: ../../magic/src/rosette.c:115 -msgid "Rosette" -msgstr "Rósetta" - -#: ../../magic/src/rosette.c:117 -msgid "Picasso" -msgstr "Picasso" - -#: ../../magic/src/rosette.c:123 -msgid "Click and start drawing your rosette." -msgstr "Smelltu og byrjaðu að teikna rósettuna þína." - -#: ../../magic/src/rosette.c:125 -msgid "You can draw just like Picasso!" -msgstr "Þú getur teiknað eins og Picasso!" - -#: ../../magic/src/sharpen.c:76 -msgid "Edges" -msgstr "Jaðrar" - -#: ../../magic/src/sharpen.c:77 -msgid "Sharpen" -msgstr "Skerpa" - -#: ../../magic/src/sharpen.c:78 -msgid "Silhouette" -msgstr "Skuggamynd" - -#: ../../magic/src/sharpen.c:82 -msgid "Click and drag the mouse to trace edges in parts of your picture." -msgstr "" -"Smelltu og dragðu músina til að draga eftir jöðrum í hluta myndarinnar." - -#: ../../magic/src/sharpen.c:83 -msgid "Click to trace edges in your entire picture." -msgstr "Smelltu til að teikna í jaðra á allri myndinni þinni." - -#: ../../magic/src/sharpen.c:84 -msgid "Click and drag the mouse to sharpen parts of your picture." -msgstr "Smelltu og dragðu músina til að skerpa hluta myndarinnar þinnar." - -#: ../../magic/src/sharpen.c:85 -msgid "Click to sharpen the entire picture." -msgstr "Smelltu til að skerpa alla myndina." - -#: ../../magic/src/sharpen.c:86 -msgid "Click and drag the mouse to create a black and white silhouette." -msgstr "Smelltu og dragðu músina til að gera svart-hvítar skuggamyndir." - -#: ../../magic/src/sharpen.c:87 -msgid "Click to create a black and white silhouette of your entire picture." -msgstr "Smelltu til að gera myndina alla myndina að skuggamynd." - -#: ../../magic/src/shift.c:106 -msgid "Shift" -msgstr "Hliðra" - -#: ../../magic/src/shift.c:112 -msgid "Click and drag to shift your picture around on the canvas." -msgstr "Smelltu og dragðu músina til að færa myndina til á bakgrunninum." - -#: ../../magic/src/smudge.c:102 -msgid "Smudge" -msgstr "Fingramálun" - -#. if (which == 1) -#: ../../magic/src/smudge.c:104 -msgid "Wet Paint" -msgstr "Blaut málning" - -#: ../../magic/src/smudge.c:111 -msgid "Click and drag the mouse around to smudge the picture." -msgstr "Smelltu og dragðu músina til að káma myndina." - -#. if (which == 1) -#: ../../magic/src/smudge.c:113 -msgid "Click and drag the mouse around to draw with wet, smudgy paint." -msgstr "" -"Smelltu og dragðu músina til að líkja eftir fingramálun með blautri málningu." - -#: ../../magic/src/snow.c:71 -msgid "Snow Ball" -msgstr "Snjóbolti" - -#: ../../magic/src/snow.c:72 -msgid "Snow Flake" -msgstr "Snjókorn" - -#: ../../magic/src/snow.c:76 -msgid "Click to add snow balls to your picture." -msgstr "Smelltu til bæta snjóboltum við myndina þína." - -#: ../../magic/src/snow.c:77 -msgid "Click to add snow flakes to your picture." -msgstr "Smelltu til bæta snjókornum við myndina þína." - -#: ../../magic/src/string.c:129 -msgid "String edges" -msgstr "Streng-jaðrar" - -#: ../../magic/src/string.c:132 -msgid "String corner" -msgstr "Streng-horn" - -#: ../../magic/src/string.c:135 -msgid "String 'V'" -msgstr "Streng-V" - -#: ../../magic/src/string.c:147 -msgid "" -"Click and drag to draw string art. Drag top-bottom to draw less or more " -"lines, left or right to make a bigger hole." -msgstr "" -"Smelltu og dragðu til að teikna strengjalist. Dragðu frá efri hluta myndar " -"og niður til að teikna færri eða fleiri línur, vinstri eða hægri til að gera " -"stærri holu." - -#: ../../magic/src/string.c:150 -msgid "Click and drag to draw arrows made of string art." -msgstr "Smelltu og dragðu til að teikna strengjalistörvar." - -#: ../../magic/src/string.c:153 -msgid "Draw string art arrows with free angles." -msgstr "Teikna strengja-list-örvar með frjálsum hornum." - -#: ../../magic/src/tint.c:74 -msgid "Tint" -msgstr "Litbrigði" - -#: ../../magic/src/tint.c:75 -msgid "Color & White" -msgstr "Litur+Hvítt" - -#: ../../magic/src/tint.c:79 -msgid "" -"Click and drag the mouse around to change the color of parts of your picture." -msgstr "Smelltu og dragðu músina um til að breyta litum á hluta myndarinnar." - -#: ../../magic/src/tint.c:80 -msgid "Click to change the color of your entire picture." -msgstr "Smelltu til að breyta litum myndarinnar." - -#: ../../magic/src/tint.c:81 -msgid "" -"Click and drag the mouse around to turn parts of your picture into white and " -"a color you choose." -msgstr "" -"Smelltu og dragðu músina um til að breyta hluta af myndinni þinni yfir í " -"hvítt og annan lit sem þú velur." - -#: ../../magic/src/tint.c:82 -msgid "Click to turn your entire picture into white and a color you choose." -msgstr "Smelltu til að breyta myndinni þinni yfir í hvítt og lit sem þú velur." - -#: ../../magic/src/toothpaste.c:68 -msgid "Toothpaste" -msgstr "Tannkrem" - -#: ../../magic/src/toothpaste.c:72 -msgid "Click and drag to squirt toothpaste onto your picture." -msgstr "Smelltu og dragðu músina til að sprauta tannkremi yfir myndina þína." - -#: ../../magic/src/tornado.c:153 -msgid "Tornado" -msgstr "Hvirfilvindur" - -#: ../../magic/src/tornado.c:159 -msgid "Click and drag to draw a tornado funnel on your picture." -msgstr "Smelltu og dragðu músina til að teikna hvirfilvind á myndina þína." - -#: ../../magic/src/tv.c:96 -msgid "TV" -msgstr "Sjónvarp" - -#: ../../magic/src/tv.c:102 -msgid "" -"Click and drag to make parts of your picture look like they are on " -"television." -msgstr "" -"Smelltu og dragðu músina til að láta hluta myndarinnar líta út eins og þeir " -"séu í sjónvarpi." - -#: ../../magic/src/tv.c:105 -msgid "Click to make your picture look like it's on television." -msgstr "Smelltu til að láta myndina líta út eins og hún sé sjónvarpsmynd." - -#: ../../magic/src/waves.c:104 -msgid "Waves" -msgstr "Bylgjur" - -#: ../../magic/src/waves.c:106 -msgid "Wavelets" -msgstr "Smábylgjur" - -#: ../../magic/src/waves.c:115 -msgid "" -"Click to make the picture horizontally wavy. Click toward the top for " -"shorter waves, the bottom for taller waves, the left for small waves, and " -"the right for long waves." -msgstr "" -"Smelltu til að búa til láréttar bylgjur. Smelltu ofarlega til að gera " -"bylgjurnar styttri, neðarlega fyrir stærri bylgjur, til vinstri fyrir litlar " -"bylgjur og til hægri fyrir langar bylgjur." - -#: ../../magic/src/waves.c:118 -msgid "" -"Click to make the picture vertically wavy. Click toward the top for shorter " -"waves, the bottom for taller waves, the left for small waves, and the right " -"for long waves." -msgstr "" -"Smelltu til að búa til lóðréttar bylgjur. Smelltu ofarlega til að gera " -"bylgjurnar styttri, neðarlega fyrir stærri bylgjur, til vinstri fyrir litlar " -"bylgjur og til hægri fyrir langar bylgjur." - -#: ../../magic/src/xor.c:93 -msgid "Xor Colors" -msgstr "XOR Litir" - -#: ../../magic/src/xor.c:99 -msgid "Click and drag to draw a XOR effect" -msgstr "Smelltu og dragðu músina til að búa til XOR áhrif." - -#: ../../magic/src/xor.c:101 -msgid "Click to draw a XOR effect on the whole picture" -msgstr "Smelltu til að beita XOR áhrifum á alla myndina." - -#, fuzzy -#~ msgid "" -#~ "Click and drag to draw the blind, move left or right to open or close." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina þynnri." - -#, fuzzy -#~ msgid "Mosaic square" -#~ msgstr "Töfrar" - -#, fuzzy -#~ msgid "Mosaic hexagon" -#~ msgstr "Töfrar" - -#, fuzzy -#~ msgid "" -#~ "Click and move the mouse to add a mosaic squared effect to parts of your " -#~ "picture." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "Click to add a mosaic squared effect to your entire picture." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "" -#~ "Click and move the mouse to add a mosaic hexagonal effect to parts of " -#~ "your picture." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "Click to add a mosaic hexagonal effect to your entire picture." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "" -#~ "Click and drag to draw a tornado stalk. Let go to finish the tornado." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina þynnri." - -#, fuzzy -#~ msgid "" -#~ "Click and move the mouse to give parts of your picture an \"alien\" " -#~ "appearance." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." - -#, fuzzy -#~ msgid "Click to give your entire picture an \"alien\" appearance." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina 'Kassa-lega'." - -#, fuzzy -#~ msgid "Click and move the mouse to add noise to the image." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." - -#, fuzzy -#~ msgid "Click to add noise to the entire image." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "Click and move the mouse to trace the edges of objects in the image." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." - -#, fuzzy -#~ msgid "Click and move the mouse to sharpen the image." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." - -#, fuzzy -#~ msgid "Click to add snow to the entire image." -#~ msgstr "Smelltu til að gera spegilmynd." - -#, fuzzy -#~ msgid "" -#~ "Click and move the mouse around to turn the image into pure color and " -#~ "white regions." -#~ msgstr "Smelltu og hreyfðu músina til að búa til krítarmynd!" - -#, fuzzy -#~ msgid "Click and move the mouse around convert the image to greyscale." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." - -#, fuzzy -#~ msgid "Click to change the entire picture’s color." -#~ msgstr "Smelltu og hreyfðu músina til að gera myndina 'Kassa-lega'." - -#, fuzzy -#~ msgid "Blur All" -#~ msgstr "Óskýr" - -#~ msgid "Click and move to fade the colors." -#~ msgstr "Smelltu og hreyfðu músina til að þynna út litina!" - -#, fuzzy -#~ msgid "Click and move to darken the colors." -#~ msgstr "Smelltu og hreyfðu músina til að þynna út litina!" - -#~ msgid "Sparkles" -#~ msgstr "Neistar" - -#~ msgid "You now have a blank sheet to draw on!" -#~ msgstr "Nú ertu með autt blað til að teikna á!" - -#, fuzzy -#~ msgid "Start a new picture?" -#~ msgstr "Eyða myndinni?" - -#~ msgid "Click and move to draw sparkles." -#~ msgstr "Smelltu og hreyfðu músina til að búa til neista." - -#~ msgid "Starting a new picture will erase the current one!" -#~ msgstr "Ef þú byrjar á nýrri mynd, eyðist núverandi mynd!" - -#~ msgid "That’s OK!" -#~ msgstr "Það er í lagi!" - -#~ msgid "Never mind!" -#~ msgstr "Hætta við!" - -#~ msgid "Save over the older version of this picture?" -#~ msgstr "Eyða eldri útgáfu af þessarri mynd?" - -#~ msgid "Green!" -#~ msgstr "Grænt!" - -#~ msgid "Fade" -#~ msgstr "Þynna út" - -#~ msgid "Oval" -#~ msgstr "Hringlaga" - -#~ msgid "Diamond" -#~ msgstr "Tígull" - -#~ msgid "A square has four sides, each the same length." -#~ msgstr "Ferningur hefur fjórar hliðar, allar jafn langar." - -#~ msgid "A circle is exactly round." -#~ msgstr "Hringur er nákvæmlega kringlóttur." - -#~ msgid "A diamond is a square, turned around slightly." -#~ msgstr "Tígull er ferhyrndur, svolítið snúinn." - -#~ msgid "Lime!" -#~ msgstr "Gulgrænt!" - -#~ msgid "Fuchsia!" -#~ msgstr "Bleikt!" - -#~ msgid "Silver!" -#~ msgstr "Silfur!" +# Tux Paint Translation to Icelandic. +# Íslensk þýðing á TuxPaint +# Copyright (C) 2002-2017. +# This file is distributed under the same license as the tuxpaint package. +# +# Pjetur G. Hjaltason , 2002, 2003, 2004, 2014. +# Sveinn í Felli , 2015, 2017, 2020. +msgid "" +msgstr "" +"Project-Id-Version: tuxpaint\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-15 16:42-0700\n" +"PO-Revision-Date: 2020-12-10 14:59+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic \n" +"Language: is\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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Response to Black (0, 0, 0) color selected +#: ../colors.h:86 +msgid "Black!" +msgstr "Svart!" + +#. Response to Dark grey (128, 128, 128) color selected +#: ../colors.h:89 +msgid "Dark grey! Some people spell it “dark gray”." +msgstr "Dökkgrátt!" + +#. Response to Light grey (192, 192, 192) color selected +#: ../colors.h:92 +msgid "Light grey! Some people spell it “light gray”." +msgstr "Ljósgrátt!" + +#. Response to White (255, 255, 255) color selected +#: ../colors.h:95 +msgid "White!" +msgstr "Hvítt!" + +#. Response to Red (255, 0, 0) color selected +#: ../colors.h:98 +msgid "Red!" +msgstr "Rautt!" + +#. Response to Orange (255, 128, 0) color selected +#: ../colors.h:101 +msgid "Orange!" +msgstr "Appelsínugult!" + +#. Response to Yellow (255, 255, 0) color selected +#: ../colors.h:104 +msgid "Yellow!" +msgstr "Gult!" + +#. Response to Light green (160, 228, 128) color selected +#: ../colors.h:107 +msgid "Light green!" +msgstr "Ljósgrænt!" + +#. Response to Dark green (33, 148, 70) color selected +#: ../colors.h:110 +msgid "Dark green!" +msgstr "Dökkgrænt!" + +#. Response to "Sky" blue (138, 168, 205) color selected +#: ../colors.h:113 +msgid "Sky blue!" +msgstr "Himinblátt" + +#. Response to Blue (50, 100, 255) color selected +#: ../colors.h:116 +msgid "Blue!" +msgstr "Blátt!" + +#. Response to Lavender (186, 157, 255) color selected +#: ../colors.h:119 +msgid "Lavender!" +msgstr "Lillablátt!" + +#. Response to Purple (128, 0, 128) color selected +#: ../colors.h:122 +msgid "Purple!" +msgstr "Fjólublátt!" + +#. Response to Pink (255, 165, 211) color selected +#: ../colors.h:125 +msgid "Pink!" +msgstr "Bleikt!" + +#. Response to Brown (128, 80, 0) color selected +#: ../colors.h:128 +msgid "Brown!" +msgstr "Brúnt!" + +#. Response to Tan (226, 189, 166) color selected +#: ../colors.h:131 +msgid "Tan!" +msgstr "Ljósbrúnt!" + +#. Response to Beige (247, 228, 219) color selected +#: ../colors.h:134 +msgid "Beige!" +msgstr "Fölbrúnt!" + +#. First, the blacklist. We list font families that can crash Tux Paint +#. via bugs in the SDL_ttf library. We also test fonts to be sure that +#. they have both uppercase and lowercase letters. Note that we do not +#. test for "Aa", because it is OK if uppercase and lowercase are the +#. same (but not nice -- such fonts get a low score later). +#. +#. Most locales leave the blacklist strings alone: "QX" and "qx" +#. (it is less destructive to use the scoring strings instead) +#. +#. Locales that absolutely require all fonts to have some +#. extra characters should use "QX..." and "qx...", where "..." +#. are some characters you absolutely require in all fonts. +#. +#. Locales with absolutely NO use for ASCII may use "..." and "...", +#. where "..." are some characters you absolutely require in +#. all fonts. This would be the case for a locale in which it is +#. impossible for a user to type ASCII letters. +#. +#. Most translators should use scoring instead. +#: ../dirwalk.c:177 +msgid "qx" +msgstr "qx" + +#: ../dirwalk.c:177 +msgid "QX" +msgstr "QX" + +#. TODO: weight specification +#. Now we score fonts to ensure that the best ones will be placed at +#. the top of the list. The user will see them first. This sorting is +#. especially important for users who have scroll buttons disabled. +#. Translators should do whatever is needed to put crummy fonts last. +#. distinct uppercase and lowercase (e.g., 'o' vs. 'O') +#: ../dirwalk.c:202 +msgid "oO" +msgstr "oO" + +#. common punctuation (e.g., '?', '!', '.', ',', etc.) +#: ../dirwalk.c:205 +msgid ",.?!" +msgstr ",.?!" + +#. uncommon punctuation (e.g., '@', '#', '*', etc.) +#: ../dirwalk.c:208 +msgid "`%_@$~#{<(^&*" +msgstr "€`%_@$~#{<(^&*" + +#. digits (e.g., '0', '1' and '7') +#: ../dirwalk.c:211 +msgid "017" +msgstr "017" + +#. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero)) +#: ../dirwalk.c:214 +msgid "O0" +msgstr "O0" + +#. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye)) +#: ../dirwalk.c:217 +msgid "1Il|" +msgstr "1Il|" + +#: ../dirwalk.c:221 +msgid "<1>spare-1a" +msgstr "aa" + +#: ../dirwalk.c:222 +msgid "<1>spare-1b" +msgstr "AA" + +#: ../dirwalk.c:223 +msgid "<9>spare-9a" +msgstr "ðéíóúþæö" + +#: ../dirwalk.c:224 +msgid "<9>spare-9b" +msgstr "ÐÉÍÓÚÞÆÖ" + +#. Congratulations #1 +#: ../great.h:37 +msgid "Great!" +msgstr "Frábært!" + +#. Congratulations #2 +#: ../great.h:40 +msgid "Cool!" +msgstr "Flott!" + +#. Congratulations #3 +#: ../great.h:43 +msgid "Keep it up!" +msgstr "Haltu þessu áfram!" + +#. Congratulations #4 +#: ../great.h:46 +msgid "Good job!" +msgstr "Vel gert!" + +#. Input Method: English mode +#: ../im.c:74 +msgid "English" +msgstr "Enska" + +#. Input Method: Japanese Romanized Hiragana mode +#: ../im.c:77 +msgid "Hiragana" +msgstr "Hiragana" + +#. Input Method: Japanese Romanized Katakana mode +#: ../im.c:80 +msgid "Katakana" +msgstr "Katakana" + +#. Input Method: Korean Hangul 2-Bul mode +#: ../im.c:83 +msgid "Hangul" +msgstr "Hangul" + +#. Input Method: Thai mode +#: ../im.c:86 +msgid "Thai" +msgstr "Tælenska" + +#. Input Method: Traditional Chinese mode +#: ../im.c:89 +msgid "ZH_TW" +msgstr "ZH_TW kínverska" + +#. Square shape tool (4 equally-lengthed sides at right angles) +#: ../shapes.h:234 ../shapes.h:235 +msgid "Square" +msgstr "Ferningur" + +#. Rectangle shape tool (4 sides at right angles) +#: ../shapes.h:238 ../shapes.h:239 +msgid "Rectangle" +msgstr "Rétthyrningur" + +#. Circle shape tool (X radius and Y radius are the same) +#: ../shapes.h:242 ../shapes.h:243 +msgid "Circle" +msgstr "Hringur" + +#. Ellipse shape tool (X radius and Y radius may differ) +#: ../shapes.h:246 ../shapes.h:247 +msgid "Ellipse" +msgstr "Sporbaugur" + +#. Triangle shape tool (3 sides) +#: ../shapes.h:250 ../shapes.h:251 +msgid "Triangle" +msgstr "Þríhyrningur" + +#. Pentagone shape tool (5 sides) +#: ../shapes.h:254 ../shapes.h:255 +msgid "Pentagon" +msgstr "Fimmhyrningur" + +#. Rhombus shape tool (4 sides, not at right angles) +#: ../shapes.h:258 ../shapes.h:259 +msgid "Rhombus" +msgstr "Tígull" + +#. Octagon shape tool (8 sides) +#: ../shapes.h:262 ../shapes.h:263 +msgid "Octagon" +msgstr "Átthyrningur" + +#. Triangle star (3 points star) +#. Rhombus star (4 points star) +#. Pentagone star (5 points star) +#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 +#: ../shapes.h:278 ../shapes.h:281 +msgid "Star" +msgstr "Stjarna" + +#. Description of a square +#: ../shapes.h:289 ../shapes.h:290 +msgid "A square is a rectangle with four equal sides." +msgstr "Ferningur er rétthyrningur með fjórar jafnlangar hliðar." + +#. Description of a rectangle +#: ../shapes.h:293 ../shapes.h:294 +msgid "A rectangle has four sides and four right angles." +msgstr "Rétthyrningur hefur fjórar hliðar og öll horn hornrétt." + +#. Description of a circle +#: ../shapes.h:297 ../shapes.h:298 +msgid "" +"A circle is a curve where all points have the same distance from the center." +msgstr "Hringur er ferill þar sem allir punktar eru í sömu fjarlægð frá miðju." + +#. Description of an ellipse +#: ../shapes.h:301 ../shapes.h:302 +msgid "An ellipse is a stretched circle." +msgstr "Sporbaugur er teygður hringur" + +#. Description of a triangle +#: ../shapes.h:305 ../shapes.h:306 +msgid "A triangle has three sides." +msgstr "Þríhyrningur hefur þrjár hliðar." + +#. Description of a pentagon +#: ../shapes.h:309 ../shapes.h:310 +msgid "A pentagon has five sides." +msgstr "Fimmhyrningur hefur fimm hliðar." + +#. Description of a rhombus +#: ../shapes.h:313 ../shapes.h:314 +msgid "A rhombus has four equal sides, and opposite sides are parallel." +msgstr "" +"Tígull hefur fjórar jafnlangar hliðar, og andstæðar hliðar eru samsíða." + +#. Description of an octagon +#: ../shapes.h:317 ../shapes.h:318 +msgid "An octagon has eight equal sides." +msgstr "Átthyrningur hefur átta hliðar." + +#: ../shapes.h:320 ../shapes.h:321 +msgid "A star with 3 points." +msgstr "Stjarna með 3 arma." + +#: ../shapes.h:322 ../shapes.h:323 +msgid "A star with 4 points." +msgstr "Stjarna með 4 arma." + +#: ../shapes.h:324 ../shapes.h:325 +msgid "A star with 5 points." +msgstr "Stjarna með 5 arma." + +#: ../shapes.h:372 +msgid "Draw shapes from the center." +msgstr "Teikna form frá miðju." + +#: ../shapes.h:373 +msgid "Draw shapes from a corner." +msgstr "Teikna form frá horni." + +#. Title of tool selector (buttons down the left) +#: ../titles.h:56 +msgid "Tools" +msgstr "Áhöld" + +#. Title of color palette (buttons across the bottom) +#: ../titles.h:59 +msgid "Colors" +msgstr "Litir" + +#. Title of brush selector (buttons down the right for paint and line tools) +#: ../titles.h:62 +msgid "Brushes" +msgstr "Penslar" + +# Strokleður is the same in plural as singular +#. Title of eraser selector (buttons down the right for eraser tool) +#: ../titles.h:65 +msgid "Erasers" +msgstr "Strokleður" + +#. Title of stamp selector (buttons down the right for stamps tool) +#: ../titles.h:68 +msgid "Stamps" +msgstr "Stimplar" + +#. Title of shape selector (buttons down the right for shapes tool) +#. Shape creation tool (square, circle, etc.) +#: ../titles.h:71 ../tools.h:71 +msgid "Shapes" +msgstr "Form" + +#. Title of font selector (buttons down the right for text and label tools) +#: ../titles.h:74 +msgid "Letters" +msgstr "Stafir" + +#. Title of magic tool selector (buttons down the right for magic (effect plugin) tool) +#. "Magic" effects tools (blur, flip image, etc.) +#: ../titles.h:77 ../tools.h:83 +msgid "Magic" +msgstr "Galdrar" + +#. Freehand painting tool +#: ../tools.h:62 +msgid "Paint" +msgstr "Teikna" + +#. Stamp tool (aka Rubber Stamps) +#: ../tools.h:65 +msgid "Stamp" +msgstr "Stimpla" + +#. Line drawing tool +#: ../tools.h:68 +msgid "Lines" +msgstr "Línur" + +#. Text tool +#: ../tools.h:74 +msgid "Text" +msgstr "Texti" + +#. Label tool +#: ../tools.h:77 +msgid "Label" +msgstr "Merking" + +#. Fill tool +#: ../tools.h:80 +msgid "Fill" +msgstr "Fylla" + +#. Undo last action +#: ../tools.h:86 +msgid "Undo" +msgstr "Hætta við" + +#. Redo undone action +#: ../tools.h:89 +msgid "Redo" +msgstr "Gera aftur" + +#. Eraser tool +#: ../tools.h:92 +msgid "Eraser" +msgstr "Strokleður" + +#. Start a new picture +#: ../tools.h:95 +msgid "New" +msgstr "Nýtt" + +#. 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 +msgid "Open" +msgstr "Opna" + +#. Save the current picture +#: ../tools.h:101 +msgid "Save" +msgstr "Geyma" + +#. Print the current picture +#: ../tools.h:104 +msgid "Print" +msgstr "Prenta" + +#. Quit/exit Tux Paint application +#: ../tools.h:107 +msgid "Quit" +msgstr "Hætta" + +#. Paint tool instructions +#: ../tools.h:115 +msgid "Pick a color and a brush shape to draw with." +msgstr "Veldu lit og pensil til að teikna með." + +#. Stamp tool instructions +#: ../tools.h:118 +msgid "Pick a picture to stamp around your drawing." +msgstr "Veldu mynd til að nota sem stimpil." + +#. Line tool instructions +#: ../tools.h:121 +msgid "Click to start drawing a line. Let go to complete it." +msgstr "Smelltu til að byrja línu. Slepptu til að enda línuna." + +#: ../tools.h:125 +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 "" +"Veldu form. Smelltu til að byrja að teikna, dragðu músina til, slepptu þegar " +"það er af réttri stærð. Hreyfðu til að snúa forminu, og smelltu til að " +"teikna það." + +#: ../tools.h:129 +msgid "" +"Choose a style of text. Click on your drawing and you can start typing. " +"Press [Enter] or [Tab] to complete the text." +msgstr "" +"Veldu letur. Smelltu á myndina og þú getur byrjað að skrifa. Ýttu á [Enter] " +"eða [Tab] til að ljúka texta." + +#: ../tools.h:133 +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 existing label, you can move it, edit it and change its text " +"style." +msgstr "" +"Veldu stíl á letur. Smelltu á myndina og þú getur byrjað að skrifa. Ýttu á " +"[Enter] eða [Tab] til að ljúka texta. Með því að nota valhnappinn og smella " +"á texta sem fyrir er, þá getur þú fært textann, breytt honum og breytt " +"útliti og stíl." + +#. Fill tool instructions +#: ../tools.h:136 +msgid "Click in the picture to fill that area with color." +msgstr "Smelltu og hreyfðu músina til að fylla svæðið með lit." + +#. Magic tool instruction +#: ../tools.h:139 +msgid "Pick a magical effect to use on your drawing!" +msgstr "Veldu galdraaðferð sem þú ætlar að nota á myndina!" + +#. Response to 'undo' action +#: ../tools.h:142 +msgid "Undo!" +msgstr "Hætta við!" + +#. Response to 'redo' action +#: ../tools.h:145 +msgid "Redo!" +msgstr "Gera aftur!" + +#. Eraser tool +#: ../tools.h:148 +msgid "Eraser!" +msgstr "Strokleður!" + +#. Response to 'start a new image' action +#: ../tools.h:151 +msgid "Pick a color or picture with which to start a new drawing." +msgstr "Veldu lit eða mynd sem þú ætlar að nota til að búa til nýja mynd." + +#. Response to 'open' action (while file dialog is being constructed) +#: ../tools.h:154 +msgid "Open…" +msgstr "Opna..." + +#. Response to 'save' action +#: ../tools.h:157 +msgid "Your image has been saved!" +msgstr "Búið að geyma myndina þína!" + +#. Response to 'print' action (while printing, or print dialog is being used) +#: ../tools.h:160 +msgid "Printing…" +msgstr "Prenta..." + +#. Response to 'quit' (exit) action +#: ../tools.h:163 +msgid "Bye bye!" +msgstr "Bless!" + +#. Instruction while using Line tool (after click, before release) +#: ../tools.h:167 +msgid "Let go of the button to complete the line." +msgstr "Slepptu hnappnum til að enda línuna." + +#. Instruction while using Shape tool (after first click, before release) +#: ../tools.h:170 +msgid "Hold the button to stretch the shape." +msgstr "Haltu hnappnum niðri til að teygja formið." + +#. Instruction while finishing Shape tool (after release, during rotation step before second click) +#: ../tools.h:173 +msgid "Move the mouse to rotate the shape. Click to draw it." +msgstr "Hreyfðu músina til að snúa forminu. Smelltu til að teikna það." + +#. Notification that 'New' action was aborted (current image would have been lost) +#: ../tools.h:176 +msgid "OK then… Let’s keep drawing this one!" +msgstr "Allt í lagi... Höldum þá áfram með þessa!" + +#. Prompt to confirm user wishes to quit +#: ../tuxpaint.c:2134 +msgid "Do you really want to quit?" +msgstr "Viltu í alvöru hætta?" + +#. Quit prompt positive response (quit) +#: ../tuxpaint.c:2137 +msgid "Yes, I’m done!" +msgstr "Já, ég er búin!" + +#. Quit prompt negative response (don't quit) +#: ../tuxpaint.c:2140 ../tuxpaint.c:2167 +msgid "No, take me back!" +msgstr "Nei, ég vil halda áfram!" + +#. Current picture is not saved; user is quitting +#: ../tuxpaint.c:2144 +msgid "If you quit, you’ll lose your picture! Save it?" +msgstr "Ef þú hættir, tapast myndin! Viltu geyma hana?" + +#: ../tuxpaint.c:2145 ../tuxpaint.c:2150 +msgid "Yes, save it!" +msgstr "Já, geyma hana!" + +#: ../tuxpaint.c:2146 ../tuxpaint.c:2151 +msgid "No, don’t bother saving!" +msgstr "Nei, ekki geyma þetta!" + +#. Current picture is not saved; user is opening another picture +#: ../tuxpaint.c:2149 +msgid "Save your picture first?" +msgstr "Geyma myndina fyrst?" + +#. Error opening picture +#: ../tuxpaint.c:2154 +msgid "Can’t open that picture!" +msgstr "Get ekki opnað þessa mynd!" + +#. Generic dialog dismissal +#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178 +#: ../tuxpaint.c:2187 ../tuxpaint.c:2192 +msgid "OK" +msgstr "Í lagi" + +#. Notification that 'Open' dialog has nothing to show +#: ../tuxpaint.c:2161 +msgid "There are no saved files!" +msgstr "Fann engar geymdar myndir!" + +#. Verification of print action +#: ../tuxpaint.c:2165 +msgid "Print your picture now?" +msgstr "Prenta myndina núna?" + +#: ../tuxpaint.c:2166 +msgid "Yes, print it!" +msgstr "Já, prentaðu hana!" + +#. Confirmation of successful (we hope) printing +#: ../tuxpaint.c:2170 +msgid "Your picture has been printed!" +msgstr "Búið að prenta myndina þína!" + +#. We got an error printing +#: ../tuxpaint.c:2174 +msgid "Sorry! Your picture could not be printed!" +msgstr "Því miður! Það var ekki hægt að prenta myndina þína!" + +#. Notification that it's too soon to print again (--printdelay option is in effect) +#: ../tuxpaint.c:2177 +msgid "You can’t print yet!" +msgstr "Þú getur ekki prentað strax!" + +#. Prompt to confirm erasing a picture in the Open dialog +#: ../tuxpaint.c:2181 +msgid "Erase this picture?" +msgstr "Eyða myndinni?" + +#: ../tuxpaint.c:2182 +msgid "Yes, erase it!" +msgstr "Já, eyða henni!" + +#: ../tuxpaint.c:2183 +msgid "No, don’t erase it!" +msgstr "Nei, ekki eyða henni!" + +#. Reminder that Mouse Button 1 is the button to use in Tux Paint +#: ../tuxpaint.c:2186 +msgid "Remember to use the left mouse button!" +msgstr "Muna eftir að nota vinstri músarhnappinn!" + +#. Confirmation of successful (we hope) image export +#: ../tuxpaint.c:2190 +msgid "Your picture has been exported!" +msgstr "Búið að flytja út myndina þína!" + +#: ../tuxpaint.c:2191 +msgid "Your slideshow GIF has been exported!" +msgstr "Búið að flytja út GIF-skyggnusýninguna þína!" + +#. We got an error exporting +#: ../tuxpaint.c:2195 +msgid "Sorry! Your picture could not be exported!" +msgstr "Því miður! Það var ekki hægt að flytja út myndina þína!" + +#: ../tuxpaint.c:2196 +msgid "Sorry! Your slideshow GIF could not be exported!" +msgstr "Því miður! Það var ekki hægt að flytja út GIF-skyggnusýninguna þína!" + +#. Slideshow instructions +#: ../tuxpaint.c:2200 +msgid "Choose the pictures you want, then click “Play”." +msgstr "Veldu myndirnar sem þú vilt, og smelltu svo á \"Spila\"." + +#. Sound has been muted (silenced) via keyboard shortcut +#: ../tuxpaint.c:2407 +msgid "Sound muted." +msgstr "Slökkt á hljóði." + +#. Sound has been unmuted (unsilenced) via keyboard shortcut +#: ../tuxpaint.c:2412 +msgid "Sound unmuted." +msgstr "Kveikt á hljóði." + +#. Wait while Text tool finishes loading fonts +#: ../tuxpaint.c:3167 +msgid "Please wait…" +msgstr "Bíddu aðeins..." + +#. Open dialog: 'Erase' button, to erase/deleted the selected picture +#: ../tuxpaint.c:7923 +msgid "Erase" +msgstr "Eyða" + +#. Open dialog: 'Slides' button, to switch to slide show mode +#: ../tuxpaint.c:7926 +msgid "Slides" +msgstr "Myndasýning" + +#. Open dialog: 'Export' button, to copy an image to an easily-accessible location +#: ../tuxpaint.c:7929 +msgid "Export" +msgstr "Flytja út" + +#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture +#: ../tuxpaint.c:7932 +msgid "Back" +msgstr "Til baka" + +#. Slideshow: 'Play' button, to begin a slideshow sequence +#: ../tuxpaint.c:7935 +msgid "Play" +msgstr "Spila" + +#. Slideshow: 'GIF Export' button, to create an animated GIF +#: ../tuxpaint.c:7938 +msgid "GIF Export" +msgstr "GIF-útflutningur" + +#. Slideshow: 'Next' button, to load next slide (image) +#: ../tuxpaint.c:7941 +msgid "Next" +msgstr "Áfram" + +#. 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 +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 +msgid "Yes" +msgstr "Já" + +#: ../tuxpaint.c:12073 +msgid "No" +msgstr "Nei" + +#. Prompt to ask whether user wishes to save over old version of their file +#: ../tuxpaint.c:13190 +msgid "Replace the picture with your changes?" +msgstr "Skipta út eldri myndinni með þeirri nýju?" + +#. Positive response to saving over old version +#. (like a 'File:Save' action in other applications) +#: ../tuxpaint.c:13194 +msgid "Yes, replace the old one!" +msgstr "Já, skipta út þeirri gömlu!" + +#. Negative response to saving over old version (saves a new image) +#. (like a 'File:Save As...' action in other applications) +#: ../tuxpaint.c:13198 +msgid "No, save a new file!" +msgstr "Nei, geyma nýja mynd!" + +#. Let user choose an image: +#. Instructions for 'Open' file dialog +#: ../tuxpaint.c:14454 +msgid "Choose the picture you want, then click “Open”." +msgstr "Veldu teikningu, og smelltu svo á '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 +msgid "Select 2 or more drawings to turn into an animated GIF." +msgstr "Veldu 2 eða fleiri teikningar sem á að breyta í GIF-hreyfimynd." + +#: ../tuxpaint.c:23539 +msgid "Select a color from your drawing." +msgstr "Veldu lit úr teikningunni þinni." + +#: ../tuxpaint.c:23551 +msgid "Pick a color." +msgstr "Veldu lit." + +#: ../tuxpaint.desktop.in.h:1 +msgid "Tux Paint" +msgstr "Tux Paint" + +#: ../tuxpaint.desktop.in.h:2 +msgid "Drawing program" +msgstr "Teikniforrit" + +#: ../tuxpaint.desktop.in.h:3 +msgid "A drawing program for children." +msgstr "Teikniforrit fyrir krakka." + +#: ../../magic/src/alien.c:68 +msgid "Color Shift" +msgstr "Litskipti" + +#: ../../magic/src/alien.c:72 +msgid "Click and drag the mouse to change the colors in parts of your picture." +msgstr "Smelltu og dragðu músina til að breyta litunum í hluta myndarinnar." + +#: ../../magic/src/alien.c:73 +msgid "Click to change the colors in your entire picture." +msgstr "Smelltu og hreyfðu músina til að breyta litunum í allri myndinni." + +#: ../../magic/src/blind.c:116 +msgid "Blind" +msgstr "Strimlar" + +#: ../../magic/src/blind.c:123 +msgid "" +"Click towards the edge of your picture to pull window blinds over it. Move " +"perpendicularly to open or close the blinds." +msgstr "" +"Smelltu við jaðar myndarinnar til að draga strimlagluggatjöld fyrir myndina. " +"Færðu músina þvert til að opna og loka gluggatjöldunum." + +#: ../../magic/src/blocks_chalk_drip.c:129 +msgid "Blocks" +msgstr "Blokkir" + +#: ../../magic/src/blocks_chalk_drip.c:131 +msgid "Chalk" +msgstr "Krít" + +#: ../../magic/src/blocks_chalk_drip.c:133 +msgid "Drip" +msgstr "Leka" + +#: ../../magic/src/blocks_chalk_drip.c:142 +msgid "Click and drag the mouse around to make the picture blocky." +msgstr "Smelltu og dragðu músina til að gera myndina alla í blokkum." + +#: ../../magic/src/blocks_chalk_drip.c:144 +msgid "" +"Click and drag the mouse around to turn the picture into a chalk drawing." +msgstr "Smelltu og dragðu músina til að breyta myndinni í krítarmynd!" + +#: ../../magic/src/blocks_chalk_drip.c:146 +msgid "Click and drag the mouse around to make the picture drip." +msgstr "Smelltu og dragðu músina til að láta myndina leka." + +#: ../../magic/src/blur.c:80 +msgid "Blur" +msgstr "Móða" + +#: ../../magic/src/blur.c:84 +msgid "Click and drag the mouse around to blur the image." +msgstr "Smelltu og dragðu músina til að gera myndina óskýrari." + +#: ../../magic/src/blur.c:85 +msgid "Click to blur the entire image." +msgstr "Smelltu til að gera alla myndina óskýrari." + +#. Both are named "Bricks", at the moment: +#: ../../magic/src/bricks.c:120 +msgid "Bricks" +msgstr "Múrsteinar" + +#: ../../magic/src/bricks.c:127 +msgid "Click and drag to draw large bricks." +msgstr "Smelltu og dragðu músina til að búa til stóra múrsteina." + +#: ../../magic/src/bricks.c:129 +msgid "Click and drag to draw small bricks." +msgstr "Smelltu og dragðu músina til að búa til litla múrsteina." + +#: ../../magic/src/calligraphy.c:124 +msgid "Calligraphy" +msgstr "Skrautritun" + +#: ../../magic/src/calligraphy.c:131 +msgid "Click and drag the mouse around to draw in calligraphy." +msgstr "Smelltu og dragðu músina til að teikna eins og skrautskrift." + +#: ../../magic/src/cartoon.c:103 +msgid "Cartoon" +msgstr "Teiknimynd" + +#: ../../magic/src/cartoon.c:109 +msgid "Click and drag the mouse around to turn the picture into a cartoon." +msgstr "Smelltu og dragðu músina til að breyta myndinni í teiknimynd." + +#: ../../magic/src/confetti.c:83 +msgid "Confetti" +msgstr "Pappírsskraut" + +#: ../../magic/src/confetti.c:88 +msgid "Click to throw confetti!" +msgstr "Smelltu til að kasta skrauti!" + +#: ../../magic/src/distortion.c:134 +msgid "Distortion" +msgstr "Afmynda" + +#: ../../magic/src/distortion.c:143 +msgid "Click and drag the mouse to cause distortion in your picture." +msgstr "Smelltu og dragðu músina til að afmynda hluta myndarinnar." + +#: ../../magic/src/emboss.c:101 +msgid "Emboss" +msgstr "Upphleypt" + +#: ../../magic/src/emboss.c:107 +msgid "Click and drag the mouse to emboss the picture." +msgstr "Smelltu og dragðu músina til að upphleypa myndina." + +#: ../../magic/src/fade_darken.c:114 +msgid "Lighten" +msgstr "Lýsa" + +#: ../../magic/src/fade_darken.c:116 +msgid "Darken" +msgstr "Dekkja" + +#: ../../magic/src/fade_darken.c:127 +msgid "Click and drag the mouse to lighten parts of your picture." +msgstr "Smelltu og dragðu músina til að gera hluta myndarinnar bjartari." + +#: ../../magic/src/fade_darken.c:129 +msgid "Click to lighten your entire picture." +msgstr "Smelltu til að gera myndina bjartari" + +#: ../../magic/src/fade_darken.c:134 +msgid "Click and drag the mouse to darken parts of your picture." +msgstr "Smelltu og dragðu músina til að gera hluta myndarinnar dekkri." + +#: ../../magic/src/fade_darken.c:136 +msgid "Click to darken your entire picture." +msgstr "Smelltu til að gera myndina dekkri." + +#: ../../magic/src/fisheye.c:101 +msgid "Fisheye" +msgstr "Fiskauga" + +#: ../../magic/src/fisheye.c:106 +msgid "Click on part of your picture to create a fisheye effect." +msgstr "Smelltu á svæði á myndinni til að framkalla fiskauga-áhrif." + +#: ../../magic/src/flower.c:144 +msgid "Flower" +msgstr "Blóm" + +#: ../../magic/src/flower.c:150 +msgid "Click and drag to draw a flower stalk. Let go to finish the flower." +msgstr "Smelltu og dragðu til að teikna blómstilk. Förum svo og klárum blómið." + +#: ../../magic/src/foam.c:114 +msgid "Foam" +msgstr "Froða" + +#: ../../magic/src/foam.c:120 +msgid "Click and drag the mouse to cover an area with foamy bubbles." +msgstr "Smelltu og dragðu músina yfir svæði til að þekja það með froðu." + +#: ../../magic/src/fold.c:103 +msgid "Fold" +msgstr "Brot" + +#: ../../magic/src/fold.c:108 +msgid "" +"Choose a background color and click to turn the corner of the page over." +msgstr "Veldu bakgrunnslit og smelltu til að snúa við horni myndarinnar" + +#: ../../magic/src/fretwork.c:176 +msgid "Fretwork" +msgstr "Mynstur" + +#: ../../magic/src/fretwork.c:182 +msgid "Click and drag to draw repetitive patterns. " +msgstr "Smelltu og dragðu músina til að búa til endurtekin mynstur. " + +#: ../../magic/src/fretwork.c:184 +msgid "Click to surround your picture with repetitive patterns." +msgstr "" +"Smelltu til að ramma myndina inn myndina þína með endurteknum mynstrum." + +#: ../../magic/src/glasstile.c:104 +msgid "Glass Tile" +msgstr "Glerflísar" + +#: ../../magic/src/glasstile.c:111 +msgid "Click and drag the mouse to put glass tile over your picture." +msgstr "Smelltu og dragðu músina til að draga glerflísar yfir myndina." + +#: ../../magic/src/glasstile.c:113 +msgid "Click to cover your entire picture in glass tiles." +msgstr "Smelltu til að brjóta myndina þína upp í glerflísar." + +#: ../../magic/src/grass.c:107 +msgid "Grass" +msgstr "Gras" + +#: ../../magic/src/grass.c:113 +msgid "Click and drag to draw grass. Don’t forget the dirt!" +msgstr "Smelltu og dragðu músina til að teikna gras. Ekki gleyma drullunni!" + +#: ../../magic/src/halftone.c:35 +msgid "Halftone" +msgstr "Hálftónað" + +#: ../../magic/src/halftone.c:39 +msgid "Click and drag to turn your drawing into a newspaper." +msgstr "Smelltu og dragðu músina til að breyta myndinni þinni í dagblað." + +#: ../../magic/src/kalidescope.c:119 +msgid "Symmetric Left/Right" +msgstr "Samhverft Vinstri/Hægri" + +#: ../../magic/src/kalidescope.c:123 +msgid "Symmetric Up/Down" +msgstr "Samhverft Efri/Neðri" + +#: ../../magic/src/kalidescope.c:127 +msgid "Pattern" +msgstr "Mynstur" + +#: ../../magic/src/kalidescope.c:131 +msgid "Tiles" +msgstr "Flísar" + +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:135 +msgid "Kaleidoscope" +msgstr "Kviksjá" + +#: ../../magic/src/kalidescope.c:146 +msgid "" +"Click and drag the mouse to draw with two brushes that are symmetric across " +"the left and right of your picture." +msgstr "" +"Smelltu og dragðu músina til teikna með tveimur penslum sem eru samhverfir " +"hægra og vinstri meginn á myndinni - um lóðréttan ás." + +#: ../../magic/src/kalidescope.c:152 +msgid "" +"Click and drag the mouse to draw with two brushes that are symmetric across " +"the top and bottom of your picture." +msgstr "" +"Smelltu og dragðu músina til teikna með tveimur penslum sem eru samhverfir " +"um efri og neðri hluta myndarinnar - um láréttan ás." + +#: ../../magic/src/kalidescope.c:156 +msgid "Click and drag the mouse to draw a pattern across the picture." +msgstr "Smelltu og dragðu músina til að draga mynstur yfir myndina." + +#: ../../magic/src/kalidescope.c:160 +msgid "" +"Click and drag the mouse to draw a pattern that is symmetric across the " +"picture." +msgstr "Smelltu og dragðu músina til teikna samhverft mynstur á myndina." + +#. KAL_BOTH +#: ../../magic/src/kalidescope.c:164 +msgid "" +"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)." +msgstr "" +"Smelltu og dragðu músina til að teikna með samhverfum penslum (kviksjá)." + +#: ../../magic/src/light.c:103 +msgid "Light" +msgstr "Ljós" + +#: ../../magic/src/light.c:109 +msgid "Click and drag to draw a beam of light on your picture." +msgstr "Smelltu og dragðu til að teikna ljósgeisla á myndina þína." + +#: ../../magic/src/metalpaint.c:98 +msgid "Metal Paint" +msgstr "Málm-áferð" + +#: ../../magic/src/metalpaint.c:105 +msgid "Click and drag the mouse to paint with a metallic color." +msgstr "Smelltu og dragðu músina til að teikna með málmáferð." + +#: ../../magic/src/mirror_flip.c:110 +msgid "Mirror" +msgstr "Spegla" + +#: ../../magic/src/mirror_flip.c:112 +msgid "Flip" +msgstr "Fletta" + +#: ../../magic/src/mirror_flip.c:121 +msgid "Click to make a mirror image." +msgstr "Smelltu til að gera spegilmynd." + +#: ../../magic/src/mirror_flip.c:123 +msgid "Click to flip the picture upside-down." +msgstr "Smelltu til að setja myndina á hvolf." + +#: ../../magic/src/mosaic.c:96 +msgid "Mosaic" +msgstr "Tígulsteinar" + +#: ../../magic/src/mosaic.c:100 +msgid "" +"Click and drag the mouse to add a mosaic effect to parts of your picture." +msgstr "" +"Smelltu og dragðu músina til að bæta við tígulsteina-áhrifum á hluta " +"myndarinnar." + +#: ../../magic/src/mosaic.c:101 +msgid "Click to add a mosaic effect to your entire picture." +msgstr "Smelltu til að bæta við tígulsteina-áhrifum á myndina þína." + +#: ../../magic/src/mosaic_shaped.c:132 +msgid "Square Mosaic" +msgstr "Ferningslaga tígulsteinn" + +#: ../../magic/src/mosaic_shaped.c:133 +msgid "Hexagon Mosaic" +msgstr "Sexhyrndur tígulsteinn" + +#: ../../magic/src/mosaic_shaped.c:134 +msgid "Irregular Mosaic" +msgstr "Óreglulegur tígulsteinn" + +#: ../../magic/src/mosaic_shaped.c:140 +msgid "" +"Click and drag the mouse to add a square mosaic to parts of your picture." +msgstr "" +"Smelltu og dragðu músina til að bæta við ferhyrndum mósaík-áhrifum á myndina." + +#: ../../magic/src/mosaic_shaped.c:141 +msgid "Click to add a square mosaic to your entire picture." +msgstr "" +"Smelltu og hreyfðu músina til að bæta við ferhyrndum tígulsteina-áhrifum á " +"alla myndina þína." + +#: ../../magic/src/mosaic_shaped.c:145 +msgid "" +"Click and drag the mouse to add a hexagonal mosaic to parts of your picture." +msgstr "" +"Smelltu og dragðu músina til að bæta við sexhyrndum tígulsteina-áhrifum á " +"myndina." + +#: ../../magic/src/mosaic_shaped.c:146 +msgid "Click to add a hexagonal mosaic to your entire picture." +msgstr "" +"Smelltu til að bæta við sexhyrndum tígulsteina-áhrifum á alla myndina þína." + +#: ../../magic/src/mosaic_shaped.c:150 +msgid "" +"Click and drag the mouse to add an irregular mosaic to parts of your picture." +msgstr "" +"Smelltu og dragðu músina til að bæta við óreglulegum tígulsteina-áhrifum á " +"hluta myndarinnar." + +#: ../../magic/src/mosaic_shaped.c:151 +msgid "Click to add an irregular mosaic to your entire picture." +msgstr "" +"Smelltu til að bæta við óreglulegum tígulsteina-áhrifum á myndina þína." + +#: ../../magic/src/negative.c:94 +msgid "Negative" +msgstr "Andhverfa" + +#: ../../magic/src/negative.c:101 +msgid "Click and drag the mouse around to make your painting negative." +msgstr "Smelltu og dragðu músina til að andhverfa litum myndarinnar." + +#: ../../magic/src/negative.c:103 +msgid "Click to turn your painting into its negative." +msgstr "Smelltu til að andhverfa litum myndarinnar." + +#: ../../magic/src/noise.c:66 +msgid "Noise" +msgstr "Suð" + +#: ../../magic/src/noise.c:70 +msgid "Click and drag the mouse to add noise to parts of your picture." +msgstr "Smelltu og dragðu músina til bæta við truflunum í myndina." + +#: ../../magic/src/noise.c:71 +msgid "Click to add noise to your entire picture." +msgstr "Smelltu til bæta við óreglu í alla myndina." + +#: ../../magic/src/perspective.c:147 +msgid "Perspective" +msgstr "Sjónarhorn" + +#: ../../magic/src/perspective.c:148 +msgid "Zoom" +msgstr "Renna" + +#: ../../magic/src/perspective.c:153 +msgid "Click on the corners and drag where you want to stretch the picture." +msgstr "Smelltu á hornin og dragðu myndina til að teygja hana." + +#: ../../magic/src/perspective.c:156 +msgid "Click and drag up to zoom in or drag down to zoom out the picture." +msgstr "" +"Smelltu og dragðu músina upp til að renna að eða niður til að renna frá " +"myndinni." + +#: ../../magic/src/puzzle.c:103 +msgid "Puzzle" +msgstr "Púsluspil" + +#: ../../magic/src/puzzle.c:110 +msgid "Click the part of your picture where would you like a puzzle." +msgstr "" +"Smelltu á hluta myndarinnar sem þú vilt láta líta út eins og í púsluspili." + +#: ../../magic/src/puzzle.c:111 +msgid "Click to make a puzzle in fullscreen mode." +msgstr "Smelltu til að búa til púsluspil yfir allan skjáinn." + +#: ../../magic/src/rails.c:129 +msgid "Rails" +msgstr "Teinar" + +#: ../../magic/src/rails.c:134 +msgid "Click and drag to draw train track rails on your picture." +msgstr "" +"Smelltu og dragðu músina til að teikna járnbrautarteina á myndina þína." + +#: ../../magic/src/rainbow.c:133 +msgid "Rainbow" +msgstr "Regnbogi" + +#: ../../magic/src/rainbow.c:139 +msgid "You can draw in rainbow colors!" +msgstr "Þú getur teiknað með regnboga-litum!" + +#: ../../magic/src/rain.c:68 +msgid "Rain" +msgstr "Regn" + +#: ../../magic/src/rain.c:72 +msgid "Click to place a rain drop onto your picture." +msgstr "Smelltu til að setja regndropa á myndina þína." + +#: ../../magic/src/rain.c:73 +msgid "Click to cover your picture with rain drops." +msgstr "Smelltu til að setja regndropa á alla myndina þína." + +#: ../../magic/src/realrainbow.c:98 +msgid "Real Rainbow" +msgstr "Raunverulegur regnbogi" + +#: ../../magic/src/realrainbow.c:100 +msgid "ROYGBIV Rainbow" +msgstr "RAGGBLF-regnbogi" + +#: ../../magic/src/realrainbow.c:108 +msgid "" +"Click where you want your rainbow to start, drag to where you want it to " +"end, and then let go to draw a rainbow." +msgstr "" +"Smelltu þar sem þú vilt að regnboginn byrji, dragðu þangað sem þú vilt að " +"regnboginn endi, og slepptu músahnappnum til að teikna regnboga." + +#: ../../magic/src/ripples.c:102 +msgid "Ripples" +msgstr "Gárur" + +#: ../../magic/src/ripples.c:108 +msgid "Click to make ripples appear over your picture." +msgstr "Smelltu til að gera gárur á myndina þína." + +#: ../../magic/src/rosette.c:115 +msgid "Rosette" +msgstr "Rósetta" + +#: ../../magic/src/rosette.c:117 +msgid "Picasso" +msgstr "Picasso" + +#: ../../magic/src/rosette.c:123 +msgid "Click and start drawing your rosette." +msgstr "Smelltu og byrjaðu að teikna rósettuna þína." + +#: ../../magic/src/rosette.c:125 +msgid "You can draw just like Picasso!" +msgstr "Þú getur teiknað eins og Picasso!" + +#: ../../magic/src/sharpen.c:76 +msgid "Edges" +msgstr "Jaðrar" + +#: ../../magic/src/sharpen.c:77 +msgid "Sharpen" +msgstr "Skerpa" + +#: ../../magic/src/sharpen.c:78 +msgid "Silhouette" +msgstr "Skuggamynd" + +#: ../../magic/src/sharpen.c:82 +msgid "Click and drag the mouse to trace edges in parts of your picture." +msgstr "" +"Smelltu og dragðu músina til að draga eftir jöðrum í hluta myndarinnar." + +#: ../../magic/src/sharpen.c:83 +msgid "Click to trace edges in your entire picture." +msgstr "Smelltu til að teikna í jaðra á allri myndinni þinni." + +#: ../../magic/src/sharpen.c:84 +msgid "Click and drag the mouse to sharpen parts of your picture." +msgstr "Smelltu og dragðu músina til að skerpa hluta myndarinnar þinnar." + +#: ../../magic/src/sharpen.c:85 +msgid "Click to sharpen the entire picture." +msgstr "Smelltu til að skerpa alla myndina." + +#: ../../magic/src/sharpen.c:86 +msgid "Click and drag the mouse to create a black and white silhouette." +msgstr "Smelltu og dragðu músina til að gera svart-hvítar skuggamyndir." + +#: ../../magic/src/sharpen.c:87 +msgid "Click to create a black and white silhouette of your entire picture." +msgstr "Smelltu til að gera alla myndina að skuggamynd." + +#: ../../magic/src/shift.c:106 +msgid "Shift" +msgstr "Hliðra" + +#: ../../magic/src/shift.c:112 +msgid "Click and drag to shift your picture around on the canvas." +msgstr "Smelltu og dragðu músina til að færa myndina til á bakgrunninum." + +#: ../../magic/src/smudge.c:102 +msgid "Smudge" +msgstr "Fingramálun" + +#. if (which == 1) +#: ../../magic/src/smudge.c:104 +msgid "Wet Paint" +msgstr "Blaut málning" + +#: ../../magic/src/smudge.c:111 +msgid "Click and drag the mouse around to smudge the picture." +msgstr "Smelltu og dragðu músina til að káma myndina." + +#. if (which == 1) +#: ../../magic/src/smudge.c:113 +msgid "Click and drag the mouse around to draw with wet, smudgy paint." +msgstr "" +"Smelltu og dragðu músina til að líkja eftir málun með blautri málningu." + +#: ../../magic/src/snow.c:71 +msgid "Snow Ball" +msgstr "Snjóbolti" + +#: ../../magic/src/snow.c:72 +msgid "Snow Flake" +msgstr "Snjókorn" + +#: ../../magic/src/snow.c:76 +msgid "Click to add snow balls to your picture." +msgstr "Smelltu til bæta snjóboltum við myndina þína." + +#: ../../magic/src/snow.c:77 +msgid "Click to add snow flakes to your picture." +msgstr "Smelltu til bæta snjókornum við myndina þína." + +#: ../../magic/src/string.c:129 +msgid "String edges" +msgstr "Streng-jaðrar" + +#: ../../magic/src/string.c:132 +msgid "String corner" +msgstr "Streng-horn" + +#: ../../magic/src/string.c:135 +msgid "String 'V'" +msgstr "Streng-V" + +#: ../../magic/src/string.c:147 +msgid "" +"Click and drag to draw string art. Drag top-bottom to draw less or more " +"lines, left or right to make a bigger hole." +msgstr "" +"Smelltu og dragðu til að teikna strengjalist. Dragðu frá efri hluta myndar " +"og niður til að teikna færri eða fleiri línur, vinstri eða hægri til að gera " +"stærri holu." + +#: ../../magic/src/string.c:150 +msgid "Click and drag to draw arrows made of string art." +msgstr "Smelltu og dragðu til að teikna strengjalistörvar." + +#: ../../magic/src/string.c:153 +msgid "Draw string art arrows with free angles." +msgstr "Teikna strengja-list-örvar með frjálsum hornum." + +#: ../../magic/src/tint.c:74 +msgid "Tint" +msgstr "Litblær" + +#: ../../magic/src/tint.c:75 +msgid "Color & White" +msgstr "Litur+Hvítt" + +#: ../../magic/src/tint.c:79 +msgid "" +"Click and drag the mouse around to change the color of parts of your picture." +msgstr "Smelltu og dragðu músina um til að breyta litum á hluta myndarinnar." + +#: ../../magic/src/tint.c:80 +msgid "Click to change the color of your entire picture." +msgstr "Smelltu til að breyta litum myndarinnar." + +#: ../../magic/src/tint.c:81 +msgid "" +"Click and drag the mouse around to turn parts of your picture into white and " +"a color you choose." +msgstr "" +"Smelltu og dragðu músina um til að breyta hluta af myndinni þinni yfir í " +"hvítt og annan lit sem þú velur." + +#: ../../magic/src/tint.c:82 +msgid "Click to turn your entire picture into white and a color you choose." +msgstr "Smelltu til að breyta myndinni þinni yfir í hvítt og lit sem þú velur." + +#: ../../magic/src/toothpaste.c:68 +msgid "Toothpaste" +msgstr "Tannkrem" + +#: ../../magic/src/toothpaste.c:72 +msgid "Click and drag to squirt toothpaste onto your picture." +msgstr "Smelltu og dragðu músina til að sprauta tannkremi yfir myndina þína." + +#: ../../magic/src/tornado.c:153 +msgid "Tornado" +msgstr "Hvirfilvindur" + +#: ../../magic/src/tornado.c:159 +msgid "Click and drag to draw a tornado funnel on your picture." +msgstr "Smelltu og dragðu músina til að teikna hvirfilvind á myndina þína." + +#: ../../magic/src/tv.c:96 +msgid "TV" +msgstr "Sjónvarp" + +#: ../../magic/src/tv.c:102 +msgid "" +"Click and drag to make parts of your picture look like they are on " +"television." +msgstr "" +"Smelltu og dragðu músina til að láta hluta myndarinnar líta út eins og þeir " +"séu í sjónvarpi." + +#: ../../magic/src/tv.c:105 +msgid "Click to make your picture look like it's on television." +msgstr "Smelltu til að láta myndina líta út eins og hún sé sjónvarpsmynd." + +#: ../../magic/src/waves.c:104 +msgid "Waves" +msgstr "Bylgjur" + +#: ../../magic/src/waves.c:106 +msgid "Wavelets" +msgstr "Smábylgjur" + +#: ../../magic/src/waves.c:115 +msgid "" +"Click to make the picture horizontally wavy. Click toward the top for " +"shorter waves, the bottom for taller waves, the left for small waves, and " +"the right for long waves." +msgstr "" +"Smelltu til að búa til láréttar bylgjur. Smelltu ofarlega til að gera " +"bylgjurnar styttri, neðarlega fyrir stærri bylgjur, til vinstri fyrir litlar " +"bylgjur og til hægri fyrir langar bylgjur." + +#: ../../magic/src/waves.c:118 +msgid "" +"Click to make the picture vertically wavy. Click toward the top for shorter " +"waves, the bottom for taller waves, the left for small waves, and the right " +"for long waves." +msgstr "" +"Smelltu til að búa til lóðréttar bylgjur. Smelltu ofarlega til að gera " +"bylgjurnar styttri, neðarlega fyrir stærri bylgjur, til vinstri fyrir litlar " +"bylgjur og til hægri fyrir langar bylgjur." + +#: ../../magic/src/xor.c:93 +msgid "Xor Colors" +msgstr "XOR Litir" + +#: ../../magic/src/xor.c:99 +msgid "Click and drag to draw a XOR effect" +msgstr "Smelltu og dragðu músina til að búa til XOR áhrif." + +#: ../../magic/src/xor.c:101 +msgid "Click to draw a XOR effect on the whole picture" +msgstr "Smelltu til að beita XOR áhrifum á alla myndina." + +#, fuzzy +#~ msgid "" +#~ "Click and drag to draw the blind, move left or right to open or close." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina þynnri." + +#, fuzzy +#~ msgid "Mosaic square" +#~ msgstr "Töfrar" + +#, fuzzy +#~ msgid "Mosaic hexagon" +#~ msgstr "Töfrar" + +#, fuzzy +#~ msgid "" +#~ "Click and move the mouse to add a mosaic squared effect to parts of your " +#~ "picture." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "Click to add a mosaic squared effect to your entire picture." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "" +#~ "Click and move the mouse to add a mosaic hexagonal effect to parts of " +#~ "your picture." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "Click to add a mosaic hexagonal effect to your entire picture." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "" +#~ "Click and drag to draw a tornado stalk. Let go to finish the tornado." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina þynnri." + +#, fuzzy +#~ msgid "" +#~ "Click and move the mouse to give parts of your picture an \"alien\" " +#~ "appearance." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." + +#, fuzzy +#~ msgid "Click to give your entire picture an \"alien\" appearance." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina 'Kassa-lega'." + +#, fuzzy +#~ msgid "Click and move the mouse to add noise to the image." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." + +#, fuzzy +#~ msgid "Click to add noise to the entire image." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "Click and move the mouse to trace the edges of objects in the image." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." + +#, fuzzy +#~ msgid "Click and move the mouse to sharpen the image." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." + +#, fuzzy +#~ msgid "Click to add snow to the entire image." +#~ msgstr "Smelltu til að gera spegilmynd." + +#, fuzzy +#~ msgid "" +#~ "Click and move the mouse around to turn the image into pure color and " +#~ "white regions." +#~ msgstr "Smelltu og hreyfðu músina til að búa til krítarmynd!" + +#, fuzzy +#~ msgid "Click and move the mouse around convert the image to greyscale." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina óskýrari." + +#, fuzzy +#~ msgid "Click to change the entire picture’s color." +#~ msgstr "Smelltu og hreyfðu músina til að gera myndina 'Kassa-lega'." + +#, fuzzy +#~ msgid "Blur All" +#~ msgstr "Óskýr" + +#~ msgid "Click and move to fade the colors." +#~ msgstr "Smelltu og hreyfðu músina til að þynna út litina!" + +#, fuzzy +#~ msgid "Click and move to darken the colors." +#~ msgstr "Smelltu og hreyfðu músina til að þynna út litina!" + +#~ msgid "Sparkles" +#~ msgstr "Neistar" + +#~ msgid "You now have a blank sheet to draw on!" +#~ msgstr "Nú ertu með autt blað til að teikna á!" + +#, fuzzy +#~ msgid "Start a new picture?" +#~ msgstr "Eyða myndinni?" + +#~ msgid "Click and move to draw sparkles." +#~ msgstr "Smelltu og hreyfðu músina til að búa til neista." + +#~ msgid "Starting a new picture will erase the current one!" +#~ msgstr "Ef þú byrjar á nýrri mynd, eyðist núverandi mynd!" + +#~ msgid "That’s OK!" +#~ msgstr "Það er í lagi!" + +#~ msgid "Never mind!" +#~ msgstr "Hætta við!" + +#~ msgid "Save over the older version of this picture?" +#~ msgstr "Eyða eldri útgáfu af þessarri mynd?" + +#~ msgid "Green!" +#~ msgstr "Grænt!" + +#~ msgid "Fade" +#~ msgstr "Þynna út" + +#~ msgid "Oval" +#~ msgstr "Hringlaga" + +#~ msgid "Diamond" +#~ msgstr "Tígull" + +#~ msgid "A square has four sides, each the same length." +#~ msgstr "Ferningur hefur fjórar hliðar, allar jafn langar." + +#~ msgid "A circle is exactly round." +#~ msgstr "Hringur er nákvæmlega kringlóttur." + +#~ msgid "A diamond is a square, turned around slightly." +#~ msgstr "Tígull er ferhyrndur, svolítið snúinn." + +#~ msgid "Lime!" +#~ msgstr "Gulgrænt!" + +#~ msgid "Fuchsia!" +#~ msgstr "Bleikt!" + +#~ msgid "Silver!" +#~ msgstr "Silfur!" + \ No newline at end of file