Hello community,
here is the log from the commit of package gnome-phone-manager for
openSUSE:Factory
checked in at Tue Oct 18 14:07:01 CEST 2011.
--------
--- openSUSE:Factory/gnome-phone-manager/gnome-phone-manager.changes
2011-09-23 02:00:59.000000000 +0200
+++
/mounts/work_src_done/STABLE/gnome-phone-manager/gnome-phone-manager.changes
2011-10-17 08:10:07.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Oct 17 06:03:05 UTC 2011 - [email protected]
+
+- Update to version 0.68:
+ + Builds with strict linkers
+ + Updated translations.
+- Drop gnome-phone-manager-ld_fix.patch: fixed upstream.
+- Remove gnome-common BuildRequires and call to gnome-autogen.sh:
+ those were only needed for the patch above.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-phone-manager-0.67.tar.bz2
gnome-phone-manager-ld_fix.patch
New:
----
gnome-phone-manager-0.68.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-phone-manager.spec ++++++
--- /var/tmp/diff_new_pack.BAvB1j/_old 2011-10-18 14:06:58.000000000 +0200
+++ /var/tmp/diff_new_pack.BAvB1j/_new 2011-10-18 14:06:58.000000000 +0200
@@ -18,20 +18,16 @@
Name: gnome-phone-manager
-Version: 0.67
+Version: 0.68
Release: 1
License: GPLv2+
Summary: Phone Manager for GNOME
Url: http://usefulinc.com/software/phonemgr
Group: Hardware/Mobile
-Source:
http://download.gnome.org/sources/gnome-phone-manager/0.67/%{name}-%{version}.tar.bz2
+Source:
http://download.gnome.org/sources/gnome-phone-manager/0.68/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gnome-phone-manager-desktop-icon-check.patch bnc337219
Patch0: gnome-phone-manager-desktop-icon-check.patch
-# PATCH-FIX-UPSTREAM gnome-phone-manager-ld_fix.patch bgo#659449
[email protected] -- Fix build with new ld
-Patch1: gnome-phone-manager-ld_fix.patch
BuildRequires: fdupes
-# needed for patch1
-BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(bluez)
@@ -83,11 +79,8 @@
%prep
%setup -q
%patch0
-%patch1
%build
-# needed for patch1
-NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static \
--disable-schemas-install
++++++ gnome-phone-manager-0.67.tar.bz2 -> gnome-phone-manager-0.68.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/ChangeLog
new/gnome-phone-manager-0.68/ChangeLog
--- old/gnome-phone-manager-0.67/ChangeLog 2011-07-05 00:00:57.000000000
+0200
+++ new/gnome-phone-manager-0.68/ChangeLog 2011-10-16 22:40:32.000000000
+0200
@@ -1,4 +1,57 @@
-commit 1c4be0d4da01f89136faa76661399402e50ca0e3
+commit ba8acb37e3e7fbd5ab4f98fd20275cc6689141d8
+Author: Daniele Forsi <[email protected]>
+Date: Sun Oct 16 19:36:47 2011 +0200
+
+ upd 0.68
+
+ * NEWS: upd
+ * configure.in: 0.68
+
+ NEWS | 8 ++++++++
+ configure.in | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 8fcd7a3e69f5e228402f3c999f43b45138cc97a9
+Author: Daniele Forsi <[email protected]>
+Date: Sun Oct 16 19:30:21 2011 +0200
+
+ Bump automake version and create tarballs compressed with xz
+
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ced60371c0e5f1dbbce2c9948db01ab5a511f8b8
+Author: Daniele Forsi <[email protected]>
+Date: Sun Oct 16 19:18:10 2011 +0200
+
+ Remove unused variable
+
+ src/ui.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit e42651b5cf634c38876391e9a10451e9710d13b1
+Author: Marcus Hüwe <[email protected]>
+Date: Sun Oct 16 19:16:16 2011 +0200
+
+ Fix build with strict linker
+
+ Closes #659449
+
+ configure.in | 2 +-
+ src/Makefile.am | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d973a9f841ccd368d8fc966893f6320636612220
+Author: Yuri Myasoedov <[email protected]>
+Date: Sat Jul 30 01:31:46 2011 +0400
+
+ Added Russian translation
+
+ po/LINGUAS | 1 +
+ po/ru.po | 424 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 425 insertions(+), 0 deletions(-)
+
+commit 3be5c82d234f826415a2c427ba0fe46c7d8f3f06
Author: Daniele Forsi <[email protected]>
Date: Mon Jul 4 23:58:17 2011 +0200
@@ -12,11 +65,14 @@
configure.in | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
-commit d2238de36c9d66d12e53b723bfe2d1f06e0c3c58
+commit 0a10cc3d1489d3d42b3500fd0e37cd0048d8c15b
Author: Jan de Groot <[email protected]>
Date: Thu Jun 30 19:54:21 2011 +0200
- Port to gtk3. This raises the required version for gnome-bluetooth to 3.0,
as this is the first released version that uses gtk3.
+ Port to gtk3.
+
+ This raises the required version for gnome-bluetooth to 3.0,
+ as this is the first released version that uses gtk3.
configure.in | 7 +++----
src/ui.c | 6 ------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/Makefile.in
new/gnome-phone-manager-0.68/Makefile.in
--- old/gnome-phone-manager-0.67/Makefile.in 2011-07-05 00:00:38.000000000
+0200
+++ new/gnome-phone-manager-0.68/Makefile.in 2011-10-16 22:40:12.000000000
+0200
@@ -99,7 +99,7 @@
done; \
reldir="$$dir2"
GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.xz
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
@@ -543,6 +543,7 @@
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
$(am__remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -550,7 +551,6 @@
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(am__remove_distdir)
@@ -569,7 +569,7 @@
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/NEWS
new/gnome-phone-manager-0.68/NEWS
--- old/gnome-phone-manager-0.67/NEWS 2011-07-05 00:00:18.000000000 +0200
+++ new/gnome-phone-manager-0.68/NEWS 2011-10-16 22:36:15.000000000 +0200
@@ -1,3 +1,11 @@
+gnome-phone-manager 0.68
+========================
+
+* Builds with strict linkers
+
+ * New translation
+ - ru Yuri Myasoedov
+
gnome-phone-manager 0.67
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/configure
new/gnome-phone-manager-0.68/configure
--- old/gnome-phone-manager-0.67/configure 2011-07-05 00:00:40.000000000
+0200
+++ new/gnome-phone-manager-0.68/configure 2011-10-16 22:40:04.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNOME Phone Manager 0.67.
+# Generated by GNU Autoconf 2.68 for GNOME Phone Manager 0.68.
#
# Report bugs to
<http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager>.
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='GNOME Phone Manager'
PACKAGE_TARNAME='gnome-phone-manager'
-PACKAGE_VERSION='0.67'
-PACKAGE_STRING='GNOME Phone Manager 0.67'
+PACKAGE_VERSION='0.68'
+PACKAGE_STRING='GNOME Phone Manager 0.68'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager'
PACKAGE_URL=''
@@ -1385,7 +1385,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNOME Phone Manager 0.67 to adapt to many kinds of
systems.
+\`configure' configures GNOME Phone Manager 0.68 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1456,7 +1456,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Phone Manager 0.67:";;
+ short | recursive ) echo "Configuration of GNOME Phone Manager 0.68:";;
esac
cat <<\_ACEOF
@@ -1601,7 +1601,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Phone Manager configure 0.67
+GNOME Phone Manager configure 0.68
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2024,7 +2024,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Phone Manager $as_me 0.67, which was
+It was created by GNOME Phone Manager $as_me 0.68, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2867,7 +2867,7 @@
# Define the identity of the package.
PACKAGE='gnome-phone-manager'
- VERSION='0.67'
+ VERSION='0.68'
cat >>confdefs.h <<_ACEOF
@@ -14009,12 +14009,12 @@
pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"telepathy-glib\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"telepathy-glib dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib dbus-glib-1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib" 2>/dev/null`
+ pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib dbus-glib-1"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -14025,12 +14025,12 @@
pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"telepathy-glib\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"telepathy-glib dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib dbus-glib-1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib" 2>/dev/null`
+ pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib dbus-glib-1"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -14050,9 +14050,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"telepathy-glib" 2>&1`
+ TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"telepathy-glib dbus-glib-1" 2>&1`
else
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --print-errors
"telepathy-glib" 2>&1`
+ TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --print-errors
"telepathy-glib dbus-glib-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TELEPATHY_PKG_ERRORS" >&5
@@ -15059,7 +15059,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Phone Manager $as_me 0.67, which was
+This file was extended by GNOME Phone Manager $as_me 0.68, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15125,7 +15125,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNOME Phone Manager config.status 0.67
+GNOME Phone Manager config.status 0.68
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/configure.in
new/gnome-phone-manager-0.68/configure.in
--- old/gnome-phone-manager-0.67/configure.in 2011-07-05 00:00:18.000000000
+0200
+++ new/gnome-phone-manager-0.68/configure.in 2011-10-16 22:36:15.000000000
+0200
@@ -1,13 +1,13 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([GNOME Phone
Manager],[0.67],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager],[gnome-phone-manager])
+AC_INIT([GNOME Phone
Manager],[0.68],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager],[gnome-phone-manager])
AC_CONFIG_SRCDIR(src/main.c)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz check-news])
dnl Initialize libtool
AM_PROG_LIBTOOL
@@ -76,7 +76,7 @@
[ENABLE_TELEPATHY=yes]) dnl Default value
if test x$ENABLE_TELEPATHY = "xyes" ; then
- PKG_CHECK_MODULES(TELEPATHY, telepathy-glib,
+ PKG_CHECK_MODULES(TELEPATHY, telepathy-glib dbus-glib-1,
[HAVE_TELEPATHY=yes], [HAVE_TELEPATHY=no])
fi
if test x$HAVE_TELEPATHY = "xyes"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-phone-manager-0.67/cut-n-paste/e-contact-entry/econtactentry-marshal.c
new/gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/econtactentry-marshal.c
---
old/gnome-phone-manager-0.67/cut-n-paste/e-contact-entry/econtactentry-marshal.c
2011-07-04 23:22:42.000000000 +0200
+++
new/gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/econtactentry-marshal.c
2011-07-06 00:10:44.000000000 +0200
@@ -53,7 +53,7 @@
#endif /* !G_ENABLE_DEBUG */
-/* VOID:OBJECT,STRING (./econtactentry-marshal.list:1) */
+/* VOID:OBJECT,STRING
(../../../cut-n-paste/e-contact-entry/econtactentry-marshal.list:1) */
extern void econtactentry_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue
*return_value,
guint
n_param_values,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/po/LINGUAS
new/gnome-phone-manager-0.68/po/LINGUAS
--- old/gnome-phone-manager-0.67/po/LINGUAS 2011-02-07 17:10:07.000000000
+0100
+++ new/gnome-phone-manager-0.68/po/LINGUAS 2011-10-16 19:10:39.000000000
+0200
@@ -25,6 +25,7 @@
pl
pt
pt_BR
+ru
rw
sk
sl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/po/ru.po
new/gnome-phone-manager-0.68/po/ru.po
--- old/gnome-phone-manager-0.67/po/ru.po 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-phone-manager-0.68/po/ru.po 2011-10-16 19:10:39.000000000
+0200
@@ -0,0 +1,424 @@
+# Russian translation for phonemgr.
+# Copyright (C) 2011 phonemgr's COPYRIGHT HOLDER
+# This file is distributed under the same license as the phonemgr package.
+# Yuri Myasoedov <[email protected]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: phonemgr master\n"
+"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2011-07-04 22:14+0000\n"
+"PO-Revision-Date: 2011-07-30 01:30+0300\n"
+"Last-Translator: Yuri Myasoedov <[email protected]>\n"
+"Language-Team: Russian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Не удалось получить контакт: %s"
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186
+#, c-format
+msgid "Could not find contact: %s"
+msgstr "Не удалось найти контакт: %s"
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414
+msgid "Cannot create searchable view."
+msgstr "Не удалось создать вид с возможностью поиска."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886
+msgid "Success"
+msgstr "Успешно"
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888
+msgid "An argument was invalid."
+msgstr "Неверный аргумент."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890
+msgid "The address book is busy."
+msgstr "Адресная книга занята."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892
+msgid "The address book is offline."
+msgstr "Адресная книга находится в автономном режиме."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894
+msgid "The address book does not exist."
+msgstr "Адресная книга не существует."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896
+msgid "The \"Me\" contact does not exist."
+msgstr "Контакт «Я» не существует."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898
+msgid "The address book is not loaded."
+msgstr "Адресная книга не загружена."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900
+msgid "The address book is already loaded."
+msgstr "Адресная книга уже загружена."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902
+msgid "Permission was denied when accessing the address book."
+msgstr "В доступе к адресной книге отказано."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904
+msgid "The contact was not found."
+msgstr "Контакт не найден."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906
+msgid "This contact ID already exists."
+msgstr "Контакт с таким ID уже существует."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908
+msgid "The protocol is not supported."
+msgstr "Протокол не поддерживается."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910
+msgid "The operation was cancelled."
+msgstr "Операция отменена."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912
+msgid "The operation could not be cancelled."
+msgstr "Операция не может быть отменена."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914
+msgid "The address book authentication failed."
+msgstr "Сбой аутентификации адресной книги."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:916
+msgid "Authentication is required to access the address book and was not
given."
+msgstr "Для доступа к адресной книге требуется аутентификация, которая не была
предоставлена."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918
+msgid "A secure connection is not available."
+msgstr "Безопасное соединение недоступно."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920
+msgid "A CORBA error occurred whilst accessing the address book."
+msgstr "При попытке получения доступа к адресной книге произошла ошибка CORBA."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922
+msgid "The address book source does not exist."
+msgstr "Источник адресной книги не существует."
+
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:924
+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:927
+msgid "An unknown error occurred."
+msgstr "Произошла неизвестная ошибка."
+
+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233
+#, c-format
+msgid "GConf error: %s"
+msgstr "Ошибка GConf: %s"
+
+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238
+msgid "All further errors shown only on terminal."
+msgstr "Все последующие ошибки показаны только в терминале."
+
+#. Translators: "device" is a phone or a modem
+#: ../gnome-bluetooth/phonemgr.c:133
+msgid "Use this device with Phone Manager"
+msgstr "Использовать это устройство с Phone Manager"
+
+#. translators: the '%s' will be substituted with '/dev/ttyS0'
+#. or similar
+#: ../src/connection.c:124
+#, c-format
+msgid "Connected to device on %s"
+msgstr "Устройство подключено к %s"
+
+#. the ERROR signal will have been emitted, so we don't
+#. bother changing the icon ourselves at this point
+#. translators: the '%s' will be substituted with '/dev/ttyS0'
+#. or similar
+#: ../src/connection.c:130
+#, c-format
+msgid "Failed connection to device on %s"
+msgstr "Не удалось подключиться к устройству через %s"
+
+#: ../src/gnome-phone-manager.desktop.in.h:1
+#: ../src/menu.c:50
+#: ../src/menu.c:52
+msgid "Phone Manager"
+msgstr "Phone Manager"
+
+#: ../src/gnome-phone-manager.desktop.in.h:2
+msgid "Receive and send text messages from your mobile phone"
+msgstr "Получайте и отправляйте текстовые сообщения со своего мобильного
телефона"
+
+#: ../src/icon.c:59
+msgid "Message arrived"
+msgstr "Получно сообщение"
+
+#: ../src/icon.c:62
+msgid "Connected"
+msgstr "Подключено"
+
+#: ../src/icon.c:66
+msgid "Connecting to phone"
+msgstr "Подключение к телефону"
+
+#: ../src/icon.c:70
+msgid "Not connected"
+msgstr "Не подключено"
+
+#: ../src/main.c:38
+msgid "Show model name of a specific device"
+msgstr "Показать название модели определённого устройства"
+
+#: ../src/main.c:38
+#: ../src/main.c:39
+msgid "PORT"
+msgstr "ПОРТ"
+
+#: ../src/main.c:39
+msgid "Write the configuration file for gnokii debugging"
+msgstr "Записать файл с настройками для отладки gnokii"
+
+#: ../src/main.c:40
+msgid "Enable debug"
+msgstr "Включить отладку"
+
+#: ../src/main.c:41
+msgid "Show version information and exit"
+msgstr "Показать номер версии и выйти"
+
+#: ../src/main.c:60
+msgid "- Manage your mobile phone"
+msgstr "- Manage your mobile phone"
+
+#: ../src/main.c:74
+#, c-format
+msgid "gnome-phone-manager version %s\n"
+msgstr "gnome-phone-manager версии %s\n"
+
+#: ../src/menu.c:43
+msgid "Send and receive messages from your mobile phone."
+msgstr "Отправка и получение сообщений с мобильного телефона."
+
+#: ../src/menu.c:55
+msgid "translator_credits"
+msgstr "Юрий Мясоедов <[email protected]>"
+
+#: ../src/menu.c:57
+msgid "Phone Manager website"
+msgstr "Веб-сайт Phone Manager"
+
+#: ../src/menu.c:88
+msgid "_Send Message"
+msgstr "_Отправить сообщение"
+
+#: ../src/ui.c:110
+msgid "New text message received"
+msgstr "Получено новое текстовое сообщение"
+
+#: ../src/ui.c:276
+msgid "Message too long!"
+msgstr "Слишком длинное сообщение!"
+
+#: ../data/phonemgr.ui.h:1
+msgid "Alerting"
+msgstr "Уведомления"
+
+#: ../data/phonemgr.ui.h:2
+msgid "Alternative device filename, e.g. /dev/ttyS3"
+msgstr "Альтернативное имя файла устройства, напр. /dev/ttyS3"
+
+#: ../data/phonemgr.ui.h:3
+msgid "Always try and reconnect whenever a connection is not immediately
available. Use this with Bluetooth to ensure your phone connects whenever it
comes in range."
+msgstr "Всегда пробовать и переподключаться, когда соединение недоступно.
Используйте Bluetooth, чтобы телефон подключался, когда он становится
доступным."
+
+#: ../data/phonemgr.ui.h:4
+msgid "Automated Tasks"
+msgstr "Автоматические задачи"
+
+#: ../data/phonemgr.ui.h:5
+msgid "Automatically _retry connections"
+msgstr "Автоматически _переподключаться"
+
+#: ../data/phonemgr.ui.h:6
+msgid "Characters left:"
+msgstr "Осталось символов:"
+
+#: ../data/phonemgr.ui.h:7
+msgid "Connect using an alternative serial device"
+msgstr "Подключиться, используя альтернативное последовательное устройство"
+
+#: ../data/phonemgr.ui.h:8
+msgid "Connect using infrared communication"
+msgstr "Подключиться с помощью ИК-интерфейса"
+
+#: ../data/phonemgr.ui.h:9
+msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+msgstr "Подключиться через 1-й последовательный порт (COM1 или /dev/ttyS0)"
+
+#: ../data/phonemgr.ui.h:10
+msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+msgstr "Подключиться через 2-й последовательный порт (COM2 или /dev/ttyS1)"
+
+#: ../data/phonemgr.ui.h:11
+msgid "Connection"
+msgstr "Подключение"
+
+#: ../data/phonemgr.ui.h:12
+msgid "Date:"
+msgstr "Дата:"
+
+#: ../data/phonemgr.ui.h:13
+msgid "Enter the text message you want to send."
+msgstr "Введите текстовое сообщение, которое хотите отправить."
+
+#: ../data/phonemgr.ui.h:14
+msgid "Enter your text message"
+msgstr "Введите текстовое сообщение"
+
+#: ../data/phonemgr.ui.h:15
+msgid "I_nfra red (/dev/ircomm0)"
+msgstr "_ИК (/dev/ircomm0)"
+
+#: ../data/phonemgr.ui.h:16
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../data/phonemgr.ui.h:17
+msgid "Message Received"
+msgstr "Получено сообщение"
+
+#: ../data/phonemgr.ui.h:18
+msgid "Other _port"
+msgstr "Другой _порт"
+
+#: ../data/phonemgr.ui.h:19
+msgid "Phone Connection"
+msgstr "Подключение к телефону"
+
+#: ../data/phonemgr.ui.h:20
+msgid "Phone Manager Preferences"
+msgstr "Настройки Phone Manager"
+
+#: ../data/phonemgr.ui.h:21
+msgid "Play _sound when messages arrive"
+msgstr "_Воспроизводить звук при получении сообщений"
+
+#: ../data/phonemgr.ui.h:22
+msgid "Send Message"
+msgstr "Отправить сообщение"
+
+#: ../data/phonemgr.ui.h:23
+msgid "Sender:"
+msgstr "Отправитель:"
+
+#: ../data/phonemgr.ui.h:24
+msgid "Serial port _1 (/dev/ttyS0)"
+msgstr "Последовательный порт _1 (/dev/ttyS0)"
+
+#: ../data/phonemgr.ui.h:25
+msgid "Serial port _2 (/dev/ttyS1)"
+msgstr "Последовательный порт _2 (/dev/ttyS0)"
+
+#: ../data/phonemgr.ui.h:26
+msgid "Synchronise phone's _time and date"
+msgstr "Синхронизировать время и дату на телефоне"
+
+#: ../data/phonemgr.ui.h:27
+msgid "Synchronise phone's time and date with the computer's clock"
+msgstr "Синхронизировать время и дату на телефоне с часами на компьютере"
+
+#: ../data/phonemgr.ui.h:28
+msgid "Use Bluetooth wireless networking to connect to your phone"
+msgstr "Использовать Bluetooth для подключения к телефону"
+
+#: ../data/phonemgr.ui.h:29
+msgid "You have received a message"
+msgstr "Вы получили сообщение"
+
+#: ../data/phonemgr.ui.h:30
+msgid "_Bluetooth"
+msgstr "_Bluetooth"
+
+#: ../data/phonemgr.ui.h:31
+msgid "_Message:"
+msgstr "_Сообщение:"
+
+#. This is a receipt from the SMS server saying the message has been delivered
to the recipient's phone
+#: ../data/phonemgr.ui.h:33
+msgid "_Notify when message is delivered"
+msgstr "_Уведомлять о доставке сообщений"
+
+#: ../data/phonemgr.ui.h:34
+msgid "_Pop-up window for new messages"
+msgstr "_Показывать всплывающее окно при получении новых сообщений"
+
+#: ../data/phonemgr.ui.h:35
+msgid "_Recipient:"
+msgstr "_Получатель:"
+
+#: ../data/phonemgr.ui.h:36
+msgid "_Reply"
+msgstr "_Ответить"
+
+#: ../data/phonemgr.ui.h:37
+msgid "_Send"
+msgstr "_Отправить"
+
+#: ../data/gnome-phone-manager.schemas.in.h:1
+msgid "Bluetooth address of the device to connect to"
+msgstr "Bluetooth-адрес устройства, к которому необходимо подключиться"
+
+#: ../data/gnome-phone-manager.schemas.in.h:2
+msgid "Bluetooth address of the device to connect to. Requires connection_type
to be 1 to be used."
+msgstr "Адрес bluetooth-устройства, к которому необходимо подключиться. Ключ
connection_type должен иметь значение «1»."
+
+#: ../data/gnome-phone-manager.schemas.in.h:3
+msgid "The connection type used by gnome-phone-manager"
+msgstr "Тип подключения, используемый gnome-phone-manager"
+
+#: ../data/gnome-phone-manager.schemas.in.h:4
+msgid "The connection type used by gnome-phone-manager: Bluetooth is 0 Serial
1 is 1 Serial 2 is 2 IrDa is 3 Other connection types are 4"
+msgstr "Тип подключения, используемый gnome-phone-manager: 0 — Bluetooth; 1 —
Serial 1; 2 — Serial 2; 3 — Serial 3; 4 — другой тип подключения."
+
+#: ../data/gnome-phone-manager.schemas.in.h:5
+msgid "The device node for the serial device to connect to"
+msgstr "Узел последовательного устройства, к которому необходимо подключиться"
+
+#: ../data/gnome-phone-manager.schemas.in.h:6
+msgid "The device node for the serial device to connect to. Requires
connection_type to be 4 to be used."
+msgstr "Узел устройства для подключения к последовательному устройству. Ключ
connection_type должен иметь значение «4»."
+
+#: ../data/gnome-phone-manager.schemas.in.h:7
+msgid "Whether to play a sound alert when a new message comes in"
+msgstr "Воспроизводить ли звуковое уведомление при получении новых сообщений"
+
+#: ../data/gnome-phone-manager.schemas.in.h:8
+msgid "Whether to play a sound alert when a new message comes in."
+msgstr "Воспроизводить ли звуковое уведомление при получении новых сообщений."
+
+#: ../data/gnome-phone-manager.schemas.in.h:9
+msgid "Whether to popup new messages on the desktop"
+msgstr "Показывать ли всплывающие сообщения на рабочем столе"
+
+#: ../data/gnome-phone-manager.schemas.in.h:10
+msgid "Whether to popup new messages on the desktop as soon as they're
received, as opposed to showing them when clicking on the tray icon."
+msgstr "Показывать ли всплывающие сообщения на рабочем столе при получении,
или показывать их только при щелчке по значку в системном лотке."
+
+#: ../data/gnome-phone-manager.schemas.in.h:11
+msgid "Whether to retry connecting to the mobile phone"
+msgstr "Подключиться ли повторно к мобильному телефону"
+
+#: ../data/gnome-phone-manager.schemas.in.h:12
+msgid "Whether to retry connecting to the mobile phone if the connection fails
at some point."
+msgstr "Подключиться ли повторно к мобильному телефону, если обрывается
соединение."
+
+#: ../data/gnome-phone-manager.schemas.in.h:13
+msgid "Whether to synchronise the phone clock with the computer's"
+msgstr "Выполнять ли синхронизацию часов на телефоне с часами на компьютере"
+
+#: ../data/gnome-phone-manager.schemas.in.h:14
+msgid "Whether to synchronise the phone clock with the computer's."
+msgstr "Выполнять ли синхронизацию часов на телефоне с часами на компьютере."
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/src/Makefile.am
new/gnome-phone-manager-0.68/src/Makefile.am
--- old/gnome-phone-manager-0.67/src/Makefile.am 2011-02-15
20:56:35.000000000 +0100
+++ new/gnome-phone-manager-0.68/src/Makefile.am 2011-10-16
19:14:58.000000000 +0200
@@ -31,9 +31,9 @@
phonemgr-object.h
gnome_phone_manager_LDADD = \
+ ../cut-n-paste/e-contact-entry/libecontact-entry.la \
$(PHONEMGR_LIBS) \
../libgsm/libgsmwrap.la \
- ../cut-n-paste/e-contact-entry/libecontact-entry.la \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
BUILT_SOURCES = phone-manager-interface.h
@@ -49,8 +49,9 @@
# The test program
noinst_PROGRAMS = test-entry
test_entry_SOURCES = test-entry.c e-phone-entry.c e-phone-entry.h
-test_entry_LDADD = $(PHONEMGR_LIBS) \
+test_entry_LDADD = \
../cut-n-paste/e-contact-entry/libecontact-entry.la \
+ $(PHONEMGR_LIBS) \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
BUILT_SOURCES += $(MARSHALFILES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/src/Makefile.in
new/gnome-phone-manager-0.68/src/Makefile.in
--- old/gnome-phone-manager-0.67/src/Makefile.in 2011-07-05
00:00:38.000000000 +0200
+++ new/gnome-phone-manager-0.68/src/Makefile.in 2011-10-16
22:40:12.000000000 +0200
@@ -54,14 +54,15 @@
e-phone-entry.$(OBJEXT) phonemgr-object.$(OBJEXT)
gnome_phone_manager_OBJECTS = $(am_gnome_phone_manager_OBJECTS)
am__DEPENDENCIES_1 =
-gnome_phone_manager_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- ../libgsm/libgsmwrap.la \
+gnome_phone_manager_DEPENDENCIES = \
../cut-n-paste/e-contact-entry/libecontact-entry.la \
+ $(am__DEPENDENCIES_1) ../libgsm/libgsmwrap.la \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
am_test_entry_OBJECTS = test-entry.$(OBJEXT) e-phone-entry.$(OBJEXT)
test_entry_OBJECTS = $(am_test_entry_OBJECTS)
-test_entry_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+test_entry_DEPENDENCIES = \
../cut-n-paste/e-contact-entry/libecontact-entry.la \
+ $(am__DEPENDENCIES_1) \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -292,9 +293,9 @@
phonemgr-object.h
gnome_phone_manager_LDADD = \
+ ../cut-n-paste/e-contact-entry/libecontact-entry.la \
$(PHONEMGR_LIBS) \
../libgsm/libgsmwrap.la \
- ../cut-n-paste/e-contact-entry/libecontact-entry.la \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
BUILT_SOURCES = phone-manager-interface.h $(MARSHALFILES)
@@ -302,8 +303,9 @@
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
test_entry_SOURCES = test-entry.c e-phone-entry.c e-phone-entry.h
-test_entry_LDADD = $(PHONEMGR_LIBS) \
+test_entry_LDADD = \
../cut-n-paste/e-contact-entry/libecontact-entry.la \
+ $(PHONEMGR_LIBS) \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
EXTRA_DIST = gnome-phone-manager.desktop.in org_gnome_phone_Manager.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-phone-manager-0.67/src/ui.c
new/gnome-phone-manager-0.68/src/ui.c
--- old/gnome-phone-manager-0.67/src/ui.c 2011-07-04 21:20:56.000000000
+0200
+++ new/gnome-phone-manager-0.68/src/ui.c 2011-10-16 19:16:53.000000000
+0200
@@ -321,7 +321,6 @@
void
create_send_dialog (MyApp *app, GtkDialog *parent, const char *recip)
{
- GError *err = NULL;
GtkTextBuffer *buf;
GtkTextView *view;
GtkEntry *entry;
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
