rpms/xscreensaver/devel xscreensaver-5.00-ja.po, NONE, 1.1 xscreensaver-5.00-xmlmanfix.patch, NONE, 1.1 xscreensaver.spec, 1.9, 1.10 xscreensaver-5.00-xmlfix.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.00-ja.po xscreensaver-5.00-xmlmanfix.patch 
Removed Files:
	xscreensaver-5.00-xmlfix.patch 
Log Message:
* Wed Jun  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-6
- Another fixes of config files for ifsmap as reported to jwz 
  livejournal page.
- Update Japanese translation.
- Locale fix for xscreensaver-text.



--- NEW FILE xscreensaver-5.00-ja.po ---
# xscreensaver ja.po.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Takeshi Aihana <aihana at gnome.gr.jp>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: xscreensaver 5.00-6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-02-13 12:26+0100\n"
"PO-Revision-Date: 2006-06-07 09:09+0900\n"
"Former-Translator: Takeshi Aihana <aihana at gnome.gr.jp>\n"
"Last-Translator:  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>\n"
"Language-Team: Japanese <translation at gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: driver/demo-Gtk-conf.c:818
msgid "Browse..."
msgstr "参照..."

#: driver/demo-Gtk-conf.c:1110
msgid "Select file."
msgstr "ファイルを選択して下さい。"

#: driver/demo-Gtk-support.c:135
#, c-format
msgid "Couldn't find pixmap file: %s"
msgstr "Pixmap ファイルが見つかりませんでした: %s"

#: driver/demo-Gtk-support.c:147 driver/demo-Gtk-support.c:179
#, c-format
msgid "Error loading pixmap file: %s"
msgstr "Pixmap ファイルを読み込む際にエラーが発生しました: %s"

#: driver/demo-Gtk-support.c:182
#, c-format
msgid "reason: %s\n"
msgstr ""

#: driver/demo-Gtk-widgets.c:161 driver/xscreensaver-demo.glade2.h:71
msgid "XScreenSaver"
msgstr "XScreenSaver"

#: driver/demo-Gtk-widgets.c:182 driver/xscreensaver-demo.glade2.h:84
msgid "_File"
msgstr "ファイル(_F)"

#: driver/demo-Gtk-widgets.c:202 driver/xscreensaver-demo.glade2.h:76
msgid "_Blank Screen Now"
msgstr "XScreenSaver の起動(_B)"

#: driver/demo-Gtk-widgets.c:211
msgid ""
"Activate the XScreenSaver daemon now (locking the screen if so configured.)"
msgstr ""
"XScreenSaver デーモンを今すぐ有効にします (ç”»é¢ãƒ­ãƒƒã‚¯ã®è¨­å®šãŒæœ‰åŠ¹ãªå ´åˆã¯ã€ç”»"
"面をロックします)。"

#: driver/demo-Gtk-widgets.c:215 driver/xscreensaver-demo.glade2.h:89
msgid "_Lock Screen Now"
msgstr "画面のロック(_L)"

#: driver/demo-Gtk-widgets.c:224
msgid "Lock the screen now (even if \"Lock Screen\" is unchecked.)"
msgstr "画面を今すぐロックします (ç”»é¢ãƒ­ãƒƒã‚¯ã®è¨­å®šãŒç„¡åŠ¹ãªå ´åˆã§ã‚‚)。"

#: driver/demo-Gtk-widgets.c:228 driver/xscreensaver-demo.glade2.h:87
msgid "_Kill Daemon"
msgstr "デーモンの強制終了(_K)"

#: driver/demo-Gtk-widgets.c:237
msgid "Tell the running XScreenSaver daemon to exit."
msgstr "起動中の XScreenSaver デーモンを終了します。"

#: driver/demo-Gtk-widgets.c:241 driver/xscreensaver-demo.glade2.h:98
msgid "_Restart Daemon"
msgstr "デーモンの再起動(_R)"

#: driver/demo-Gtk-widgets.c:250
msgid "Kill and re-launch the XScreenSaver daemon."
msgstr "XScreenSaver デーモンを強制終了して、再び起動します。"

#: driver/demo-Gtk-widgets.c:263
msgid "_Exit"
msgstr "終了(_E)"

#: driver/demo-Gtk-widgets.c:272
msgid ""
"Exit the xscreensaver-demo program (but leave the XScreenSaver daemon "
"running in the background.)"
msgstr ""
"XScreenSaver デモ・プログラムを終了します (但し XScreenSaver デーモンはバック"
"グラウンドで実行したままです)。"

#: driver/demo-Gtk-widgets.c:276 driver/xscreensaver-demo.glade2.h:85
msgid "_Help"
msgstr "ヘルプ(_H)"

#: driver/demo-Gtk-widgets.c:296 driver/xscreensaver-demo.glade2.h:72
msgid "_About..."
msgstr "æƒ…å ±(_A)..."

#: driver/demo-Gtk-widgets.c:305
msgid "Display version information."
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚"

#: driver/demo-Gtk-widgets.c:309 driver/xscreensaver-demo.glade2.h:83
msgid "_Documentation..."
msgstr "ドキュメント(_D)..."

#: driver/demo-Gtk-widgets.c:318
msgid "Go to the documentation on the XScreenSaver web page."
msgstr "XScreenSaver のウェブサイトにジャンプします。"

#: driver/demo-Gtk-widgets.c:348
msgid "Cycle After"
msgstr "モードの周期: "

#: driver/demo-Gtk-widgets.c:370 driver/xscreensaver-demo.glade2.h:63
msgid "Whether a password should be required to un-blank the screen."
msgstr "画面をブランクした後、しばらくして自動的にロックしたい時は、これを選択して下さい。"

#: driver/demo-Gtk-widgets.c:372
msgid "Lock Screen After"
msgstr "画面ロックの起動: "

#: driver/demo-Gtk-widgets.c:380
msgid "Blank After"
msgstr "XScreenSaver の起動: "

#: driver/demo-Gtk-widgets.c:403 driver/demo-Gtk-widgets.c:453
#: driver/demo-Gtk-widgets.c:467 driver/demo-Gtk-widgets.c:1016
msgid "How long before the monitor goes completely black."
msgstr "自動的に XScreenSaver を起動するまでの時間です。"

#: driver/demo-Gtk-widgets.c:407 driver/demo-Gtk-widgets.c:419
#: driver/demo-Gtk-widgets.c:431 driver/demo-Gtk-widgets.c:1020
#: driver/demo-Gtk-widgets.c:1032 driver/demo-Gtk-widgets.c:1044
#: driver/xscreensaver-demo.glade2.h:106
msgid "minutes"
msgstr "分"

#: driver/demo-Gtk-widgets.c:482 driver/demo-Gtk.c:3233
msgid "Preview"
msgstr "プレビュー"

#: driver/demo-Gtk-widgets.c:490 driver/xscreensaver-demo.glade2.h:10
msgid ""
"Demo the selected screen saver in full-screen mode (click the mouse to "
"return.)"
msgstr ""
"指定したスクリーンセーバーを全画面モードでデモします (è§£é™¤ã™ã‚‹å ´åˆã¯ãƒžã‚¦ã‚¹ã‚’"
"クリックして下さい)。"

#: driver/demo-Gtk-widgets.c:492
msgid "Settings..."
msgstr "設定..."

#: driver/demo-Gtk-widgets.c:500 driver/xscreensaver-demo.glade2.h:7
msgid "Customization and explanation of the selected screen saver."
msgstr "指定したスクリーンセーバーの紹介とそのカスタマイズです。"

#: driver/demo-Gtk-widgets.c:521
msgid "Mode:"
msgstr "モード:"

#: driver/demo-Gtk-widgets.c:539
msgid "Disable Screen Saver"
msgstr "スクリーンセーバーを無効にする"

#: driver/demo-Gtk-widgets.c:542
msgid "Blank Screen Only"
msgstr "ブランク・スクリーンのみ"

#: driver/demo-Gtk-widgets.c:545
msgid "Only One Screen Saver"
msgstr "一つのスクリーンセーバーのみ"

#: driver/demo-Gtk-widgets.c:548
msgid "Random Screen Saver"
msgstr "ランダムなスクリーンセーバー"

#: driver/demo-Gtk-widgets.c:571 driver/demo-Gtk.c:2419
msgid "Use"
msgstr "ON"

#: driver/demo-Gtk-widgets.c:591 driver/demo-Gtk.c:2429
msgid "Screen Saver"
msgstr "スクリーンセーバー名"

#: driver/demo-Gtk-widgets.c:644
msgid "\\/"
msgstr "\\/"

#: driver/demo-Gtk-widgets.c:652 driver/xscreensaver-demo.glade2.h:39
msgid ""
"Run the next screen saver in the list in full-screen mode (click the mouse "
"to return.)"
[...8661 lines suppressed...]
#: hacks/config/xplanet.xml.h:80
msgid "View Mimas"
msgstr ""

#: hacks/config/xplanet.xml.h:81
msgid "View Miranda"
msgstr ""

#: hacks/config/xplanet.xml.h:82
msgid "View Moon"
msgstr ""

#: hacks/config/xplanet.xml.h:83
msgid "View Neptune"
msgstr ""

#: hacks/config/xplanet.xml.h:84
msgid "View Nereid"
msgstr ""

#: hacks/config/xplanet.xml.h:85
msgid "View Oberon"
msgstr ""

#: hacks/config/xplanet.xml.h:86
msgid "View Phobos"
msgstr ""

#: hacks/config/xplanet.xml.h:87
msgid "View Phoebe"
msgstr ""

#: hacks/config/xplanet.xml.h:88
msgid "View Pluto"
msgstr ""

#: hacks/config/xplanet.xml.h:89
msgid "View Random"
msgstr ""

#: hacks/config/xplanet.xml.h:90
msgid "View Rhea"
msgstr ""

#: hacks/config/xplanet.xml.h:91
msgid "View Saturn"
msgstr ""

#: hacks/config/xplanet.xml.h:92
msgid "View Sun"
msgstr ""

#: hacks/config/xplanet.xml.h:93
msgid "View Tethys"
msgstr ""

#: hacks/config/xplanet.xml.h:94
msgid "View Titan"
msgstr ""

#: hacks/config/xplanet.xml.h:95
msgid "View Titania"
msgstr ""

#: hacks/config/xplanet.xml.h:96
msgid "View Triton"
msgstr ""

#: hacks/config/xplanet.xml.h:97
msgid "View Umbriel"
msgstr ""

#: hacks/config/xplanet.xml.h:98
msgid "View Uranus"
msgstr ""

#: hacks/config/xplanet.xml.h:99
msgid "View Venus"
msgstr ""

#: hacks/config/xplanet.xml.h:100
msgid "Xplanet"
msgstr ""

#: hacks/config/xplanet.xml.h:101
msgid ""
"Xplanet draws an image of the Earth, as seen from your favorite vantage "
"point in space, correctly shaded for the current position of the Sun. "
"Written by Hari Nair. This is not included with the XScreenSaver package, "
"but if you don't have it already, you can find it at <http://xplanet."
"sourceforge.net/>."
msgstr ""

#: hacks/config/xrayswarm.xml.h:1
msgid ""
"Draws a few swarms of critters flying around the screen, with nicely faded "
"color trails behind them. Written by Chris Leger."
msgstr ""

#: hacks/config/xrayswarm.xml.h:5
msgid "XRaySwarm"
msgstr ""

#: hacks/config/xsnow.xml.h:1
msgid ""
"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can "
"find it at <http://www.euronet.nl/~rja/Xsnow/>."
msgstr ""

#: hacks/config/xsnow.xml.h:2
msgid "Xsnow"
msgstr ""

#: hacks/config/xspirograph.xml.h:5
msgid ""
"Simulates that pen-in-nested-plastic-gears toy from your childhood. By Rohit "
"Singh."
msgstr ""

#: hacks/config/xspirograph.xml.h:6
msgid "XSpiroGraph"
msgstr ""

#: hacks/config/xteevee.xml.h:1
msgid "Color Bars Enabled"
msgstr ""

#: hacks/config/xteevee.xml.h:2
msgid "Cycle Through Modes"
msgstr ""

#: hacks/config/xteevee.xml.h:3
msgid "Rolling Enabled"
msgstr ""

#: hacks/config/xteevee.xml.h:4
msgid "Static Enabled"
msgstr ""

#: hacks/config/xteevee.xml.h:5
msgid "XTeeVee"
msgstr ""

#: hacks/config/xteevee.xml.h:6
msgid ""
"XTeeVee simulates various television problems, including static, loss of "
"vertical hold, and a test pattern. By Greg Knauss."
msgstr ""

#: hacks/config/zoom.xml.h:3
msgid "Lens Offset"
msgstr ""

#: hacks/config/zoom.xml.h:4
msgid "Lenses"
msgstr ""

#: hacks/config/zoom.xml.h:9
msgid ""
"Zooms in on a part of the screen and then moves around. With the -lenses "
"option the result is like looking through many overlapping lenses rather "
"than just a simple zoom. Written by James Macnicol."
msgstr ""

#~ msgid "/\");"
#~ msgstr "/\");"

#, fuzzy
#~ msgid "Display Subprocess _Errors"
#~ msgstr "表示モードのエラーを表示する"

#, fuzzy
#~ msgid "Display _Splash Screen at Startup"
#~ msgstr "起動時にスプラッシュスクリーンを表示する"

#, fuzzy
#~ msgid "_Verbose Diagnostics"
#~ msgstr "è¨ºæ–­æƒ…å ±ã‚’è©³ç´°ã«ã™ã‚‹"

#, fuzzy
#~ msgid "Standalone"
#~ msgstr "標準"

#~ msgid "Configure the settings of the screensaver."
#~ msgstr "XScreenSaver の設定"

#, fuzzy
#~ msgid "Preview of screen saver"
#~ msgstr "スクリーンセーバーを無効にする"

#, fuzzy
#~ msgid "_Verbose Dialognostics"
#~ msgstr "è¨ºæ–­æƒ…å ±ã‚’è©³ç´°ã«ã™ã‚‹"

#, fuzzy
#~ msgid "Copyright  1991-2002 %s"
#~ msgstr "Copyright  1991-2002 %s"

#~ msgid "Copyright 息 1991-2002 %s"
#~ msgstr "Copyright  1991-2002 %s"

xscreensaver-5.00-xmlmanfix.patch:

--- NEW FILE xscreensaver-5.00-xmlmanfix.patch ---
--- xscreensaver-5.00/hacks/config/imsmap.xml.xmlfix	2006-03-22 10:59:20.000000000 +0900
+++ xscreensaver-5.00/hacks/config/imsmap.xml	2006-06-06 16:38:31.000000000 +0900
@@ -16,7 +16,7 @@
           low="1" high="7" default="7"/>
 
   <number id="delay2" type="slider" arg="-delay2 %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
+          _label="Speed" _low-label="Fast" _high-label="Slow"
           low="0" high="1000000" default="20000"/>
 
   <number id="delay" type="slider" arg="-delay %"
--- xscreensaver-5.00/hacks/config/slidescreen.xml.xmlfix	2006-04-29 10:28:46.000000000 +0900
+++ xscreensaver-5.00/hacks/config/slidescreen.xml	2006-06-06 16:28:24.000000000 +0900
@@ -11,7 +11,7 @@
 
  <number id="delay2" type="slider" arg="-delay2 %"
          _label="Pause" _low-label="Short" _high-label="Long"
-         low="0" high="1000000" default="2000000"/>
+         low="0" high="2000000" default="1000000"/>
 
   <number id="increment" type="slider" arg="-increment %"
           _label="Slide Speed" _low-label="Slow" _high-label="Fast"
--- xscreensaver-5.00/hacks/imsmap.man.xmlfix	2006-03-06 20:42:47.000000000 +0900
+++ xscreensaver-5.00/hacks/imsmap.man	2006-06-06 16:53:03.000000000 +0900
@@ -3,7 +3,7 @@
 imsmap - generate fractal maps
 .SH SYNOPSIS
 .B imsmap
-[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-ncolors \fIint\fP] [\-delay \fIseconds\fP] [\-iterations \fIint\fP] [\-mode h|s|v|random]
+[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-ncolors \fIint\fP] [\-delay \fIseconds\fP] [\-delay2 \fImicroseconds\fP] [\-iterations \fIint\fP] [\-mode h|s|v|random]
 .SH DESCRIPTION
 The \fIimsmap\fP program generates map or cloud-like patterns.  It looks
 quite different in monochrome and color.
@@ -33,6 +33,9 @@
 .B \-delay \fIinteger\fP
 How long to delay between images.  Default 10 seconds.
 .TP 8
+.B \-delay2 \fIinteger\fP
+How long to delay between bitmaps.  Default 200000 (0.2 seconds).
+.TP 8
 .B \-iterations \fIinteger\fP
 A measure of the resolution of the resultant image, from 0 to 7.  Default 7.
 .TP 8


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xscreensaver.spec	2 Jun 2006 12:15:35 -0000	1.9
+++ xscreensaver.spec	7 Jun 2006 16:26:42 -0000	1.10
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	5
+%define fedora_rel	6
 
 %define fedora_ver	5.89
 %define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -17,13 +17,15 @@
 Group:		Amusements/Graphics
 URL:		http://www.jwz.org/xscreensaver/
 Source0:	http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
+Source10:	xscreensaver-5.00-ja.po
 Patch0:		xscreensaver-5.00-browser-setting.patch
 Patch1:		xscreensaver-5.00b5-sanitize-hacks.patch
 Patch5:		xscreensaver-5.00-rootpasswd.patch
 Patch8:		xscreensaver-5.00b5-include-directory.patch
 Patch101:	xscreensaver-5.00-localefix-restrict.patch
 Patch102:	xscreensaver-5.00-matherr-utils.patch
-Patch104:	xscreensaver-5.00-xmlfix.patch
+Patch104:	xscreensaver-5.00-xmlmanfix.patch
+Patch105:	xscreensaver-5.00-text-locale.patch
 
 # find_lang
 BuildRequires:	gettext
@@ -96,6 +98,9 @@
 %patch101 -p1 -b .locale-fix-restrict
 %patch102 -p1 -b .matherr2
 %patch104 -p1 -b .xmlfix
+%patch105 -p1 -b .text-locale
+
+install -m644 %{SOURCE10} po/ja.po
 
 change_option(){
    ADFILE=$1
@@ -270,6 +275,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Jun  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-6
+- Another fixes of config files for ifsmap as reported to jwz 
+  livejournal page.
+- Update Japanese translation.
+- Locale fix for xscreensaver-text.
+
 * Thu Jun  1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-5
 - Disable (not remove) some hacks by default according to 4.24 behavior.
 - XML file fix for slidescreen.


--- xscreensaver-5.00-xmlfix.patch DELETED ---