diff --git a/ja.po b/ja.po index 35aa580..e0d4d95 100644 --- a/ja.po +++ b/ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xscreensaver 6.00b2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-22 22:55+0900\n" -"PO-Revision-Date: 2021-03-23 14:41+0900\n" +"PO-Revision-Date: 2021-03-23 23:52+0900\n" "Last-Translator: Mamoru TASAKA \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -372,7 +372,7 @@ msgstr "" #: ../driver/dialog.c:1294 msgid "PRE-RELEASE VERSION" -msgstr "" +msgstr "プレリリースバージョンです" #: ../driver/dialog.c:1328 msgid "" @@ -384,11 +384,11 @@ msgstr "" #: ../driver/dialog.c:1374 msgid "Username:" -msgstr "" +msgstr "ユーザ名:" #: ../driver/dialog.c:1402 msgid "Checking..." -msgstr "" +msgstr "確認しています..." #: ../driver/dialog.c:1479 ../driver/xscreensaver.ui.h:112 msgid "Settings" @@ -396,53 +396,53 @@ msgstr "設定" #: ../driver/dialog.c:1489 msgid "Help" -msgstr "" +msgstr "ヘルプ" #: ../driver/dialog.c:1502 msgid "New Login" -msgstr "" +msgstr "別ユーザに切り替え" #: ../driver/dialog.c:2440 msgid "Password initialization failed" -msgstr "" +msgstr "パスワード画面の初期化に失敗しました" #: ../driver/dialog.c:2442 msgid "Authentication failed (Caps Lock?)" -msgstr "" +msgstr "認証に失敗しました（Caps Lock?）" #: ../driver/dialog.c:2444 msgid "Authentication failed!" -msgstr "" +msgstr "認証に失敗しました!" #: ../driver/dialog.c:2464 #, c-format msgid "%d days ago" -msgstr "%d 日前" +msgstr "%d 日前でした" #: ../driver/dialog.c:2465 #, c-format msgid "%d hours ago" -msgstr "%d 時間前" +msgstr "%d 時間前でした" #: ../driver/dialog.c:2466 #, c-format msgid "%d minutes ago" -msgstr "%d 分前" +msgstr "%d 分前でした" #: ../driver/dialog.c:2467 #, c-format msgid "just now" -msgstr "たった今" +msgstr "今さっきでした" #: ../driver/dialog.c:2470 #, c-format msgid "There has been 1 failed login attempt, %s." -msgstr "" +msgstr "過去1回認証に失敗しました. %s." #: ../driver/dialog.c:2473 #, c-format msgid "There have been %d failed login attempts, oldest %s." -msgstr "" +msgstr "過去%d回認証に失敗しました.一番古い失敗は%s." #: ../driver/screensaver-properties.desktop.in.h:1 msgid "Screensaver" @@ -455,7 +455,7 @@ msgstr "スクリーンセーバーの設定を変更する" #: ../driver/subprocs.c:571 #, c-format msgid "crashed with status %d" -msgstr "ステータス%d で異常終了しました" +msgstr "はステータス%d で異常終了しました" #. Expected notification after we killed it. #: ../driver/subprocs.c:588 @@ -715,7 +715,7 @@ msgstr "説明" #: ../driver/xscreensaver.ui.h:59 msgid "_Display Modes" -msgstr "表示モード" +msgstr "表示モード(_D)" #: ../driver/xscreensaver.ui.h:60 msgid "" diff --git a/xscreensaver-6.00b2-0003-xscreensaver-gfx-set-locate-with-gettext-mechanism.patch b/xscreensaver-6.00b2-0003-xscreensaver-gfx-set-locate-with-gettext-mechanism.patch new file mode 100644 index 0000000..4ae743c --- /dev/null +++ b/xscreensaver-6.00b2-0003-xscreensaver-gfx-set-locate-with-gettext-mechanism.patch @@ -0,0 +1,70 @@ +From ad7c3eb581627159959cbfa5c57b0a76eb2d99e7 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Wed, 24 Mar 2021 00:10:36 +0900 +Subject: [PATCH] xscreensaver-gfx: set locate with gettext mechanism + +To make some strings translated for xscreensaver-gfx, set locale with gettext mechanism. +Also, adjust Makefile to pass cflags. +--- + driver/Makefile.in | 4 +++- + driver/xscreensaver-gfx.c | 15 +++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/driver/Makefile.in b/driver/Makefile.in +index 2c3c1c9..d5c12a8 100644 +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -104,7 +104,7 @@ DAEMON_OBJS = xscreensaver.o blurb.o atoms.o clientmsg.o xinput.o prefs.o \ + $(UTILS_BIN)/xmu.o + DAEMON_LIBS = $(LIBS_PRE) $(XINPUT_LIBS) -lX11 $(LIBS_POST) + +-GFX_DEFS = ++GFX_DEFS = -DLOCALEDIR=\"$(localedir)\" + GFX_SRCS = xscreensaver-gfx.c screens.c windows.c subprocs.c \ + exec.c prefsw.c dpms.c fade.c exts.c atomswm.c + GFX_OBJS = xscreensaver-gfx.o screens.o windows.o subprocs.o \ +@@ -833,6 +833,8 @@ xscreensaver: $(DAEMON_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DAEMON_OBJS) $(DAEMON_LIBS) + + xscreensaver-gfx.o: XScreenSaver_ad.h ++xscreensaver-gfx.o: xscreensaver-gfx.c ++ $(CC) -c $(CC_ALL) $(GFX_DEFS) $< + xscreensaver-gfx: $(GFX_OBJS) + $(CC) $(LDFLAGS) -o $@ $(GFX_OBJS) $(GFX_LIBS) + +diff --git a/driver/xscreensaver-gfx.c b/driver/xscreensaver-gfx.c +index 61c50d5..b9c06e2 100644 +--- a/driver/xscreensaver-gfx.c ++++ b/driver/xscreensaver-gfx.c +@@ -42,6 +42,10 @@ + # include + #endif /* HAVE_RANDR */ + ++#ifdef ENABLE_NLS ++# include ++#endif ++ + #include "xscreensaver.h" + #include "version.h" + #include "atoms.h" +@@ -559,6 +563,17 @@ main (int argc, char **argv) + putenv (s); + /* free (s); */ /* some versions of putenv do not copy */ + ++# ifdef ENABLE_NLS ++ { ++ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); ++ textdomain (GETTEXT_PACKAGE); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ if (!setlocale (LC_ALL, "")) ++ fprintf (stderr, "%s: warning: could not set default locale\n", ++ progname); ++ } ++# endif /* ENABLE_NLS */ ++ + connect_to_server (si); + + if (p->xsync_p) +-- +2.30.2 + diff --git a/xscreensaver.spec b/xscreensaver.spec index e1bcc81..4b1c8ec 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -10,7 +10,7 @@ %define split_getimage 1 %endif -%define fedora_rel 0.106 +%define fedora_rel 0.107 %global use_clang_as_cc 0 %global use_clang_analyze 0 @@ -102,6 +102,8 @@ Patch4506: xscreensaver-5.45-0006-asm6502.c-newAsmLine-shut-up-Wstringop-wa Patch4601: xscreensaver-6.00b2-0001-create_daemon_window-make-utsname-buffer-within-scop.patch # xscreensaver: don't load verbose_p splash_p Patch4602: xscreensaver-6.00b2-0002-xscreensaver-don-t-load-verbose_p-splash_p.patch +# xscreensaver-gfx: set locate with gettext mechanism +Patch4603: xscreensaver-6.00b2-0003-xscreensaver-gfx-set-locate-with-gettext-mechanism.patch # # gcc warning cleanup # Some cppcheck cleanup @@ -383,6 +385,7 @@ find . -name \*.c -exec chmod ugo-x {} \; %__cat %PATCH4506 | %__git am %__cat %PATCH4601 | %__git am %__cat %PATCH4602 | %__git am +%__cat %PATCH4603 | %__git am #%%__cat %PATCH13501 | %%__git am @@ -529,6 +532,13 @@ sed -i.delay -e 's| delay = 2| delay = 3|' driver/test-fade.c sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c %__git commit -m "%PATCH_desc" -a +# Tweak font settings +sed -i.font driver/XScreenSaver.ad.in \ + -e 's|Bold|medium|' \ + -e 's|Helvetica|fixed|' \ + %{nil} +%__git commit -m "Change font settings" -a + # Well, clang misinterpretates how gcc / autoconf uses -Wunknown-warning-option .... sed -i 's|-Wunknown-warning-option|-Wfoo-bar-baz|' ax_pthread.m4 %__git commit -m "Really use unknowing warning option" -a