[Debian-hebrew-package] [svn] r165 - in
pkg/hdate-applet/branches/upstream/current: . debian pixmaps po src
Baruch Even
baruch at costa.debian.org
Sun Aug 7 20:24:38 UTC 2005
Author: baruch
Date: Sun Aug 7 20:24:37 2005
New Revision: 165
Removed:
pkg/hdate-applet/branches/upstream/current/debian/
Modified:
pkg/hdate-applet/branches/upstream/current/Makefile.am
pkg/hdate-applet/branches/upstream/current/Makefile.in
pkg/hdate-applet/branches/upstream/current/aclocal.m4
pkg/hdate-applet/branches/upstream/current/autogen.sh (props changed)
pkg/hdate-applet/branches/upstream/current/config.guess (props changed)
pkg/hdate-applet/branches/upstream/current/config.sub (props changed)
pkg/hdate-applet/branches/upstream/current/configure (contents, props changed)
pkg/hdate-applet/branches/upstream/current/configure.in
pkg/hdate-applet/branches/upstream/current/hdate-applet.spec
pkg/hdate-applet/branches/upstream/current/install-sh (props changed)
pkg/hdate-applet/branches/upstream/current/missing (props changed)
pkg/hdate-applet/branches/upstream/current/mkinstalldirs (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-01.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-02.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-03.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-04.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-05.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-06.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-07.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-08.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-09.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-10.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-11.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-12.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-13.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-14.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-15.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-16.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-17.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-18.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-19.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-20.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-21.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-22.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-23.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-24.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-25.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-26.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-27.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/gray-moon-28.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-01.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-02.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-03.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-04.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-05.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-06.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-07.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-08.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-09.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-10.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-11.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-12.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-13.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-14.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-15.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-16.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-17.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-18.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-19.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-20.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-21.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-22.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-23.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-24.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-25.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-26.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-27.png (props changed)
pkg/hdate-applet/branches/upstream/current/pixmaps/yellow-moon-28.png (props changed)
pkg/hdate-applet/branches/upstream/current/po/ChangeLog (props changed)
pkg/hdate-applet/branches/upstream/current/po/hdate_applet.pot
pkg/hdate-applet/branches/upstream/current/po/he.gmo
pkg/hdate-applet/branches/upstream/current/po/he.po
pkg/hdate-applet/branches/upstream/current/src/Makefile.in
pkg/hdate-applet/branches/upstream/current/src/callbacks.c
pkg/hdate-applet/branches/upstream/current/src/ghcal-he (props changed)
pkg/hdate-applet/branches/upstream/current/src/hdate_applet.c
pkg/hdate-applet/branches/upstream/current/src/interface.c
Log:
Load /tmp/tmp.LWEXE2/hdate-applet-0.15.6 into
pkg/hdate-applet/branches/upstream/current.
Modified: pkg/hdate-applet/branches/upstream/current/Makefile.am
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/Makefile.am (original)
+++ pkg/hdate-applet/branches/upstream/current/Makefile.am Sun Aug 7 20:24:37 2005
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src po debian
+SUBDIRS = src po
EXTRA_DIST = \
autogen.sh \
Modified: pkg/hdate-applet/branches/upstream/current/Makefile.in
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/Makefile.in (original)
+++ pkg/hdate-applet/branches/upstream/current/Makefile.in Sun Aug 7 20:24:37 2005
@@ -87,7 +87,7 @@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
-SUBDIRS = src po debian
+SUBDIRS = src po
EXTRA_DIST = autogen.sh hdate-applet.server.in.in hdate-applet.spec.in hdate-applet.spec
Modified: pkg/hdate-applet/branches/upstream/current/aclocal.m4
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/aclocal.m4 (original)
+++ pkg/hdate-applet/branches/upstream/current/aclocal.m4 Sun Aug 7 20:24:37 2005
@@ -1307,17 +1307,33 @@
fi[]dnl
])# PKG_PROG_PKG_CONFIG
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
- pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
-elif test -n "$PKG_CONFIG"; then
- if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
- pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+[if test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
else
pkg_failed=untried
fi[]dnl
@@ -1329,7 +1345,7 @@
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
@@ -1339,10 +1355,10 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
- [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
-AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
- [_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
if test $pkg_failed = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
@@ -1373,6 +1389,7 @@
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
Modified: pkg/hdate-applet/branches/upstream/current/configure
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/configure (original)
+++ pkg/hdate-applet/branches/upstream/current/configure Sun Aug 7 20:24:37 2005
@@ -1510,7 +1510,7 @@
PACKAGE=hdate-applet
-VERSION=0.15.5
+VERSION=0.15.6
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -4122,52 +4122,37 @@
fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for PACKAGE_CFLAGS" >&5
-echo $ECHO_N "checking for PACKAGE_CFLAGS... $ECHO_C" >&6
-if test "${pkg_cv_PACKAGE_CFLAGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$ac_cv_env_PACKAGE_CFLAGS_set" = "xset"; then
- pkg_cv_PACKAGE_CFLAGS=$ac_cv_env_PACKAGE_CFLAGS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"\$pkg_modules\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "$pkg_modules" >/dev/null 2>&1) 2>&5
+echo "$as_me:$LINENO: checking for PACKAGE" >&5
+echo $ECHO_N "checking for PACKAGE... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
else
- pkg_failed=untried
+ pkg_failed=yes
fi
-fi
-echo "$as_me:$LINENO: result: $pkg_cv_PACKAGE_CFLAGS" >&5
-echo "${ECHO_T}$pkg_cv_PACKAGE_CFLAGS" >&6
-echo "$as_me:$LINENO: checking for PACKAGE_LIBS" >&5
-echo $ECHO_N "checking for PACKAGE_LIBS... $ECHO_C" >&6
-if test "${pkg_cv_PACKAGE_LIBS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "x$ac_cv_env_PACKAGE_LIBS_set" = "xset"; then
- pkg_cv_PACKAGE_LIBS=$ac_cv_env_PACKAGE_LIBS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"\$pkg_modules\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "$pkg_modules" >/dev/null 2>&1) 2>&5
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
else
- pkg_failed=untried
+ pkg_failed=yes
fi
+else
+ pkg_failed=untried
fi
-echo "$as_me:$LINENO: result: $pkg_cv_PACKAGE_LIBS" >&5
-echo "${ECHO_T}$pkg_cv_PACKAGE_LIBS" >&6
if test $pkg_failed = yes; then
PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
@@ -4214,6 +4199,8 @@
else
PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
:
fi
@@ -5852,7 +5839,7 @@
< $srcdir/po/POTFILES.in > po/POTFILES
- ac_config_files="$ac_config_files Makefile hdate-applet.spec src/Makefile po/Makefile.in debian/Makefile"
+ ac_config_files="$ac_config_files Makefile hdate-applet.spec src/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -6393,7 +6380,6 @@
"hdate-applet.spec" ) CONFIG_FILES="$CONFIG_FILES hdate-applet.spec" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Modified: pkg/hdate-applet/branches/upstream/current/configure.in
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/configure.in (original)
+++ pkg/hdate-applet/branches/upstream/current/configure.in Sun Aug 7 20:24:37 2005
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(hdate-applet, 0.15.5)
+AM_INIT_AUTOMAKE(hdate-applet, 0.15.6)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
@@ -30,5 +30,4 @@
hdate-applet.spec
src/Makefile
po/Makefile.in
-debian/Makefile
])
Modified: pkg/hdate-applet/branches/upstream/current/hdate-applet.spec
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/hdate-applet.spec (original)
+++ pkg/hdate-applet/branches/upstream/current/hdate-applet.spec Sun Aug 7 20:24:37 2005
@@ -1,6 +1,6 @@
Summary: A gnome2 panel applet for hebrew dates.
Name: hdate-applet
-Version: 0.15.5
+Version: 0.15.6
Release: 1
Copyright: GPL
Group: Applications/Productivity
Modified: pkg/hdate-applet/branches/upstream/current/po/hdate_applet.pot
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/po/hdate_applet.pot (original)
+++ pkg/hdate-applet/branches/upstream/current/po/hdate_applet.pot Sun Aug 7 20:24:37 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-14 11:24+0300\n"
+"POT-Creation-Date: 2005-08-07 18:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,85 +32,84 @@
msgid "About"
msgstr ""
-#: src/interface.c:53
+#: src/interface.c:59
msgid "Hdate applet properties"
msgstr ""
-#: src/interface.c:68
+#: src/interface.c:74
msgid "Show moon image"
msgstr ""
-#: src/interface.c:77
+#: src/interface.c:83
msgid "Show hebrew date"
msgstr ""
-#: src/interface.c:87
+#: src/interface.c:93
msgid "Show Greg. date (in tooltip)"
msgstr ""
-#: src/interface.c:98
+#: src/interface.c:104
msgid "Show the Greg. date using long format (in tooltip)"
msgstr ""
-#: src/interface.c:109
+#: src/interface.c:115
msgid "Show sunset/rise time (in tooltip)"
msgstr ""
-#: src/interface.c:122
+#: src/interface.c:128
msgid "Use locale (hebrew)"
msgstr ""
-#: src/interface.c:138
+#: src/interface.c:144
msgid "Show parasha"
msgstr ""
-#: src/interface.c:149
+#: src/interface.c:155
msgid "Use diaspra holidays and parashot"
msgstr ""
-#: src/interface.c:158
+#: src/interface.c:164
msgid "Label format"
msgstr ""
-#: src/interface.c:171
+#: src/interface.c:177
msgid "Use Theme:"
msgstr ""
-#: src/interface.c:195
+#: src/interface.c:201
msgid "Image theme"
msgstr ""
-#: src/interface.c:208
+#: src/interface.c:214
msgid "Latitude (decimal degrees):"
msgstr ""
-#: src/interface.c:216
+#: src/interface.c:222
msgid "Longitude (decimal degrees):"
msgstr ""
-#: src/interface.c:224
+#: src/interface.c:230
msgid "Time zone:"
msgstr ""
-#: src/interface.c:235
+#: src/interface.c:241
msgid "Use summenr clock (+one hour)"
msgstr ""
-#: src/interface.c:268
+#: src/interface.c:274
msgid "Location"
msgstr ""
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: src/interface.c:337
-msgid "translator_credits"
+#: src/interface.c:351
+msgid "hdate-applet"
msgstr ""
-#: src/interface.c:343
-msgid "(c) Yaacov Zamir 2002"
+#: src/interface.c:354
+msgid "Hdate Applet displays the current Hebrew date"
msgstr ""
-#: src/interface.c:345
-msgid "The Hdate applet displays the current hebrew date"
+#: src/interface.c:357
+msgid "translator_credits"
msgstr ""
#: src/ghcal-interface.c:64
Modified: pkg/hdate-applet/branches/upstream/current/po/he.gmo
==============================================================================
Binary files. No diff available.
Modified: pkg/hdate-applet/branches/upstream/current/po/he.po
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/po/he.po (original)
+++ pkg/hdate-applet/branches/upstream/current/po/he.po Sun Aug 7 20:24:37 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-14 11:24+0300\n"
+"POT-Creation-Date: 2005-08-07 18:49+0300\n"
"PO-Revision-Date: 2002-12-15 23:21+0200\n"
"Last-Translator: kobi zamir\n"
"Language-Team: <en at li.org>\n"
@@ -32,90 +32,93 @@
msgid "About"
msgstr "אודות"
-#: src/interface.c:53
+#: src/interface.c:59
msgid "Hdate applet properties"
msgstr "העדפות עבור ישומון לוח השנה"
-#: src/interface.c:68
+#: src/interface.c:74
msgid "Show moon image"
msgstr "הראה ירח"
-#: src/interface.c:77
+#: src/interface.c:83
msgid "Show hebrew date"
msgstr "הראה תאריך עברי"
-#: src/interface.c:87
+#: src/interface.c:93
#, fuzzy
msgid "Show Greg. date (in tooltip)"
msgstr "הראה תאריך לועזי"
-#: src/interface.c:98
+#: src/interface.c:104
#, fuzzy
msgid "Show the Greg. date using long format (in tooltip)"
msgstr "הראה תאריך לועזי"
-#: src/interface.c:109
+#: src/interface.c:115
msgid "Show sunset/rise time (in tooltip)"
msgstr "הראה זמן שקיעה"
-#: src/interface.c:122
+#: src/interface.c:128
#, fuzzy
msgid "Use locale (hebrew)"
msgstr "עברית"
-#: src/interface.c:138
+#: src/interface.c:144
msgid "Show parasha"
msgstr "הראה פרשה"
-#: src/interface.c:149
+#: src/interface.c:155
msgid "Use diaspra holidays and parashot"
msgstr "השתמש בחגים ופרשות לפי חו\"ל"
-#: src/interface.c:158
+#: src/interface.c:164
msgid "Label format"
msgstr "תבנית"
-#: src/interface.c:171
+#: src/interface.c:177
msgid "Use Theme:"
msgstr "תמונות"
-#: src/interface.c:195
+#: src/interface.c:201
msgid "Image theme"
msgstr "תמונות"
-#: src/interface.c:208
+#: src/interface.c:214
msgid "Latitude (decimal degrees):"
msgstr "קו רוחב"
-#: src/interface.c:216
+#: src/interface.c:222
msgid "Longitude (decimal degrees):"
msgstr "קו אורך"
-#: src/interface.c:224
+#: src/interface.c:230
msgid "Time zone:"
msgstr "אזור זמן"
-#: src/interface.c:235
+#: src/interface.c:241
msgid "Use summenr clock (+one hour)"
msgstr "שעון קייץ"
-#: src/interface.c:268
+#: src/interface.c:274
msgid "Location"
msgstr "מיקום"
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: src/interface.c:337
-msgid "translator_credits"
-msgstr "קובי זמיר"
-
-#: src/interface.c:343
-msgid "(c) Yaacov Zamir 2002"
-msgstr "(c) יעקב זמיר 2002"
+#: src/interface.c:351
+msgid "hdate-applet"
+msgstr ""
-#: src/interface.c:345
-msgid "The Hdate applet displays the current hebrew date"
+#: src/interface.c:354
+#, fuzzy
+msgid "Hdate Applet displays the current Hebrew date"
msgstr "ישומון תאריך עברי"
+#: src/interface.c:357
+msgid "translator_credits"
+msgstr "קובי זמיר"
+
#: src/ghcal-interface.c:64
msgid "gHcal - Hebrew Calendar"
msgstr "gHcal - לוח שנה עברי"
+
+#~ msgid "(c) Yaacov Zamir 2002"
+#~ msgstr "(c) יעקב זמיר 2002"
Modified: pkg/hdate-applet/branches/upstream/current/src/Makefile.in
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/src/Makefile.in (original)
+++ pkg/hdate-applet/branches/upstream/current/src/Makefile.in Sun Aug 7 20:24:37 2005
@@ -292,7 +292,8 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-callbacks.o: callbacks.c hdate_applet.h interface.h callbacks.h
+callbacks.o: callbacks.c ../config.h hdate_applet.h interface.h \
+ callbacks.h
ecal-client.o: ecal-client.c ../config.h
ghcal-callbacks.o: ghcal-callbacks.c ../config.h ghcal-callbacks.h \
ghcal-interface.h ecal-client.h
Modified: pkg/hdate-applet/branches/upstream/current/src/callbacks.c
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/src/callbacks.c (original)
+++ pkg/hdate-applet/branches/upstream/current/src/callbacks.c Sun Aug 7 20:24:37 2005
@@ -1,6 +1,10 @@
// callbacks.c
// glade file
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <gnome.h>
#include <panel-applet-gconf.h>
@@ -65,6 +69,16 @@
panel_applet_gconf_set_string (PANEL_APPLET (cd->applet),
KEY_HE_LOCALE, cd->he_locale, NULL);
+ if (cd->use_hebrew_locale)
+ {
+ panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
+ KEY_USE_HEBREW_L, TRUE, NULL);
+ setenv ("LANG", cd->he_locale, 1);
+ setenv ("LANGUAGE", cd->he_locale, 1);
+ setlocale (LC_MESSAGES, cd->he_locale);
+ gtk_set_locale ();
+ }
+
hdate_applet_paint (cd);
}
Modified: pkg/hdate-applet/branches/upstream/current/src/hdate_applet.c
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/src/hdate_applet.c (original)
+++ pkg/hdate-applet/branches/upstream/current/src/hdate_applet.c Sun Aug 7 20:24:37 2005
@@ -97,6 +97,28 @@
g_spawn_command_line_async ("ghcal", NULL);
}
+/* stolen from clock applet :) */
+static inline void
+force_no_focus_padding (GtkWidget *widget)
+{
+ gboolean first_time = TRUE;
+
+ if (first_time) {
+ gtk_rc_parse_string ("\n"
+ " style \"hdate-applet-button-style\"\n"
+ " {\n"
+ " GtkWidget::focus-line-width=0\n"
+ " GtkWidget::focus-padding=0\n"
+ " }\n"
+ "\n"
+ " widget \"*.hdate-applet-button\" style \"hdate-applet-button-style\"\n"
+ "\n");
+ first_time = FALSE;
+ }
+
+ gtk_widget_set_name (widget, "hdate-applet-button");
+}
+
static gboolean
hdate_applet_fill (PanelApplet * applet, const gchar * iid, gpointer data)
{
@@ -108,7 +130,12 @@
cd = g_new0 (HdateData, 1);
+ panel_applet_add_preferences (applet, "/schemas/apps/hdate_applet/prefs", NULL);
+ panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
+
cd->applet = GTK_WIDGET (applet);
+ gtk_container_set_border_width (GTK_CONTAINER (cd->applet), 0);
+
cd->tooltips = gtk_tooltips_new ();
cd->hbox = gtk_hbox_new (FALSE, 0);
@@ -120,13 +147,16 @@
gtk_container_add (GTK_CONTAINER (cd->hbox), cd->moon_image);
cd->label = gtk_label_new ("");
+ gtk_label_set_justify (GTK_LABEL (cd->label), GTK_JUSTIFY_CENTER);
+ gtk_label_set_line_wrap (GTK_LABEL (cd->label), TRUE);
cd->toggle = gtk_button_new ();
gtk_container_set_resize_mode (GTK_CONTAINER (cd->toggle),
GTK_RESIZE_IMMEDIATE);
gtk_button_set_relief (GTK_BUTTON (cd->toggle), GTK_RELIEF_NONE);
+ gtk_container_set_border_width (GTK_CONTAINER (cd->toggle), 0);
- //force_no_focus_padding (cd->toggle);
+ force_no_focus_padding (cd->toggle);
cd->alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_container_add (GTK_CONTAINER (cd->alignment), cd->label);
@@ -134,7 +164,7 @@
GTK_RESIZE_IMMEDIATE);
gtk_widget_show (cd->alignment);
gtk_container_add (GTK_CONTAINER (cd->toggle), cd->alignment);
-
+
g_signal_connect (cd->toggle, "button_press_event",
G_CALLBACK (do_not_eat_button_press), NULL);
@@ -156,29 +186,42 @@
KEY_FIRST, TRUE, NULL);
cd->showmoon = FALSE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_MOON, FALSE, NULL);
+ KEY_SHOW_MOON, cd->showmoon, NULL);
cd->showhebrew = TRUE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_HEBREW, TRUE, NULL);
- cd->showgeneral = FALSE;
+ KEY_SHOW_HEBREW, cd->showhebrew, NULL);
+ cd->showgeneral = TRUE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_GENERAL, FALSE, NULL);
- cd->showgeneral_long = TRUE;
+ KEY_SHOW_GENERAL, cd->showgeneral, NULL);
+ cd->showgeneral_long = FALSE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_GENERAL_LONG, TRUE, NULL);
- cd->showsunset = FALSE;
+ KEY_SHOW_GENERAL_LONG, cd->showgeneral_long,
+ NULL);
+ cd->showsunset = TRUE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_SUNSET, FALSE, NULL);
- cd->showparasha = FALSE;
+ KEY_SHOW_SUNSET, cd->showsunset, NULL);
+ cd->showparasha = TRUE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_PARASHA, FALSE, NULL);
- cd->use_hebrew_locale = FALSE;
+ KEY_SHOW_PARASHA, cd->showparasha, NULL);
+ cd->use_hebrew_locale = TRUE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
- KEY_USE_HEBREW_L, FALSE, NULL);
+ KEY_USE_HEBREW_L, cd->use_hebrew_locale, NULL);
g_stpcpy (cd->he_locale, "he_IL.utf8");
panel_applet_gconf_set_string (PANEL_APPLET (cd->applet),
KEY_HE_LOCALE,
cd->he_locale, NULL);
+
+ if (cd->use_hebrew_locale)
+ {
+ panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
+ KEY_USE_HEBREW_L, TRUE,
+ NULL);
+ setenv ("LANG", cd->he_locale, 1);
+ setenv ("LANGUAGE", cd->he_locale, 1);
+ setlocale (LC_MESSAGES, cd->he_locale);
+ gtk_set_locale ();
+ }
+
cd->use_diaspora = FALSE;
panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
KEY_USE_DIASPORA, FALSE, NULL);
@@ -215,7 +258,8 @@
KEY_SHOW_GENERAL, NULL);
cd->showgeneral_long =
panel_applet_gconf_get_int (PANEL_APPLET (cd->applet),
- KEY_SHOW_GENERAL_LONG, NULL);
+ KEY_SHOW_GENERAL_LONG,
+ NULL);
cd->showsunset =
panel_applet_gconf_get_int (PANEL_APPLET (cd->applet),
KEY_SHOW_SUNSET, NULL);
@@ -237,9 +281,13 @@
if (cd->use_hebrew_locale)
{
+ panel_applet_gconf_set_int (PANEL_APPLET (cd->applet),
+ KEY_USE_HEBREW_L, TRUE,
+ NULL);
setenv ("LANG", cd->he_locale, 1);
setenv ("LANGUAGE", cd->he_locale, 1);
setlocale (LC_MESSAGES, cd->he_locale);
+ gtk_set_locale ();
}
cd->latitude =
@@ -262,6 +310,20 @@
cd->size = 24;
}
+ hdate_applet_paint (cd);
+
+ gtk_widget_show_all (GTK_WIDGET (cd->applet));
+
+ /* show all will show moon image, but we do not want that */
+ if (cd->showmoon)
+ {
+ gtk_widget_show (GTK_WIDGET (cd->moon_image));
+ }
+ else
+ {
+ gtk_widget_hide (GTK_WIDGET (cd->moon_image));
+ }
+
g_signal_connect (G_OBJECT (cd->applet),
"change_size",
G_CALLBACK (applet_change_pixel_size), cd);
@@ -276,19 +338,6 @@
gtk_timeout_add (TIME_INTERVAL, (GtkFunction) hdate_applet_paint,
(HdateData *) cd);
- hdate_applet_paint (cd);
-
- gtk_widget_show_all (GTK_WIDGET (cd->applet));
-
- if (cd->showmoon)
- {
- gtk_widget_show (GTK_WIDGET (cd->moon_image));
- }
- else
- {
- gtk_widget_hide (GTK_WIDGET (cd->moon_image));
- }
-
return TRUE;
}
Modified: pkg/hdate-applet/branches/upstream/current/src/interface.c
==============================================================================
--- pkg/hdate-applet/branches/upstream/current/src/interface.c (original)
+++ pkg/hdate-applet/branches/upstream/current/src/interface.c Sun Aug 7 20:24:37 2005
@@ -11,6 +11,9 @@
#include "../config.h"
+#undef _
+#define _(String) dgettext (GETTEXT_PACKAGE, String)
+
GtkWidget *
create_window_prop (HdateData * cd)
{
@@ -48,6 +51,9 @@
GtkWidget *label_loc;
GtkWidget *button_ok;
+ bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
window_prop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window_prop),
_("Hdate applet properties"));
@@ -326,28 +332,33 @@
GtkWidget *
create_about_hdate (void)
{
+ bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ static const gchar *authors[] =
{
- const gchar *authors[] = {
- "kobi zamir <kzamir at walla.co.il>",
- NULL
- };
- const gchar *documenters[] = { NULL };
- /* TRANSLATORS: Replace this string with your names, one name per line. */
- gchar *translators = _("translator_credits");
- GtkWidget *about_hdate;
-
- if (!strcmp (translators, "translator_credits"))
- translators = NULL;
- about_hdate = gnome_about_new (PACKAGE, VERSION,
- _("(c) Yaacov Zamir 2002"),
- _
- ("The Hdate applet displays the current hebrew date"),
- authors, documenters,
- translators, NULL);
+ "Yaacov Zamir <kzamir at walla.co.il>",
+ NULL
+ };
+ static const char *documenters[] =
+ {
+ "Yaacov Zamir <kzamir at walla.co.il>",
+ NULL
+ };
+
+ GtkWidget * about_hdate = gtk_about_dialog_new ();
+ g_object_set (about_hdate,
+ "name", _("hdate-applet"),
+ "version", VERSION,
+ "copyright", "Copyright \xc2\xa9 2002-2005 Yaacov Zamir",
+ "comments", _("Hdate Applet displays the current Hebrew date"),
+ "authors", authors,
+ "documenters", documenters,
+ "translator-credits", _("translator_credits"),
+ "logo-icon-name", "clock",
+ NULL);
- return about_hdate;
- }
+ return about_hdate;
}
More information about the Debian-hebrew-package
mailing list