diff --git a/Makefile b/Makefile
index 5981e405b..8ded62c22 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
# bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/
-# June 14, 2002 - March 29, 2006
+# June 14, 2002 - April 2, 2006
# The version number, for release:
@@ -410,6 +410,7 @@ uninstall:
-rm $(LOCALE_PREFIX)/es_MX/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)/eu/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)/fi/LC_MESSAGES/tuxpaint.mo
+ -rm $(LOCALE_PREFIX)/fo/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)/fr/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)/ga/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)/gd/LC_MESSAGES/tuxpaint.mo
@@ -722,6 +723,11 @@ install-gettext:
@cp trans/et.mo $(LOCALE_PREFIX)/et/LC_MESSAGES/tuxpaint.mo
@chmod 644 $(LOCALE_PREFIX)/et/LC_MESSAGES/tuxpaint.mo
@#
+ @echo " fo_FO ...Faroese..."
+ @install -d $(LOCALE_PREFIX)/fo/LC_MESSAGES
+ @cp trans/fo.mo $(LOCALE_PREFIX)/fo/LC_MESSAGES/tuxpaint.mo
+ @chmod 644 $(LOCALE_PREFIX)/fo/LC_MESSAGES/tuxpaint.mo
+ @#
@echo " fi_FI ...Finnish..."
@install -d $(LOCALE_PREFIX)/fi/LC_MESSAGES
@cp trans/fi.mo $(LOCALE_PREFIX)/fi/LC_MESSAGES/tuxpaint.mo
@@ -1122,6 +1128,7 @@ translations: trans \
trans/es_mx.mo \
trans/eu.mo \
trans/fi.mo \
+ trans/fo.mo \
trans/fr.mo \
trans/ga.mo \
trans/gd.mo \
@@ -1241,6 +1248,10 @@ trans/fi.mo: src/po/fi.po
@echo " fi_FI ...Finnish..."
@msgfmt -o trans/fi.mo src/po/fi.po
+trans/fo.mo: src/po/fo.po
+ @echo " fo_FO ...Faroese..."
+ @msgfmt -o trans/fo.mo src/po/fo.po
+
trans/fr.mo: src/po/fr.po
@echo " fr_FR ...French..."
@msgfmt -o trans/fr.mo src/po/fr.po
diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
index 97f0108d9..3c65ff03c 100644
--- a/docs/AUTHORS.txt
+++ b/docs/AUTHORS.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
-June 17, 2002 - March 28, 2006
+June 17, 2002 - April 2, 2006
$Id$
@@ -139,6 +139,9 @@ $Id$
* Estonian
Henrik Pihl
+ * Faroese
+ Lis Gøthe í Jákupsstovu
+
* Finnish
Tarmo Toikkanen
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index ad7ff409b..65a5765f9 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/
$Id$
-2006.March.29 (0.9.16)
+2006.April.5 (0.9.16)
* Interface improvements:
-----------------------
* Modified "Text" tool so that it correctly handles the 16-bit unicode
@@ -62,6 +62,9 @@ $Id$
* Arabic -- includes "ar.ttf" font
Khalid Al Holan
+ * Faroese
+ Lis Gøthe í Jákupsstovu
+
* Scottish Gaelic
Niall Tracey
diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt
index 46c3fee3d..6b1b9498a 100644
--- a/docs/OPTIONS.txt
+++ b/docs/OPTIONS.txt
@@ -1,15 +1,15 @@
Tux Paint
- version 0.9.15
+ version 0.9.16
Options Documentation
- Copyright 2005 by Bill Kendrick and others
+ Copyright 2002-2006 by Bill Kendrick and others
New Breed Software
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
- November 12, 2005
+ April 2, 2006
--------------------------------------------------------------------------
@@ -315,119 +315,127 @@ Windows Users
Run Tux Paint in one of the supported languages. Possible choice
for LANGUAGE currently include:
- +----------------------------------------------------+
- |english |american-english | |
- |--------------------+---------------------+---------|
- |albanian | | |
- |--------------------+---------------------+---------|
- |afrikaans | | |
- |--------------------+---------------------+---------|
- |basque |euskara | |
- |--------------------+---------------------+---------|
- |belarusian |bielaruskaja | |
- |--------------------+---------------------+---------|
- |bokmal | | |
- |--------------------+---------------------+---------|
- |brazilian-portuguese|portuges-brazilian |brazilian|
- |--------------------+---------------------+---------|
- |breton |brezhoneg | |
- |--------------------+---------------------+---------|
- |british-english |british | |
- |--------------------+---------------------+---------|
- |bulgarian | | |
- |--------------------+---------------------+---------|
- |catalan |catala | |
- |--------------------+---------------------+---------|
- |chinese |simplified-chinese | |
- |--------------------+---------------------+---------|
- |croatian |hrvatski | |
- |--------------------+---------------------+---------|
- |czech |cesky | |
- |--------------------+---------------------+---------|
- |danish |dansk | |
- |--------------------+---------------------+---------|
- |dutch |nederlands | |
- |--------------------+---------------------+---------|
- |estonian | | |
- |--------------------+---------------------+---------|
- |finnish |suomi | |
- |--------------------+---------------------+---------|
- |french |francais | |
- |--------------------+---------------------+---------|
- |gaelic |gaidhlig | |
- |--------------------+---------------------+---------|
- |galician |galego | |
- |--------------------+---------------------+---------|
- |german |deutsch | |
- |--------------------+---------------------+---------|
- |greek | | |
- |--------------------+---------------------+---------|
- |gronings |zudelk-veenkelonioals| |
- |--------------------+---------------------+---------|
- |hebrew | | |
- |--------------------+---------------------+---------|
- |hindi | | |
- |--------------------+---------------------+---------|
- |hungarian |magyar | |
- |--------------------+---------------------+---------|
- |icelandic |islenska | |
- |--------------------+---------------------+---------|
- |indonesian |bahasa-indonesia | |
- |--------------------+---------------------+---------|
- |italian |italiano | |
- |--------------------+---------------------+---------|
- |japanese | | |
- |--------------------+---------------------+---------|
- |kinyarwanda | | |
- |--------------------+---------------------+---------|
- |klingon |tlhIngan | |
- |--------------------+---------------------+---------|
- |korean | | |
- |--------------------+---------------------+---------|
- |lithuanian |lietuviu | |
- |--------------------+---------------------+---------|
- |malay | | |
- |--------------------+---------------------+---------|
- |mexican-spanish |espanol-mejicano |mexican |
- |--------------------+---------------------+---------|
- |norwegian |nynorsk | |
- |--------------------+---------------------+---------|
- |polish |polski | |
- |--------------------+---------------------+---------|
- |portuguese |portugues | |
- |--------------------+---------------------+---------|
- |romanian | | |
- |--------------------+---------------------+---------|
- |russian | | |
- |--------------------+---------------------+---------|
- |serbian | | |
- |--------------------+---------------------+---------|
- |spanish |espanol | |
- |--------------------+---------------------+---------|
- |slovak | | |
- |--------------------+---------------------+---------|
- |slovenian |slovensko | |
- |--------------------+---------------------+---------|
- |swahili | | |
- |--------------------+---------------------+---------|
- |swedish |svenska | |
- |--------------------+---------------------+---------|
- |tamil | | |
- |--------------------+---------------------+---------|
- |thai | | |
- |--------------------+---------------------+---------|
- |traditional-chinese | | |
- |--------------------+---------------------+---------|
- |turkish | | |
- |--------------------+---------------------+---------|
- |ukrainian | | |
- |--------------------+---------------------+---------|
- |vietnamese | | |
- |--------------------+---------------------+---------|
- |walloon |walon | |
- |--------------------+---------------------+---------|
- |welsh |cymraeg | |
- +----------------------------------------------------+
+ +----------------------------------------------------------+
+ |english |american-english | |
+ |--------------------+---------------------+---------------|
+ |albanian | | |
+ |--------------------+---------------------+---------------|
+ |afrikaans | | |
+ |--------------------+---------------------+---------------|
+ |arabic | | |
+ |--------------------+---------------------+---------------|
+ |basque |euskara | |
+ |--------------------+---------------------+---------------|
+ |belarusian |bielaruskaja | |
+ |--------------------+---------------------+---------------|
+ |bokmal | | |
+ |--------------------+---------------------+---------------|
+ |brazilian-portuguese|portuges-brazilian |brazilian |
+ |--------------------+---------------------+---------------|
+ |breton |brezhoneg | |
+ |--------------------+---------------------+---------------|
+ |british-english |british | |
+ |--------------------+---------------------+---------------|
+ |bulgarian | | |
+ |--------------------+---------------------+---------------|
+ |catalan |catala | |
+ |--------------------+---------------------+---------------|
+ |chinese |simplified-chinese | |
+ |--------------------+---------------------+---------------|
+ |croatian |hrvatski | |
+ |--------------------+---------------------+---------------|
+ |czech |cesky | |
+ |--------------------+---------------------+---------------|
+ |danish |dansk | |
+ |--------------------+---------------------+---------------|
+ |dutch |nederlands | |
+ |--------------------+---------------------+---------------|
+ |estonian | | |
+ |--------------------+---------------------+---------------|
+ |finnish |suomi | |
+ |--------------------+---------------------+---------------|
+ |faroese | | |
+ |--------------------+---------------------+---------------|
+ |french |francais | |
+ |--------------------+---------------------+---------------|
+ |gaelic |gaidhlig |irish-gaelic |
+ |--------------------+---------------------+---------------|
+ |galician |galego | |
+ |--------------------+---------------------+---------------|
+ |german |deutsch | |
+ |--------------------+---------------------+---------------|
+ |greek | | |
+ |--------------------+---------------------+---------------|
+ |gronings |zudelk-veenkelonioals| |
+ |--------------------+---------------------+---------------|
+ |hebrew | | |
+ |--------------------+---------------------+---------------|
+ |hindi | | |
+ |--------------------+---------------------+---------------|
+ |hungarian |magyar | |
+ |--------------------+---------------------+---------------|
+ |icelandic |islenska | |
+ |--------------------+---------------------+---------------|
+ |indonesian |bahasa-indonesia | |
+ |--------------------+---------------------+---------------|
+ |italian |italiano | |
+ |--------------------+---------------------+---------------|
+ |japanese | | |
+ |--------------------+---------------------+---------------|
+ |kinyarwanda | | |
+ |--------------------+---------------------+---------------|
+ |klingon |tlhIngan | |
+ |--------------------+---------------------+---------------|
+ |korean | | |
+ |--------------------+---------------------+---------------|
+ |lithuanian |lietuviu | |
+ |--------------------+---------------------+---------------|
+ |malay | | |
+ |--------------------+---------------------+---------------|
+ |mexican-spanish |espanol-mejicano |mexican |
+ |--------------------+---------------------+---------------|
+ |norwegian |nynorsk | |
+ |--------------------+---------------------+---------------|
+ |polish |polski | |
+ |--------------------+---------------------+---------------|
+ |portuguese |portugues | |
+ |--------------------+---------------------+---------------|
+ |romanian | | |
+ |--------------------+---------------------+---------------|
+ |russian | | |
+ |--------------------+---------------------+---------------|
+ |scottish |ghaidhlig |scottish-gaelic|
+ |--------------------+---------------------+---------------|
+ |serbian | | |
+ |--------------------+---------------------+---------------|
+ |slovak | | |
+ |--------------------+---------------------+---------------|
+ |slovenian |slovensko | |
+ |--------------------+---------------------+---------------|
+ |spanish |espanol | |
+ |--------------------+---------------------+---------------|
+ |swahili | | |
+ |--------------------+---------------------+---------------|
+ |swedish |svenska | |
+ |--------------------+---------------------+---------------|
+ |tamil | | |
+ |--------------------+---------------------+---------------|
+ |thai | | |
+ |--------------------+---------------------+---------------|
+ |tibetan | | |
+ |--------------------+---------------------+---------------|
+ |traditional-chinese | | |
+ |--------------------+---------------------+---------------|
+ |turkish | | |
+ |--------------------+---------------------+---------------|
+ |ukrainian | | |
+ |--------------------+---------------------+---------------|
+ |vietnamese | | |
+ |--------------------+---------------------+---------------|
+ |walloon |walon | |
+ |--------------------+---------------------+---------------|
+ |welsh |cymraeg | |
+ +----------------------------------------------------------+
--------------------------------------------------------------------------
@@ -602,10 +610,14 @@ Available Languages
|---------------+---------------------+---------------------|
|af_ZA | |Afrikaans |
|---------------+---------------------+---------------------|
+ |ar_SA | |Arabic |
+ |---------------+---------------------+---------------------|
|be_BY |Bielaruskaja |Belarusian |
|---------------+---------------------+---------------------|
|bg_BG | |Bulgarian |
|---------------+---------------------+---------------------|
+ |bo_CN | |Tibetan |
+ |---------------+---------------------+---------------------|
|br_FR |Brezhoneg |Breton |
|---------------+---------------------+---------------------|
|ca_ES |Català |Catalan |
@@ -632,9 +644,13 @@ Available Languages
|---------------+---------------------+---------------------|
|fi_FI |Suomi |Finnish |
|---------------+---------------------+---------------------|
+ |fo_FO |Faroese | |
+ |---------------+---------------------+---------------------|
|fr_FR |Français |French |
|---------------+---------------------+---------------------|
- |ga_IE |Gàidhlig |Gaelic |
+ |ga_IE |Gàidhlig |Irish Gaelic |
+ |---------------+---------------------+---------------------|
+ |gd_GB |Ghaidhlig |Scottish Gaelic |
|---------------+---------------------+---------------------|
|gl_ES |Galego |Galician |
|---------------+---------------------+---------------------|
@@ -821,5 +837,3 @@ Setting Your Environment's Locale
Under Unix and Linux, you can use the Makefile that comes with the
font to install the font in the appropriate location.
-
-$Id$
diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html
index fc318f37d..be0aa685b 100644
--- a/docs/html/OPTIONS.html
+++ b/docs/html/OPTIONS.html
@@ -1,5 +1,4 @@
-
+
Tux Paint Options Documentation
@@ -12,18 +11,18 @@ alink="#FF00FF">
version
-0.9.15
+0.9.16
Options Documentation
-Copyright 2005 by Bill Kendrick and others
+
Copyright 2002-2006 by Bill Kendrick and others
New Breed Software
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
-November 12, 2005
+April 2, 2006
@@ -408,6 +407,11 @@ New Breed Software
|
|
+
+ arabic |
+ |
+ |
+
basque |
euskara |
@@ -483,6 +487,11 @@ New Breed Software
suomi |
|
+
+ faroese |
+ |
+ |
+
french |
francais |
@@ -491,7 +500,7 @@ New Breed Software
gaelic |
gaidhlig |
- |
+ irish-gaelic |
galician |
@@ -604,13 +613,13 @@ New Breed Software
|
- serbian |
- |
- |
+ scottish |
+ ghaidhlig |
+ scottish-gaelic |
- spanish |
- espanol |
+ serbian |
+ |
|
@@ -623,6 +632,11 @@ New Breed Software
slovensko |
|
+
+ spanish |
+ espanol |
+ |
+
swahili |
|
@@ -643,6 +657,11 @@ New Breed Software
|
|
+
+ tibetan |
+ |
+ |
+
traditional-chinese |
|
@@ -908,6 +927,11 @@ New Breed Software
|
Afrikaans |
+
+ ar_SA |
+ |
+ Arabic |
+
be_BY |
Bielaruskaja |
@@ -918,6 +942,11 @@ New Breed Software
|
Bulgarian |
+
+ bo_CN |
+ |
+ Tibetan |
+
br_FR |
Brezhoneg |
@@ -983,6 +1012,11 @@ New Breed Software
Suomi |
Finnish |
+
+ fo_FO |
+ Faroese |
+ |
+
fr_FR |
Français |
@@ -991,7 +1025,12 @@ New Breed Software
ga_IE |
Gàidhlig |
- Gaelic |
+ Irish Gaelic |
+
+
+ gd_GB |
+ Ghaidhlig |
+ Scottish Gaelic |
gl_ES |
diff --git a/src/i18n.c b/src/i18n.c
index df625aad4..e5f0f6418 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
- June 14, 2002 - March 29, 2006
+ June 14, 2002 - April 2, 2006
$Id$
*/
@@ -60,6 +60,7 @@ const char * lang_prefixes[NUM_LANGS] = {
"et",
"eu",
"fi",
+ "fo",
"fr",
"ga",
"gd",
@@ -160,6 +161,7 @@ const language_to_locale_struct language_to_locale_array[] = {
{"espanol", "es_ES.UTF-8"},
{"finnish", "fi_FI.UTF-8"},
{"suomi", "fi_FI.UTF-8"},
+{"faroese", "fo_FO.UTF-8"},
{"french", "fr_FR.UTF-8"},
{"francais", "fr_FR.UTF-8"},
{"gaelic", "ga_IE.UTF-8"},
@@ -359,6 +361,7 @@ void show_lang_usage(FILE * f, const char * const prg)
/* da */ " danish dansk\n"
/* nl */ " dutch nederlands\n"
/* et */ " estonian\n"
+/* fo */ " faroese\n"
/* fi */ " finnish suomi\n"
/* fr */ " french francais\n"
/* ga */ " gaelic irish-gaelic gaidhlig\n"
@@ -393,6 +396,7 @@ void show_lang_usage(FILE * f, const char * const prg)
/* sw */ " swahili\n"
/* sv */ " swedish svenska\n"
/* ta */ " tamil\n"
+/* bo */ " tibetan\n"
/* th */ " thai\n"
/* tr */ " turkish\n"
/* uk */ " ukrainian\n"
@@ -430,6 +434,7 @@ void show_locale_usage(FILE * f, const char * const prg)
" da_DK (Danish Dansk)\n"
" nl_NL (Dutch)\n"
" fi_FI (Finnish Suomi)\n"
+ " fo_FO (Faroese)\n"
" fr_FR (French Francais)\n"
" ga_IE (Irish Gaelic Gaidhlig)\n"
" gd_GB (Scottish Gaelic Ghaidhlig)\n"
@@ -465,6 +470,7 @@ void show_locale_usage(FILE * f, const char * const prg)
" es_MX (Mexican Mexican Spanish Espanol Mejicano)\n"
" sw_TZ (Swahili)\n"
" sv_SE (Swedish Svenska)\n"
+ " bo_CN (Tibetan)\n"
" th_TH (Thai)\n"
" tr_TR (Turkish)\n"
" uk_UA (Ukrainian)\n"
diff --git a/src/i18n.h b/src/i18n.h
index 9e0230234..b8d019726 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -8,7 +8,7 @@
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
- June 14, 2002 - March 29, 2006
+ June 14, 2002 - April 2, 2006
$Id$
*/
@@ -37,6 +37,7 @@ enum {
LANG_ET, /* Estonian */
LANG_EU, /* Basque */
LANG_FI, /* Finnish */
+ LANG_FO, /* Faroese */
LANG_FR, /* French */
LANG_GA, /* Irish Gaelic */
LANG_GD, /* Scottish Gaelic */
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 327bfc9d0..8b7ee3d02 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2006.03.28
-.TH TUXPAINT 1 "28 Mar 2006" "0.9.16" "Tux Paint"
+.\" tuxpaint.1 - 2006.04.02
+.TH TUXPAINT 1 "2 Apr 2006" "0.9.16" "Tux Paint"
.SH NAME
tuxpaint -- A drawing program for young children.
@@ -327,6 +327,9 @@ dutch
estonian
.TP 2
-
+faroese
+.TP 2
+-
finnish | suomi
.TP 2
-
@@ -583,6 +586,7 @@ Roland Illig,
Juan Irigoien,
Dmitriy Ivanov,
Mogens Jaeger,
+Lis Gøthe í Jákupsstovu,
Nedjeljko Jedvaj,
Aleksandar Jelenak,
Rasmus Erik Voel Jensen,
diff --git a/src/po/vi.po b/src/po/vi.po
index 5221cad39..3d3837b81 100644
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -6,17 +6,26 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxpaint 0.9.15rc1\n"
+"Project-Id-Version: tuxpaint-0.9.15rc1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 09:37+0100\n"
-"PO-Revision-Date: 2005-12-05 15:35+1030\n"
+"POT-Creation-Date: 2005-10-10 00:12-0700\n"
+"PO-Revision-Date: 2006-04-05 15:17+0930\n"
"Last-Translator: Clytie Siddall \n"
-"Language-Team: Vietnamese \n"
+"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: BBEdit 8.2.3\n"
+"X-Generator: LocFactoryEditor 1.6b36\n"
+
+msgid "A drawing program for children."
+msgstr "Một chương trình vẽ cho đứa bé."
+
+msgid "Drawing program"
+msgstr "Trình vẽ"
+
+msgid "Tux Paint"
+msgstr "Tux Sơn"
msgid "Black!"
msgstr "Äen!"
@@ -69,45 +78,6 @@ msgstr "VỠdà !"
msgid "Beige!"
msgstr "Be!"
-msgid "qx"
-msgstr ""
-
-msgid "QX"
-msgstr ""
-
-msgid "qy"
-msgstr ""
-
-msgid "QY"
-msgstr ""
-
-#. 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.
-msgid "oO"
-msgstr "oO"
-
-#. distinct uppercase and lowercase
-msgid "`\\%_@$~#{}<>^&*"
-msgstr "`\\%_@$₫~#{}<>«»^&*"
-
-#. uncommon punctuation
-msgid ",.?!"
-msgstr ",.?!"
-
-#. common punctuation
-msgid "017"
-msgstr "017"
-
-#. digits
-msgid "O0"
-msgstr "O0"
-
-#. distinct circle-like characters
-msgid "1Il|"
-msgstr "1Il|"
-
msgid "Great!"
msgstr "Tuyệt vá»i!"
@@ -201,8 +171,7 @@ msgstr "Nhắp và di chuột để là m mà u mỠdần."
msgid "Click and move to darken the colors."
msgstr "Nhắp và di chuột để là m mà u tối hơn."
-msgid ""
-"Click and move the mouse around to turn the picture into a chalk drawing."
+msgid "Click and move the mouse around to turn the picture into a chalk drawing."
msgstr "Nhắp và di chuột để đổi hình nà y thà nh bản vẽ phấn."
msgid "Click and move the mouse around to make the picture blocky."
@@ -253,8 +222,7 @@ msgstr "Hình vuông là hình chữ nháºt có bốn cạnh bằng nhau."
msgid "A rectangle has four sides and four right angles."
msgstr "Hình chữ nháºt có bốn cạnh và bốn góc vuông."
-msgid ""
-"A circle is a curve where all points have the same distance from the centre."
+msgid "A circle is a curve where all points have the same distance from the centre."
msgstr "Hình tròn là đưá»ng cong có má»i Ä‘iểm cách tâm vòng bằng nhau."
msgid "An ellipse is a stretched circle."
@@ -267,8 +235,7 @@ msgid "A pentagon has five sides."
msgstr "Hình năm canh có ... năm cạnh. :)"
msgid "A rhombus has four equal sides, and opposite sides are parallel."
-msgstr ""
-"Hình thoi có bốn cạnh bằng nhau, mỗi cặp cạnh đối diện với nhau là song song."
+msgstr "Hình thoi có bốn cạnh bằng nhau, mỗi cặp cạnh đối diện với nhau là song song."
msgid "Tools"
msgstr "Công cụ"
@@ -340,13 +307,8 @@ msgstr "Chá»n má»™t ảnh để dấu vòng quanh hình vẽ cá»§a cháu."
msgid "Click to start drawing a line. Let go to complete it."
msgstr "Nhắp chuá»™t để bắt đầu vẽ má»™t đưá»ng. Nhả nút chuá»™t để vẽ xong."
-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."
-msgstr ""
-"Chá»n má»™t hình. Nhắp chuá»™t để định tâm, kéo, rồi nhả nút chuá»™t đến khi có "
-"kÃch cỡ cháu muốn. Di chuyển chuá»™t để quay hình, nhắp chuá»™t lần nữa để vẽ "
-"xong."
+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."
+msgstr "Chá»n má»™t hình. Nhắp chuá»™t để định tâm, kéo, rồi nhả nút chuá»™t đến khi có kÃch cỡ cháu muốn. Di chuyển chuá»™t để quay hình, nhắp chuá»™t lần nữa để vẽ xong."
msgid "Choose a style of text. Click on your drawing and you can start typing."
msgstr "Chá»n kiểu văn bản. Nhắp và o bản vẽ và bắt đầu gõ chữ."
@@ -402,21 +364,16 @@ msgstr "ÄÆ°á»£c thôi... Hãy tiếp tục bản vẽ nà y!"
msgid "Do you really want to quit?"
msgstr "Cháu có thực sư muốn thoát không?"
-msgid "Yes, I'm done!"
-msgstr ""
+#. FIXME: Move elsewhere! Or not?!
+msgid "Yes"
+msgstr "Có"
-msgid "No, take me back!"
-msgstr ""
+msgid "No"
+msgstr "Không"
msgid "If you quit, you’ll lose your picture! Save it?"
msgstr "Nếu thoát thì ảnh của cháu bị mất! Có lưu không?"
-msgid "Yes, save it!"
-msgstr ""
-
-msgid "No, don't bother saving!"
-msgstr ""
-
msgid "Save your picture first?"
msgstr "Có lưu ảnh của cháu trước?"
@@ -426,17 +383,14 @@ msgstr "Không mở được ảnh ấy!"
msgid "OK"
msgstr "ÄÆ°á»£c"
-#. This will be replaced with a dialog allowing color choice and Starter
-#. picking, with a "Back" option to dismiss the "New" and return to
-#. the current picture. But for now... (bjk 2006.02.19)
-#, fuzzy
-msgid "Start a new picture?"
-msgstr "Có xóa ảnh nà y không?"
+msgid "Starting a new picture will erase the current one!"
+msgstr "Nếu bắt đầu bản vẽ má»›i thì bản vẽ hiện thá»i sẽ bị xóa!"
-#. #define PROMPT_NEW_YES gettext_noop("That’s OK!")
-#. #define PROMPT_NEW_NO gettext_noop("Never mind!")
-msgid "Yes, let's start fresh!"
-msgstr ""
+msgid "That’s OK!"
+msgstr "Dồng ý!"
+
+msgid "Never mind!"
+msgstr "Tôi đổi ý kiến!"
msgid "There are no saved files!"
msgstr "Không có táºp tin nà o được lưu!"
@@ -444,9 +398,6 @@ msgstr "Không có táºp tin nà o được lưu!"
msgid "Print your picture now?"
msgstr "Có in ảnh của cháu bây gi�"
-msgid "Yes, print it!"
-msgstr ""
-
msgid "Your picture has been printed!"
msgstr "Ảnh của cháu đã được in rồi!"
@@ -456,17 +407,32 @@ msgstr "Cháu chưa có thể in!"
msgid "Erase this picture?"
msgstr "Có xóa ảnh nà y không?"
-msgid "Yes, erase it!"
-msgstr ""
-
-msgid "No, don't erase it!"
-msgstr ""
-
msgid "Remember to use the left mouse button!"
msgstr "Hãy nhớ để dùng cái nút bên trái trên con chuột."
-msgid "Please wait..."
-msgstr ""
+msgid "jq"
+msgstr "jq"
+
+msgid "JQ"
+msgstr "JQ"
+
+msgid "oO"
+msgstr "oO"
+
+msgid "`\\%_@$~#{}<>^&*"
+msgstr "`\\%_@$₫~#{}<>«»^&*"
+
+msgid ",.?!"
+msgstr ",.?!"
+
+msgid "017"
+msgstr "017"
+
+msgid "O0"
+msgstr "O0"
+
+msgid "1Il|"
+msgstr "1Il|"
msgid "Erase"
msgstr "Xóa"
@@ -477,51 +443,12 @@ msgstr "Quay lui"
msgid "Aa"
msgstr "Aa"
-#. FIXME: Move elsewhere! Or not?!
-msgid "Yes"
-msgstr "Có"
-
-msgid "No"
-msgstr "Không"
-
#. FIXME: Move elsewhere!!!
-#. #define PROMPT_SAVE_OVER_TXT gettext_noop("Save over the older version of this picture?")
-msgid "Replace the picture with your changes?"
-msgstr ""
+msgid "Save over the older version of this picture?"
+msgstr "Ghi đè lên bản vẽ cũ không?"
-msgid "Yes, replace the old one!"
-msgstr ""
-
-#, fuzzy
-msgid "No, save a new file!"
+msgid "No, save a new file"
msgstr "Không, lưu và o má»™t táºp tin má»›i"
msgid "Choose the picture you want, then click “Openâ€."
msgstr "Chá»n ảnh mà cháu muốn, rồi nhắp và o nút Mở."
-
-msgid "A drawing program for children."
-msgstr "Một chương trình vẽ cho đứa bé."
-
-msgid "Drawing program"
-msgstr "Trình vẽ"
-
-msgid "Tux Paint"
-msgstr "Tux Sơn"
-
-#~ msgid "Starting a new picture will erase the current one!"
-#~ msgstr "Nếu bắt đầu bản vẽ má»›i thì bản vẽ hiện thá»i sẽ bị xóa!"
-
-#~ msgid "That’s OK!"
-#~ msgstr "Dồng ý!"
-
-#~ msgid "Never mind!"
-#~ msgstr "Tôi đổi ý kiến!"
-
-#~ msgid "jq"
-#~ msgstr "jq"
-
-#~ msgid "JQ"
-#~ msgstr "JQ"
-
-#~ msgid "Save over the older version of this picture?"
-#~ msgstr "Ghi đỠlên bản vẽ cũ không?"
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index fc431a35e..8a5813a99 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 - March 8, 2006
+ June 14, 2002 - April 2, 2006
$Id$
*/