From 978f327f7fb599493d40928287fc94764651c10f Mon Sep 17 00:00:00 2001
From: Valek Frob <frob@src.gnome.org>
Date: Tue, 23 May 2000 17:18:04 +0000
Subject: [PATCH] Updated russian translation and update.sh.

---
 po/ChangeLog |   5 ++
 po/ru.po     | 182 ++++++++++++++++++++++++++-------------------------
 po/update.sh |  96 +++++++++++++++++++++++++--
 3 files changed, 191 insertions(+), 92 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 73580248f3..08be988014 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-23  Valek Filippov  <frob@df.ru>
+
+	* ru.po: updated russian translation.
+	* update.sh: 1.2.5 version.
+
 2000-05-18 Pauli Virtanen <pauli.virtanen@saunalahti.fi>
 
 	* fi.po: minor finnish update.
diff --git a/po/ru.po b/po/ru.po
index c340396b03..ae382483af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,83 +4,89 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.3.0\n"
-"POT-Creation-Date: 1999-08-30 19:01+0200\n"
-"PO-Revision-Date: 2000-04-18 19:56+04:00\n"
+"POT-Creation-Date: 2000-05-23 21:21+0000\n"
+"PO-Revision-Date: 2000-05-23 21:24+00:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gtk/gtkcolorsel.c:213
+#: gtk/gtkcolorsel.c:1424
 msgid "Hue:"
 msgstr "Тон:"
 
-#: gtk/gtkcolorsel.c:214
+#: gtk/gtkcolorsel.c:1425
 msgid "Saturation:"
 msgstr "Насыщенность:"
 
-#: gtk/gtkcolorsel.c:215
+#: gtk/gtkcolorsel.c:1426
 msgid "Value:"
 msgstr "Значение:"
 
-#: gtk/gtkcolorsel.c:216
+#: gtk/gtkcolorsel.c:1427
 msgid "Red:"
 msgstr "Красный:"
 
-#: gtk/gtkcolorsel.c:217
+#: gtk/gtkcolorsel.c:1428
 msgid "Green:"
 msgstr "Зеленый:"
 
-#: gtk/gtkcolorsel.c:218
+#: gtk/gtkcolorsel.c:1429
 msgid "Blue:"
 msgstr "Синий:"
 
-#: gtk/gtkcolorsel.c:219
+#: gtk/gtkcolorsel.c:1432
 msgid "Opacity:"
 msgstr "Плотность:"
 
-#. The OK button
-#: gtk/gtkcolorsel.c:1668 gtk/gtkfilesel.c:571 gtk/gtkfontsel.c:3722
-#: gtk/gtkgamma.c:416
-msgid "OK"
-msgstr "OK"
+#: gtk/gtkcolorsel.c:1447
+msgid "Hex Value:"
+msgstr "Шестнадц.значение:"
 
-#. The Cancel button
-#: gtk/gtkcolorsel.c:1674 gtk/gtkfilesel.c:578 gtk/gtkfilesel.c:956
-#: gtk/gtkfilesel.c:1060 gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3735
-#: gtk/gtkgamma.c:424
-msgid "Cancel"
-msgstr "Отменить"
+#: gtk/gtkcolorsel.c:1468
+msgid "Custom Palette"
+msgstr "Другая палитра"
 
-#: gtk/gtkcolorsel.c:1679
-msgid "Help"
-msgstr "Справка"
+#: gtk/gtkcolorsel.c:1473
+msgid "Set Color"
+msgstr "Установить цвет"
 
 #. The directories clist
-#: gtk/gtkfilesel.c:520
+#: gtk/gtkfilesel.c:514
 msgid "Directories"
 msgstr "Каталоги"
 
 #. The files clist
-#: gtk/gtkfilesel.c:539
+#: gtk/gtkfilesel.c:533
 msgid "Files"
 msgstr "Файлы"
 
-#: gtk/gtkfilesel.c:609 gtk/gtkfilesel.c:1639
+#. The OK button
+#: gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3788 gtk/gtkgamma.c:415
+msgid "OK"
+msgstr "OK"
+
+#. The Cancel button
+#: gtk/gtkfilesel.c:572 gtk/gtkfilesel.c:958 gtk/gtkfilesel.c:1062
+#: gtk/gtkfilesel.c:1177 gtk/gtkfontsel.c:3801 gtk/gtkgamma.c:423
+msgid "Cancel"
+msgstr "Отменить"
+
+#: gtk/gtkfilesel.c:603 gtk/gtkfilesel.c:1644
 #, c-format
 msgid "Directory unreadable: %s"
 msgstr "Каталог не читаем: %s"
 
-#: gtk/gtkfilesel.c:641
+#: gtk/gtkfilesel.c:635
 msgid "Create Dir"
 msgstr "Создать каталог"
 
-#: gtk/gtkfilesel.c:652 gtk/gtkfilesel.c:1029
+#: gtk/gtkfilesel.c:646 gtk/gtkfilesel.c:1031
 msgid "Delete File"
 msgstr "Удалить файл"
 
-#: gtk/gtkfilesel.c:663 gtk/gtkfilesel.c:1133
+#: gtk/gtkfilesel.c:657 gtk/gtkfilesel.c:1135
 msgid "Rename File"
 msgstr "Переименовать файл"
 
@@ -89,39 +95,39 @@ msgstr "
 #. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
 #. (gpointer) fs);
 #.
-#: gtk/gtkfilesel.c:827
+#: gtk/gtkfilesel.c:823
 msgid "Error"
 msgstr "Ошибка"
 
 #. close button
-#: gtk/gtkfilesel.c:845 gtk/gtkinputdialog.c:354
+#: gtk/gtkfilesel.c:846 gtk/gtkinputdialog.c:352
 msgid "Close"
 msgstr "Закрыть"
 
-#: gtk/gtkfilesel.c:920
+#: gtk/gtkfilesel.c:922
 msgid "Create Directory"
 msgstr "Создать каталог"
 
-#: gtk/gtkfilesel.c:934
+#: gtk/gtkfilesel.c:936
 msgid "Directory name:"
 msgstr "Имя каталога:"
 
 #. buttons
-#: gtk/gtkfilesel.c:947
+#: gtk/gtkfilesel.c:949
 msgid "Create"
 msgstr "Создать"
 
 #. buttons
-#: gtk/gtkfilesel.c:1051
+#: gtk/gtkfilesel.c:1053
 msgid "Delete"
 msgstr "Удалить"
 
 #. buttons
-#: gtk/gtkfilesel.c:1166
+#: gtk/gtkfilesel.c:1168
 msgid "Rename"
 msgstr "Переименовать"
 
-#: gtk/gtkfilesel.c:1618
+#: gtk/gtkfilesel.c:1623
 msgid "Selection: "
 msgstr "Выбор: "
 
@@ -195,7 +201,7 @@ msgstr "
 msgid "Font"
 msgstr "Шрифт"
 
-#: gtk/gtkfontsel.c:517 gtk/gtkfontsel.c:2202 gtk/gtkfontsel.c:2432
+#: gtk/gtkfontsel.c:517 gtk/gtkfontsel.c:2231 gtk/gtkfontsel.c:2461
 msgid "Font:"
 msgstr "Шрифт:"
 
@@ -274,27 +280,27 @@ msgstr "*"
 msgid "(nil)"
 msgstr "(nil)"
 
-#: gtk/gtkfontsel.c:1228 gtk/gtkfontsel.c:2700
+#: gtk/gtkfontsel.c:1228 gtk/gtkfontsel.c:2730
 msgid "regular"
 msgstr "прямой"
 
-#: gtk/gtkfontsel.c:1233 gtk/gtkfontsel.c:1994
+#: gtk/gtkfontsel.c:1233 gtk/gtkfontsel.c:2023
 msgid "italic"
 msgstr "курсив"
 
-#: gtk/gtkfontsel.c:1234 gtk/gtkfontsel.c:1995
+#: gtk/gtkfontsel.c:1234 gtk/gtkfontsel.c:2024
 msgid "oblique"
 msgstr "наклонный"
 
-#: gtk/gtkfontsel.c:1235 gtk/gtkfontsel.c:1996
+#: gtk/gtkfontsel.c:1235 gtk/gtkfontsel.c:2025
 msgid "reverse italic"
 msgstr "обратный курсив"
 
-#: gtk/gtkfontsel.c:1236 gtk/gtkfontsel.c:1997
+#: gtk/gtkfontsel.c:1236 gtk/gtkfontsel.c:2026
 msgid "reverse oblique"
 msgstr "обратный наклонный"
 
-#: gtk/gtkfontsel.c:1237 gtk/gtkfontsel.c:1998
+#: gtk/gtkfontsel.c:1237 gtk/gtkfontsel.c:2027
 msgid "other"
 msgstr "другие"
 
@@ -306,187 +312,187 @@ msgstr "[M]"
 msgid "[C]"
 msgstr "[C]"
 
-#: gtk/gtkfontsel.c:1793
+#: gtk/gtkfontsel.c:1811
 msgid "The selected font is not available."
 msgstr "Выбран не доступный шрифт."
 
-#: gtk/gtkfontsel.c:1799
+#: gtk/gtkfontsel.c:1817
 msgid "The selected font is not a valid font."
 msgstr "Выбран не правильный шрифт."
 
-#: gtk/gtkfontsel.c:1860
+#: gtk/gtkfontsel.c:1878
 msgid "This is a 2-byte font and may not be displayed correctly."
 msgstr "Это 2-х байтный шрифт, возможны проблемы с начертанием."
 
-#: gtk/gtkfontsel.c:1982 gtk/gtkinputdialog.c:607
+#: gtk/gtkfontsel.c:2011 gtk/gtkinputdialog.c:595
 msgid "(unknown)"
 msgstr "(неизвестен)"
 
-#: gtk/gtkfontsel.c:1993
+#: gtk/gtkfontsel.c:2022
 msgid "roman"
 msgstr "прямой"
 
-#: gtk/gtkfontsel.c:2005
+#: gtk/gtkfontsel.c:2034
 msgid "proportional"
 msgstr "пропорциональный"
 
-#: gtk/gtkfontsel.c:2006
+#: gtk/gtkfontsel.c:2035
 msgid "monospaced"
 msgstr "моноширинный"
 
-#: gtk/gtkfontsel.c:2007
+#: gtk/gtkfontsel.c:2036
 msgid "char cell"
 msgstr "char cell"
 
-#: gtk/gtkfontsel.c:2207
+#: gtk/gtkfontsel.c:2236
 msgid "Font: (Filter Applied)"
 msgstr "Шрифт: (Отфильтрован)"
 
-#: gtk/gtkfontsel.c:2680
+#: gtk/gtkfontsel.c:2710
 msgid "heavy"
 msgstr "тяжелый"
 
-#: gtk/gtkfontsel.c:2682
+#: gtk/gtkfontsel.c:2712
 msgid "extrabold"
 msgstr "очень жирный"
 
-#: gtk/gtkfontsel.c:2684
+#: gtk/gtkfontsel.c:2714
 msgid "bold"
 msgstr "жирный"
 
-#: gtk/gtkfontsel.c:2687
+#: gtk/gtkfontsel.c:2717
 msgid "demibold"
 msgstr "полужирный"
 
-#: gtk/gtkfontsel.c:2690
+#: gtk/gtkfontsel.c:2720
 msgid "medium"
 msgstr "средний"
 
-#: gtk/gtkfontsel.c:2692
+#: gtk/gtkfontsel.c:2722
 msgid "normal"
 msgstr "нормальный"
 
-#: gtk/gtkfontsel.c:2694
+#: gtk/gtkfontsel.c:2724
 msgid "light"
 msgstr "светлый"
 
-#: gtk/gtkfontsel.c:2696
+#: gtk/gtkfontsel.c:2726
 msgid "extralight"
 msgstr "очень светлый"
 
-#: gtk/gtkfontsel.c:2698
+#: gtk/gtkfontsel.c:2728
 msgid "thin"
 msgstr "тонкий"
 
-#: gtk/gtkfontsel.c:2875
+#: gtk/gtkfontsel.c:2905
 msgid "MAX_FONTS exceeded. Some fonts may be missing."
 msgstr "MAX_FONTS превзойден. Некоторые шрифты могут отсутствовать."
 
-#: gtk/gtkfontsel.c:3729
+#: gtk/gtkfontsel.c:3795
 msgid "Apply"
 msgstr "Применить"
 
-#: gtk/gtkfontsel.c:3751
+#: gtk/gtkfontsel.c:3817
 msgid "Font Selection"
 msgstr "Выбор шрифта"
 
-#: gtk/gtkgamma.c:396
+#: gtk/gtkgamma.c:395
 msgid "Gamma"
 msgstr "Гамма"
 
-#: gtk/gtkgamma.c:403
+#: gtk/gtkgamma.c:402
 msgid "Gamma value"
 msgstr "Гамма величина"
 
 #. shell and main vbox
-#: gtk/gtkinputdialog.c:200
+#: gtk/gtkinputdialog.c:198
 msgid "Input"
 msgstr "Ввод"
 
-#: gtk/gtkinputdialog.c:208
+#: gtk/gtkinputdialog.c:206
 msgid "No input devices"
 msgstr "Нет устройства ввода"
 
-#: gtk/gtkinputdialog.c:237
+#: gtk/gtkinputdialog.c:235
 msgid "Device:"
 msgstr "Устройство:"
 
-#: gtk/gtkinputdialog.c:253
+#: gtk/gtkinputdialog.c:251
 msgid "Disabled"
 msgstr "Выключен"
 
-#: gtk/gtkinputdialog.c:261
+#: gtk/gtkinputdialog.c:259
 msgid "Screen"
 msgstr "Экран"
 
-#: gtk/gtkinputdialog.c:269
+#: gtk/gtkinputdialog.c:267
 msgid "Window"
 msgstr "Окно"
 
-#: gtk/gtkinputdialog.c:277
+#: gtk/gtkinputdialog.c:275
 msgid "Mode: "
 msgstr "Режим: "
 
 #. The axis listbox
-#: gtk/gtkinputdialog.c:307
+#: gtk/gtkinputdialog.c:305
 msgid "Axes"
 msgstr "Оси"
 
 #. Keys listbox
-#: gtk/gtkinputdialog.c:323
+#: gtk/gtkinputdialog.c:321
 msgid "Keys"
 msgstr "Клавиши"
 
 #. We create the save button in any case, so that clients can
 #. connect to it, without paying attention to whether it exits
-#: gtk/gtkinputdialog.c:345
+#: gtk/gtkinputdialog.c:343
 msgid "Save"
 msgstr "Сохранить"
 
-#: gtk/gtkinputdialog.c:500
+#: gtk/gtkinputdialog.c:488
 msgid "X"
 msgstr "X"
 
-#: gtk/gtkinputdialog.c:501
+#: gtk/gtkinputdialog.c:489
 msgid "Y"
 msgstr "Y"
 
-#: gtk/gtkinputdialog.c:502
+#: gtk/gtkinputdialog.c:490
 msgid "Pressure"
 msgstr "Нажим"
 
-#: gtk/gtkinputdialog.c:503
+#: gtk/gtkinputdialog.c:491
 msgid "X Tilt"
 msgstr "Наклон X"
 
-#: gtk/gtkinputdialog.c:504
+#: gtk/gtkinputdialog.c:492
 msgid "Y Tilt"
 msgstr "Наклон Y"
 
-#: gtk/gtkinputdialog.c:544
+#: gtk/gtkinputdialog.c:532
 msgid "none"
 msgstr "нет"
 
-#: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614
+#: gtk/gtkinputdialog.c:566 gtk/gtkinputdialog.c:602
 msgid "(disabled)"
 msgstr "(отменен)"
 
 #. and clear button
-#: gtk/gtkinputdialog.c:692
+#: gtk/gtkinputdialog.c:680
 msgid "clear"
 msgstr "очистить"
 
-#: gtk/gtknotebook.c:2017 gtk/gtknotebook.c:4092
+#: gtk/gtknotebook.c:2059 gtk/gtknotebook.c:4131
 #, c-format
 msgid "Page %u"
 msgstr "Страница %u"
 
-#: gtk/gtkrc.c:1611
+#: gtk/gtkrc.c:1801
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
 msgstr "Файл с изображением не найден в pixmap_path: \"%s\", строка %d"
 
-#: gtk/gtkrc.c:1614
+#: gtk/gtkrc.c:1804
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Файл с изображением не найден в pixmap_path: \"%s\""
diff --git a/po/update.sh b/po/update.sh
index 265a42b0a0..c5c196a18d 100755
--- a/po/update.sh
+++ b/po/update.sh
@@ -1,8 +1,96 @@
 #!/bin/sh
 
-xgettext --default-domain=gtk+ --directory=.. \
+VERSION="1.2.5"
+PACKAGE="gtk+"
+
+if [ "x$1" = "x--help" ]; then
+
+echo Usage: ./update.sh langcode
+echo --help                  display this help and exit
+echo --missing	             search for missing files in POTFILES.in
+echo --version		     shows the version
+echo
+echo Examples of use:
+echo ./update.sh ----- just creates a new pot file from the source
+echo ./update.sh da -- created new pot file and updated the da.po file 
+
+elif [ "x$1" = "x--version" ]; then
+
+echo "update.sh release $VERSION"
+
+elif [ "x$1" = "x--missing" ]; then
+
+echo "Searching for files containing _( ) but missing in POTFILES.in..."
+echo
+find ../ -print | egrep '.*\.(c|y|cc|c++|h|gob)' | xargs grep _\( | cut -d: -f1 | uniq | cut -d/ -f2- > POTFILES.in.missing
+wait
+
+echo "Sorting data..." 
+sort -d POTFILES.in -o POTFILES.in &&
+sort -d POTFILES.in.missing -o POTFILES.in.missing 
+wait
+echo "Comparing data..."
+diff POTFILES.in POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing
+wait
+
+if [ -s POTFILES.ignore ]; then
+
+sort -d POTFILES.ignore -o POTFILES.tmp
+echo "Evaluating ignored files..."
+wait 
+diff POTFILES.tmp POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing 
+rm POTFILES.tmp
+
+fi
+
+if [ -s POTFILES.in.missing ]; then
+
+echo && echo "Here are the results:"
+echo && cat POTFILES.in.missing
+echo && echo "File POTFILES.in.missing is being placed in directory..."
+echo "Please add the files that should be ignored in POTFILES.ignore"
+
+else
+
+echo &&echo "There are no missing files, thanks God!" 
+rm POTFILES.in.missing
+
+fi 
+
+elif [ "x$1" = "x" ]; then 
+
+echo "Building the $PACKAGE.pot ..."
+
+xgettext --default-domain=$PACKAGE --directory=.. \
   --add-comments --keyword=_ --keyword=N_ \
   --files-from=./POTFILES.in \
-&& test ! -f gtk+.po \
-   || ( rm -f ./gtk+.pot \
-    && mv gtk+.po ./gtk+.pot )
+&& test ! -f $PACKAGE.po \
+   || ( rm -f ./$PACKAGE.pot \
+&& mv $PACKAGE.po ./$PACKAGE.pot );
+
+else
+
+if [ -s $1.po ]; then
+
+xgettext --default-domain=$PACKAGE --directory=.. \
+  --add-comments --keyword=_ --keyword=N_ \
+  --files-from=./POTFILES.in \
+&& test ! -f $PACKAGE.po \
+   || ( rm -f ./PACKAGE.pot \
+&& mv $PACKAGE.po ./$PACKAGE.pot );
+
+echo "Building the $PACKAGE.pot ..."
+echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." 
+
+mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \
+&& rm $1.po.old;
+
+msgfmt --statistics $1.po
+
+else
+
+echo Sorry $1.po does not exist!
+
+fi;
+
+fi;