diff --git a/Makefile b/Makefile
index 21396b273..42f186d37 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/
-# June 14, 2002 - July 20, 2003
+# June 14, 2002 - August 2, 2003
# Where to install things:
@@ -229,6 +229,7 @@ uninstall:
-rm $(LOCALE_PREFIX)pt/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)pt_BR/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)ro/LC_MESSAGES/tuxpaint.mo
+ -rm $(LOCALE_PREFIX)ru/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)sk/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)sv/LC_MESSAGES/tuxpaint.mo
-rm $(LOCALE_PREFIX)tr/LC_MESSAGES/tuxpaint.mo
@@ -450,6 +451,11 @@ install-gettext:
@cp trans/ro.mo $(LOCALE_PREFIX)ro/LC_MESSAGES/tuxpaint.mo
@chmod 644 $(LOCALE_PREFIX)ro/LC_MESSAGES/tuxpaint.mo
@#
+ @echo " ru_RU ...Russian..."
+ @install -d $(LOCALE_PREFIX)ru/LC_MESSAGES
+ @cp trans/ru.mo $(LOCALE_PREFIX)ru/LC_MESSAGES/tuxpaint.mo
+ @chmod 644 $(LOCALE_PREFIX)ru/LC_MESSAGES/tuxpaint.mo
+ @#
@echo " sk_SK ...Slovak..."
@install -d $(LOCALE_PREFIX)sk/LC_MESSAGES
@cp trans/sk.mo $(LOCALE_PREFIX)sk/LC_MESSAGES/tuxpaint.mo
@@ -577,6 +583,7 @@ translations: trans \
trans/pt.mo \
trans/pl.mo \
trans/ro.mo \
+ trans/ru.mo \
trans/sk.mo \
trans/sv.mo \
trans/tr.mo \
@@ -680,6 +687,10 @@ trans/ro.mo: src/messages/ro.po
@echo " ro_RO ...Romanian..."
@msgfmt src/messages/ro.po -o trans/ro.mo
+trans/ru.mo: src/messages/ru.po
+ @echo " ru_RU ...Russian..."
+ @msgfmt src/messages/ru.po -o trans/ru.mo
+
trans/sk.mo: src/messages/sk.po
@echo " sk_SK ...Slovak..."
@msgfmt src/messages/sk.po -o trans/sk.mo
diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
index 0536e4124..9c78ef1ad 100644
--- a/docs/AUTHORS.txt
+++ b/docs/AUTHORS.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
-June 17, 2002 - July 19, 2003
+June 17, 2002 - August 2, 2003
* Design and Coding:
@@ -146,6 +146,9 @@ June 17, 2002 - July 19, 2003
* Romanian
Laurentiu Buzdugan
+
+ * Russian
+ Dmitriy Ivanov
* Spanish
Gabriel Gazzan
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 34ea1caff..c5395fe7b 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
-2003.Jul.26 (0.9.12) [cvs]
+2003.Aug.02 (0.9.12) [cvs]
* Fixed Mac OS X #include typo.
Darrell Walisser
@@ -59,9 +59,12 @@ http://www.newbreedsoftware.com/tuxpaint/
* iconv_close() was being called even if 'cd' was -1 (not set). Fixed.
Darrell Walisser
- * If gnome-config is not found, it doesn't necessarily mean Gnome isn't being used!
- Makefile will now fall-back and assume $GNOME_PREFIX should be /usr, so that the
- launcher icon gets installed into the Gnome menu.
+ * If gnome-config is not found, it doesn't necessarily mean Gnome isn't being
+ used! Makefile will now fall-back and assume $GNOME_PREFIX should be /usr,
+ so that the launcher icon gets installed into the Gnome menu.
+
+ * (About to be) translated to Russian
+ Dmitriy Ivanov
2003.Jun.17 (0.9.11)
diff --git a/docs/README.txt b/docs/README.txt
index 42633b428..06a448423 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -1,5 +1,5 @@
Tux Paint
- 0.9.11
+ 0.9.12
A simple drawing program for children
@@ -9,7 +9,7 @@
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
- June 14, 2002 - June 17, 2003
+ June 14, 2002 - August 2, 2003
----------------------------------------------------------------------
@@ -370,6 +370,8 @@ Options
|--------------------+------------------+---------|
|romanian | | |
|--------------------+------------------+---------|
+ |russian | | |
+ |--------------------+------------------+---------|
|spanish |espanol | |
|--------------------+------------------+---------|
|slovak | | |
@@ -377,6 +379,8 @@ Options
|swedish |svenska | |
|--------------------+------------------+---------|
|turkish | | |
+ |--------------------+------------------+---------|
+ |walloon | | |
+-------------------------------------------------+
----------------------------------------------------------------------
@@ -552,12 +556,16 @@ Options
|---------------+-------------------+--------------------|
|ro_RO | |Romanian |
|---------------+-------------------+--------------------|
+ |ru_RU | |Russian |
+ |---------------+-------------------+--------------------|
|sk_SK |Slovak | |
|---------------+-------------------+--------------------|
|sv_SE@euro |Svenska |Swedish |
|---------------+-------------------+--------------------|
|tr_TR@euro | |Turkish |
|---------------+-------------------+--------------------|
+ |wa_BE@euro | |Walloon |
+ |---------------+-------------------+--------------------|
|zh_CN | |Chinese (Simplified)|
+--------------------------------------------------------+
diff --git a/docs/html/README.html b/docs/html/README.html
index 6279efc0f..e3b30b4b3 100644
--- a/docs/html/README.html
+++ b/docs/html/README.html
@@ -10,7 +10,7 @@ alink="#FF00FF">

-0.9.11
+0.9.12
A simple drawing program for children
@@ -21,7 +21,7 @@ New Breed Software
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
-June 14, 2002 - June 17, 2003
+June 14, 2002 - August 2, 2003
@@ -543,6 +543,11 @@ New Breed Software
|
|
+
+ russian |
+ |
+ |
+
spanish |
espanol |
@@ -563,6 +568,11 @@ New Breed Software
|
|
+
+ walloon |
+ |
+ |
+
@@ -860,6 +870,11 @@ New Breed Software
|
Romanian |
+
+ ru_RU |
+ |
+ Russian |
+
sk_SK |
Slovak |
@@ -875,6 +890,11 @@ New Breed Software
|
Turkish |
+
+ wa_BE@euro |
+ |
+ Walloon |
+
zh_CN |
|
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 86902d8fd..65e4a2856 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2003.06.17
-.TH TUXPAINT 1 "17 Jun 2003" "0.9.11" "Tux Paint"
+.\" tuxpaint.1 - 2003.08.02
+.TH TUXPAINT 1 "02 Aug 2003" "0.9.12" "Tux Paint"
.SH NAME
tuxpaint -- A drawing program for young children.
@@ -292,6 +292,9 @@ portuguese | portugues
romanian
.TP 2
-
+russian
+.TP 2
+-
spanish | espanol
.TP 2
-
@@ -299,6 +302,9 @@ swedish | svenska
.TP 2
-
turkish
+.TP 2
+-
+walloon
.RE
.PD
diff --git a/src/messages/ru.po b/src/messages/ru.po
new file mode 100644
index 000000000..e41af02ba
--- /dev/null
+++ b/src/messages/ru.po
@@ -0,0 +1,479 @@
+# Tux Paint Russian messages
+# (PO based on the Polish version from August 2003)
+# Copyright (C) 2003
+# Translators: Dmitriy Ivanov
+msgid ""
+msgstr ""
+"Project-Id-Version: TuxPaint\n"
+"POT-Creation-Date: 2003-03-09 13:13+0100\n"
+"PO-Revision-Date: 2003-08-02 02:51+0700\n"
+"Last-Translator: Dmitriy Ivanov \n"
+"Language-Team: Dmitriy Ivanov \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../tuxpaint.c:674
+msgid "Do you really want to quit?"
+msgstr ""
+
+#: ../tuxpaint.c:675 ../tuxpaint.c:679 ../tuxpaint.c:683 ../tuxpaint.c:703
+#: ../tuxpaint.c:7099 ../tuxpaint.c:7778
+msgid "Yes"
+msgstr "XYZ"
+
+#: ../tuxpaint.c:676 ../tuxpaint.c:680 ../tuxpaint.c:684 ../tuxpaint.c:704
+#: ../tuxpaint.c:7102
+msgid "No"
+msgstr "xyz"
+
+#: ../tuxpaint.c:678
+msgid "If you quit, you'll lose your picture! Save it?"
+msgstr ""
+
+#: ../tuxpaint.c:682
+msgid "Save your picture first?"
+msgstr ""
+
+#: ../tuxpaint.c:686
+msgid "Can't open that picture!"
+msgstr ""
+
+#: ../tuxpaint.c:687 ../tuxpaint.c:694 ../tuxpaint.c:697 ../tuxpaint.c:700
+msgid "Okay"
+msgstr ""
+
+#: ../tuxpaint.c:689
+msgid "Starting a new picture will erase the current one!"
+msgstr ""
+
+#: ../tuxpaint.c:690
+msgid "That's Ok"
+msgstr ""
+
+#: ../tuxpaint.c:691
+msgid "Never Mind!"
+msgstr ""
+
+#: ../tuxpaint.c:693
+msgid "There are no saved files!"
+msgstr ""
+
+#: ../tuxpaint.c:696
+msgid "Your picture has been printed!"
+msgstr ""
+
+#: ../tuxpaint.c:699
+msgid "You can't print yet!"
+msgstr ""
+
+#: ../tuxpaint.c:702
+msgid "Erase this picture?"
+msgstr ""
+
+#: ../tuxpaint.c:4579 ../tools.h:52
+msgid "Open"
+msgstr ""
+
+#: ../tuxpaint.c:4584
+# As in "Erase the selected picture"
+msgid "Erase"
+msgstr ""
+
+#: ../tuxpaint.c:4589
+# As in "Go back to the previous screen"
+msgid "Back"
+msgstr ""
+
+#: ../tuxpaint.c:7777
+msgid "Save over the older version of this drawing?"
+msgstr ""
+
+#: ../tuxpaint.c:7779
+msgid "No, save a new file"
+msgstr ""
+
+#: ../tuxpaint.c:8485
+msgid "Choose the picture you want, then click 'Open'"
+msgstr ""
+
+#: ../colors.h:62
+msgid "Black"
+msgstr ""
+
+#: ../colors.h:63
+msgid "White"
+msgstr ""
+
+#: ../colors.h:64
+msgid "Red"
+msgstr ""
+
+#: ../colors.h:65
+msgid "Pink"
+msgstr ""
+
+#: ../colors.h:66
+msgid "Orange"
+msgstr ""
+
+#: ../colors.h:67
+msgid "Yellow"
+msgstr ""
+
+#: ../colors.h:68
+msgid "Lime"
+msgstr ""
+
+#: ../colors.h:69
+msgid "Green"
+msgstr ""
+
+#: ../colors.h:70
+msgid "Cyan"
+msgstr ""
+
+#: ../colors.h:71
+msgid "Blue"
+msgstr ""
+
+#: ../colors.h:72
+msgid "Purple"
+msgstr ""
+
+#: ../colors.h:73
+msgid "Fuchsia"
+msgstr ""
+
+#: ../colors.h:74
+msgid "Brown"
+msgstr ""
+
+#: ../colors.h:75
+msgid "Grey"
+msgstr ""
+
+#: ../colors.h:76
+msgid "Silver"
+msgstr ""
+
+#: ../great.h:20
+msgid "Great!"
+msgstr ""
+
+#: ../great.h:21
+msgid "Cool!"
+msgstr ""
+
+#: ../great.h:22
+msgid "Keep it up!"
+msgstr ""
+
+#: ../great.h:23
+msgid "Good job!"
+msgstr ""
+
+#: ../magic.h:48
+msgid "Rainbow"
+msgstr ""
+
+#: ../magic.h:49
+msgid "Sparkles"
+msgstr ""
+
+#: ../magic.h:51
+msgid "Mirror"
+msgstr ""
+
+#: ../magic.h:52
+msgid "Flip"
+msgstr ""
+
+#: ../magic.h:54
+msgid "Blur"
+msgstr ""
+
+#: ../magic.h:55
+msgid "Blocks"
+msgstr ""
+
+#: ../magic.h:57
+msgid "Negative"
+msgstr ""
+
+#: ../magic.h:58
+msgid "Fade"
+msgstr ""
+
+#: ../magic.h:60
+msgid "Chalk"
+msgstr ""
+
+#: ../magic.h:61
+msgid "Drip"
+msgstr ""
+
+#: ../magic.h:63
+msgid "Thick"
+msgstr ""
+
+#: ../magic.h:64
+msgid "Thin"
+msgstr ""
+
+#: ../magic.h:66
+msgid "Fill"
+msgstr ""
+
+#: ../magic.h:73
+msgid "You can draw in rainbow colors!"
+msgstr ""
+
+#: ../magic.h:74
+msgid "Click and move to draw sparkles"
+msgstr ""
+
+#: ../magic.h:76
+msgid "Click to make a mirror image!"
+msgstr ""
+
+#: ../magic.h:77
+msgid "Click to flip the picture upside-down!"
+msgstr ""
+
+#: ../magic.h:79
+msgid "Click and move the mouse around to blur the picture"
+msgstr ""
+
+#: ../magic.h:80
+msgid "Click and move the mouse around to make the picture blocky"
+msgstr ""
+
+#: ../magic.h:82
+msgid "Click and move the mouse around to draw a negative"
+msgstr ""
+
+#: ../magic.h:83
+msgid "Click and move to fade the colors."
+msgstr ""
+
+#: ../magic.h:85
+msgid "Click and move the mouse around to turn the picture into a chalk drawing."
+msgstr ""
+
+#: ../magic.h:86
+msgid "Click and move the mouse around to make the picture drip!"
+msgstr ""
+
+#: ../magic.h:88
+msgid "Click and move the mouse to thicken the picture"
+msgstr ""
+
+#: ../magic.h:89
+msgid "Click and move the mouse to thin the picture"
+msgstr ""
+
+#: ../magic.h:91
+msgid "Click in the picture to fill that area with color"
+msgstr ""
+
+#: ../shapes.h:141 ../shapes.h:142
+msgid "Square"
+msgstr ""
+
+#: ../shapes.h:143 ../shapes.h:144
+msgid "Rectangle"
+msgstr ""
+
+#: ../shapes.h:145 ../shapes.h:146
+msgid "Circle"
+msgstr ""
+
+#: ../shapes.h:147 ../shapes.h:148 ../shapes.h:167 ../shapes.h:168
+msgid "Oval"
+msgstr ""
+
+#: ../shapes.h:149 ../shapes.h:150
+msgid "Triangle"
+msgstr ""
+
+#: ../shapes.h:151 ../shapes.h:152
+msgid "Pentagon"
+msgstr ""
+
+#: ../shapes.h:153 ../shapes.h:154
+msgid "Diamond"
+msgstr ""
+
+#: ../shapes.h:161 ../shapes.h:162
+msgid "A square has four sides, each the same length."
+msgstr ""
+
+#: ../shapes.h:163 ../shapes.h:164
+msgid "A rectangle has four sides."
+msgstr ""
+
+#: ../shapes.h:165 ../shapes.h:166
+msgid "A circle is exactly round."
+msgstr ""
+
+#: ../shapes.h:169 ../shapes.h:170
+msgid "A triangle has three sides."
+msgstr ""
+
+#: ../shapes.h:171 ../shapes.h:172
+msgid "A pentagon has five sides."
+msgstr ""
+
+#: ../shapes.h:173 ../shapes.h:174
+msgid "A diamond is a square, turned around slightly."
+msgstr ""
+
+#: ../titles.h:37
+msgid "Tools"
+msgstr ""
+
+#: ../titles.h:38
+msgid "Colors"
+msgstr ""
+
+#: ../titles.h:39
+msgid "Brushes"
+msgstr ""
+
+#: ../titles.h:40
+msgid "Stamps"
+msgstr ""
+
+#: ../titles.h:41 ../tools.h:45
+msgid "Shapes"
+msgstr ""
+
+#: ../titles.h:42
+msgid "Letters"
+msgstr ""
+
+#: ../titles.h:43 ../tools.h:47
+msgid "Magic"
+msgstr ""
+
+#: ../tools.h:42
+msgid "Paint"
+msgstr ""
+
+#: ../tools.h:43
+msgid "Stamp"
+msgstr ""
+
+#: ../tools.h:44
+msgid "Lines"
+msgstr ""
+
+#: ../tools.h:46
+msgid "Text"
+msgstr ""
+
+#: ../tools.h:48
+msgid "Undo"
+msgstr ""
+
+#: ../tools.h:49
+msgid "Redo"
+msgstr ""
+
+#: ../tools.h:50
+msgid "Eraser"
+msgstr ""
+
+#: ../tools.h:51
+# As in "Make a new file"
+msgid "New"
+msgstr ""
+
+#: ../tools.h:53
+# As in "Save the current file"
+msgid "Save"
+msgstr ""
+
+#: ../tools.h:54
+msgid "Print"
+msgstr ""
+
+#: ../tools.h:55
+msgid "Quit"
+msgstr ""
+
+#: ../tools.h:62
+msgid "Pick a color and a brush shape to draw with."
+msgstr ""
+
+#: ../tools.h:63
+msgid "Pick a picture to stamp around your drawing."
+msgstr ""
+
+#: ../tools.h:64
+msgid "Click to start drawing a line. Let go to complete it."
+msgstr ""
+
+#: ../tools.h:65
+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 ""
+
+#: ../tools.h:66
+msgid "Choose a style of text. Click on your drawing and you can start typing."
+msgstr ""
+
+#: ../tools.h:67
+msgid "Pick a magical effect to use on your drawing!"
+msgstr ""
+
+#: ../tools.h:68
+msgid "Undo!"
+msgstr ""
+
+#: ../tools.h:69
+msgid "Redo!"
+msgstr ""
+
+#: ../tools.h:70
+msgid "Eraser!"
+msgstr ""
+
+#: ../tools.h:71
+msgid "You now have a blank sheet to draw on!"
+msgstr ""
+
+#: ../tools.h:72
+msgid "Open..."
+msgstr ""
+
+#: ../tools.h:73
+msgid "Your image has been saved!"
+msgstr ""
+
+#: ../tools.h:74
+msgid "Printing..."
+msgstr ""
+
+#: ../tools.h:75
+msgid "Bye bye!"
+msgstr ""
+
+#: ../tools.h:78
+msgid "Let go of the button to complete the line."
+msgstr ""
+
+#: ../tools.h:79
+msgid "Hold the button to stretch the shape."
+msgstr ""
+
+#: ../tools.h:80
+msgid "Move the mouse to rotate the shape. Click to draw it."
+msgstr ""
+
+#: ../tools.h:81
+msgid "Ok then... Let's keep drawing this one!"
+msgstr ""
+
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index faed9fec5..b1c7370b8 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7,12 +7,12 @@
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
- June 14, 2002 - July 27, 2003
+ June 14, 2002 - August 2, 2003
*/
#define VER_VERSION "0.9.12"
-#define VER_DATE "2003.07.27"
+#define VER_DATE "2003.08.02"
/* #define DEBUG */
@@ -285,6 +285,7 @@ enum {
LANG_PT_BR, /* Portuguese (Brazilian) */
LANG_PT, /* Portuguese */
LANG_RO, /* Romanian */
+ LANG_RU, /* Russian */
LANG_SE, /* Swedish */
LANG_SK, /* Slovak */
LANG_TR, /* Turkish */
@@ -318,6 +319,7 @@ const char * lang_prefixes[NUM_LANGS] = {
"pt_br",
"pt",
"ro",
+ "ru",
"se",
"sk",
"tr",
@@ -339,6 +341,7 @@ int lang_use_utf8[] = {
LANG_KO,
/* LANG_LT, */
/* LANG_PL, */
+ /* LANG_RU, */
LANG_ZH,
-1
};
@@ -3959,6 +3962,11 @@ void setup(int argc, char * argv[])
putenv("LANG=ro_RO");
putenv("LC_ALL=ro_RO");
}
+ else if (strcmp(langstr, "russian") == 0)
+ {
+ putenv("LANG=ru_RU");
+ putenv("LC_ALL=ru_RU");
+ }
else if (strcmp(langstr, "slovak") == 0)
{
putenv("LANG=sk_SK");