Wed Jul 6 23:10:44 UTC 2011

13 files changed, 3256 insertions, 88 deletions

diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index d2cc35459..f09d64d55 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z bisson $
+# $Id: PKGBUILD 130244 2011-07-04 19:18:20Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
-url='http://derf.homelinux.org/projects/feh/'
+url='http://feh.finalrewind.org/'
 license=('MIT')
 depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688')
+sha1sums=('55af60f35fb21825e5450b6713f5d781f7a34cde')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 78786a2ae..285a6ba8e 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 122612 2011-05-05 01:46:31Z bisson $
+# $Id: PKGBUILD 130320 2011-07-05 06:30:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
-url='http://cle.linux.org.tw/trac/'
+url='http://hyperrate.com/dir.php?eid=67'
 depends=('gtk2' 'libxtst')
 makedepends=('qt' 'gtk3' 'anthy')
 optdepends=('qt: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
-        'fix_x86_64_libdir.patch'
-        'fix_qt4_paths.patch')
-sha1sums=('50522908d3e64319baafb5317c0b4327bbe0fb18'
-          'e5c113e50420bf4750f5547641df6ec4b7e437e0'
-          '16d004424caed541d5baaa6874f708b1c138ab08')
+        'qt4-lib64.patch')
+sha1sums=('36ed067b354abb1e0707a4b327e2ad624cb6f88d'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../fix_x86_64_libdir.patch
-	patch -p1 -i ../fix_qt4_paths.patch
-	sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile
-	sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051
+	patch -p1 -i ../qt4-lib64.patch
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
new file mode 100644
index 000000000..13cb3dc15
--- /dev/null
+++ b/extra/gcin/qt4-lib64.patch
@@ -0,0 +1,40 @@
+diff -aur old/configure new/configure
+--- old/configure	2011-06-08 16:00:37.000000000 +0200
++++ new/configure	2011-07-05 08:02:33.223601351 +0200
+@@ -164,7 +164,7 @@
+ 
+ LIB='lib'
+ if [ -d /lib64 ]; then
+-LIB='lib64'
++LIB='lib'
+ fi
+ 
+ QT_IM='N'
+@@ -188,7 +188,7 @@
+ 
+ 
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
+ if [ $? = 0 ]; then
+diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile	2011-06-08 15:03:50.000000000 +0200
++++ new/qt4-im/Makefile	2011-07-05 08:04:15.717731695 +0200
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+ 
+@@ -15,7 +15,7 @@
+ 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
+ 
+ moc_gcin-qt.cpp:	gcin-qt.h
+-	/usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++	/usr/bin/moc $< -o moc_gcin-qt.cpp
+ 
+ im-gcin.so: $(OBJS)
+ 	export LD_RUN_PATH=$(gcinlibdir) ;\
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD
index ac4f8d245..fc21ea2c1 100644
--- a/extra/gnome-phone-manager/PKGBUILD
+++ b/extra/gnome-phone-manager/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 91582 2010-09-27 13:16:18Z ibiru $
+# $Id: PKGBUILD 130236 2011-07-04 15:05:37Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
-pkgver=0.65
-pkgrel=3
-pkgdesc="Control your mobile phone from your GNOME 2 desktop."
+pkgver=0.66
+pkgrel=1
+pkgdesc="Control your mobile phone from your GNOME desktop."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/PhoneManager"
 license=('GPL')
-depends=('evolution-data-server>=2.31.92' 'gnokii>=0.6.29' 'gnome-bluetooth>=2.31.90' 'gnome-icon-theme>=2.30.3' 'gtkspell' 'libcanberra>=0.25' 'libglade')
-makedepends=('intltool')
-options=('!emptydirs')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
+makedepends=('intltool' 'gnome-common')
+options=('!emptydirs' '!libtool')
 install=gnome-phone-manager.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/0.65/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7fd6854702446133511650e0a24698a71bf4096a11546a25b453d5dd74890e96')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        git-update.patch
+        gtk3.patch)
+sha256sums=('a4a389b1086e59acf5771cce5b560510d633326053dae83c20d86c2d53164c35'
+            '08d0db962b203d8e21e083a72a95b2625d2e649b25a3c0b8ba688ef517bf8638'
+            '50af2e8becfba84b8ef7684a8e4351270dca863a0e2ff94df21ba834c02c78a1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-update.patch"
+  patch -Np1 -i "${srcdir}/gtk3.patch"
+  libtoolize --force
+  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+      --localstatedir=/var --disable-static
   make
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager ${pkgdir}/etc/gconf/schemas/*.schemas
diff --git a/extra/gnome-phone-manager/git-update.patch b/extra/gnome-phone-manager/git-update.patch
new file mode 100644
index 000000000..cd2430be9
--- /dev/null
+++ b/extra/gnome-phone-manager/git-update.patch
@@ -0,0 +1,3052 @@
+diff --git a/configure.in b/configure.in
+index f43ee35..2338f4b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(TMP_EVO, libebook-1.2,
+ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $evo_pc_file)
+ 
+ PKG_CHECK_MODULES(PHONEMGR, gtk+-2.0 >= 2.18 glib-2.0 >= 2.25.0
+-	libcanberra-gtk gdk-pixbuf-2.0 gconf-2.0
++	libcanberra-gtk gconf-2.0
+ 	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ 	gtkspell-2.0
+diff --git a/data/gnome-phone-manager.1 b/data/gnome-phone-manager.1
+index abffb72..0ea62db 100644
+--- a/data/gnome-phone-manager.1
++++ b/data/gnome-phone-manager.1
+@@ -1,13 +1,13 @@
+-.TH "GNOME-PHONE-MANAGER" "1" "January 2011" "Francesco Namuri" "User Commands"
++.TH "GNOME-PHONE-MANAGER" "1" "June 2011" "Francesco Namuri" "User Commands"
+ .SH "NAME"
+ gnome\-phone\-manager \- Manage your mobile phone
+ .SH "USAGE"
+ .B gnome-phone-manager
+-[\-\-identify\ <baddr>] [\-\-config] [\-d|\-\-debug]] [\-\-display=DISPLAY]
++[\-\-identify\=PORT] [\-\-config=PORT] [\-d|\-\-debug] [\-\-display=DISPLAY]
+ .SH "DESCRIPTION"
+ This manual page documents briefly the \fBgnome\-phone\-manager\fR command.
+ 
+-\fBgnome\-phone\-manager\fR is a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop.
++\fBgnome\-phone\-manager\fR is a program created to allow you to control aspects of your mobile phone from your GNOME desktop.
+ .TP
+ Current features include:
+ .BR \-
+@@ -17,10 +17,10 @@ Runs in the background; indicates status on the panel notification area,
+ Display on\-screen alert when text message (SMS) arrives,
+ .br
+ .BR \- 
+-Text message (SMS) sending facility,
++Text message (SMS) sending facility with Evolution Addressbook integration,
+ .br
+ .BR \- 
+-Evolution Addressbook integration.
++Sync phone clock with the computer's.
+ .SH "OPTIONS"
+ .SS "Help Options:"
+ .TP 
+@@ -55,6 +55,6 @@ X display to use
+ .SH "SEE ALSO"
+ Homepage: http://live.gnome.org/PhoneManager
+ .SH "AUTHOR"
+-\fBgnome\-phone\-manager\fR was written by Bastien Nocera <<hadess@hadess.net>> and Edd Dumbill <edd@usefullinc.com>
++\fBgnome\-phone\-manager\fR was written by Bastien Nocera <hadess@hadess.net> and Edd Dumbill <edd@usefullinc.com>
+ 
+ This manual page was written by Francesco Namuri <francesco@namuri.it> for the Debian project (but may be used by others).
+diff --git a/po/da.po b/po/da.po
+index 95bfc91..e35d83c 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -1,127 +1,133 @@
+ # Danish translation for phonemgr.
+-# Copyright (C) 2009 phonemgr & Joe Hansen.
++# Copyright (C) 2011 phonemgr & Joe Hansen.
+ # This file is distributed under the same license as the phonemgr package.
+-# Joe Hansen <joedalton2@yahoo.dk>, 2009.
++# Joe Hansen <joedalton2@yahoo.dk>, 2009, 2011.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: phonemgr master\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-12-03 23:46+0100\n"
+-"PO-Revision-Date: 2009-12-01 22:41+0200\n"
++"POT-Creation-Date: 2011-03-26 14:52+0100\n"
++"PO-Revision-Date: 2011-03-17 22:41+0200\n"
+ "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+ "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
++"Language: da\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:152
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153
+ #, c-format
+ msgid "Cannot get contact: %s"
+ msgstr "Kan ikke få kontakt: %s"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:185
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186
+ #, c-format
+ msgid "Could not find contact: %s"
+ msgstr "Kunne ikke finde kontakt: %s"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:411
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414
+ msgid "Cannot create searchable view."
+ msgstr "Kan ikke oprette søgbar visning."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:883
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886
+ msgid "Success"
+ msgstr "Succes"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:885
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888
+ msgid "An argument was invalid."
+ msgstr "Et argument var ugyldigt."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:887
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890
+ msgid "The address book is busy."
+ msgstr "Adressebogen er optaget."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:889
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892
+ msgid "The address book is offline."
+ msgstr "Adressebogen er offline."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:891
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894
+ msgid "The address book does not exist."
+ msgstr "Adressebogen eksisterer ikke."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:893
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896
+ msgid "The \"Me\" contact does not exist."
+ msgstr "Kontakten \"Mig\" eksisterer ikke."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:895
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898
+ msgid "The address book is not loaded."
+ msgstr "Adressebogen er ikke indlæst."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:897
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900
+ msgid "The address book is already loaded."
+ msgstr "Adressebogen er allerede indlæst."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:899
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902
+ msgid "Permission was denied when accessing the address book."
+ msgstr "Adgang blev nægtet under tilgang til adressebogen."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:901
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904
+ msgid "The contact was not found."
+ msgstr "Kontakten blev ikke fundet."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:903
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906
+ msgid "This contact ID already exists."
+ msgstr "Dette kontakt-id eksisterer allerede."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:905
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908
+ msgid "The protocol is not supported."
+ msgstr "Protokollen er ikke understøttet."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:907
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910
+ msgid "The operation was cancelled."
+ msgstr "Handlingen blev afbrudt."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:909
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912
+ msgid "The operation could not be cancelled."
+ msgstr "Handlingen kunne ikke afbrydes."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:911
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914
+ msgid "The address book authentication failed."
+ msgstr "Godkendelse af adressebogen mislykkedes."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:913
++#: ../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 ""
+ "Godkendelse er krævet for at tilgå adressebogen og denne blev ikke givet."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:915
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918
+ msgid "A secure connection is not available."
+ msgstr "En sikker forbindelse er ikke tilgængelig."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:917
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920
+ msgid "A CORBA error occurred whilst accessing the address book."
+ msgstr "En CORBA-fejl opstod under tilgang til adressebogen."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:919
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922
+ msgid "The address book source does not exist."
+ msgstr "Adressebogkilden eksisterer ikke."
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:921
+ #: ../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 "En ukendt fejl opstod."
+ 
+-#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1221
++#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233
+ #, c-format
+ msgid "GConf error: %s"
+ msgstr "GConf-fejl: %s"
+ 
+-#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1231
++#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238
+ msgid "All further errors shown only on terminal."
+ msgstr "Alle yderligere fejl vises kun i terminal."
+ 
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Brug denne enhed med telefonhåndteringen"
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -138,7 +144,7 @@ msgstr "Forbundet til enhed på %s"
+ msgid "Failed connection to device on %s"
+ msgstr "Mislykket forbindelse til enhed på %s"
+ 
+-#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51
++#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:50 ../src/menu.c:52
+ msgid "Phone Manager"
+ msgstr "Telefonhåndtering"
+ 
+@@ -166,6 +172,10 @@ msgstr "Ikke forbundet"
+ msgid "Show model name of a specific device"
+ msgstr "Vis modelnavn på en specifik enhed"
+ 
++#: ../src/main.c:38 ../src/main.c:39
++msgid "PORT"
++msgstr "PORT"
++
+ #: ../src/main.c:39
+ msgid "Write the configuration file for gnokii debugging"
+ msgstr "Skriv konfigurationsfilen for fejlsøgning i gnokii"
+@@ -182,48 +192,48 @@ msgstr "Vis versionsinformation og afslut"
+ msgid "- Manage your mobile phone"
+ msgstr "- Håndter din mobiltelefon"
+ 
+-#: ../src/main.c:72
++#: ../src/main.c:74
+ #, c-format
+ msgid "gnome-phone-manager version %s\n"
+ msgstr "gnome-phone-manager version %s\n"
+ 
+-#: ../src/menu.c:40
++#: ../src/menu.c:43
++msgid "Send and receive messages from your mobile phone."
++msgstr "Send og modtag beskeder fra din mobiltelefon."
++
++#: ../src/menu.c:55
+ msgid "translator_credits"
+ msgstr ""
+-"Joe Hansen <joedalton2@yahoo.dk>, 2009.\n"
++"Joe Hansen, 2009, 2011.\n"
+ "\n"
+ "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
+ "Mere info: http://www.dansk-gruppen.dk"
+ 
+-#: ../src/menu.c:44
+-msgid "Send and receive messages from your mobile phone."
+-msgstr "Send og modtag beskeder fra din mobiltelefon."
+-
+-#: ../src/menu.c:56
++#: ../src/menu.c:57
+ msgid "Phone Manager website"
+ msgstr "Telefonhåndteringens hjemmeside"
+ 
+-#: ../src/menu.c:87
++#: ../src/menu.c:88
+ msgid "_Send Message"
+ msgstr "_Send besked"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "Ny tekstbesked modtaget"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Besked for lang!"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Alarmerer"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Alternativt enhedsfilnavn, for eksempel /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -233,136 +243,136 @@ msgstr ""
+ "tilgængelig. Brug denne med Bluetooth for at sikre at din telefon forbinder "
+ "så snart den er inden for rækkevidde."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "Automatiske opgaver"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "Forsøg automatisk at forbinde _igen"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Tegn tilbage:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Forbind med brug af en alternativ serielenhed"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Forbind med brug af infrarød kommunikation"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+ msgstr "Forbind med brug af serielport 1, også kendt som COM1 eller /dev/ttyS0"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+ msgstr "Forbind med brug af serielport 2, også kendt som COM2 eller /dev/ttyS1"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Forbindelse"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Dato:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Indtast tekstbeskeden du ønsker at sende."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Indtast din tekstbesked"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "I_nfrarød (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Grænseflade"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Besked modtaget"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Anden _port"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Telefonforbindelse"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Indstillinger for telefonhåndtering"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "Afspil _lyd når beskeder ankommer"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Send besked"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Afsender:"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Serielport _1 (/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Serielport _2 (/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "Synkroniser telefonens _tid og dato"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "Synkroniser telefonens tid og dato med computerens ur"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "Brug Bluetooths trådløse netværk til at forbinde til din telefon"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Du har modtaget en besked"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "_Besked:"
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "_Giv besked når besked er leveret"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "_Pop op-vindue til nye beskeder"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_Modtager:"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Svar"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Send"
+ 
+diff --git a/po/de.po b/po/de.po
+index 94da8ec..0488597 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -3,16 +3,15 @@
+ # This file is distributed under the same license as the phonemgr package.
+ # Hendrik Brandt <heb@gnome-de.org>, 2004-2005.
+ # Jens Seidel <jseidel@cvs.gnome.org>, 2005.
+-# Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
+-#
++# Mario Blättermann <mariobl@gnome.org>, 2009-2011.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: phonemgr master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "phone-manager&component=general\n"
+-"POT-Creation-Date: 2010-12-12 15:33+0000\n"
+-"PO-Revision-Date: 2010-12-17 14:50+0100\n"
++"POT-Creation-Date: 2011-02-15 20:00+0000\n"
++"PO-Revision-Date: 2011-02-26 22:23+0100\n"
+ "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+ "Language-Team: German <gnome-de@gnome.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -128,6 +127,11 @@ msgstr "GConf-Fehler: %s"
+ msgid "All further errors shown only on terminal."
+ msgstr "Alle weiteren Fehlermeldungen werden nur im Terminal angezeigt."
+ 
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Dieses Gerät mit der Telefonverwaltung verwenden"
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -172,14 +176,14 @@ msgstr "Nicht verbunden"
+ msgid "Show model name of a specific device"
+ msgstr "Modellname eines bestimmten Geräts anzeigen"
+ 
++#: ../src/main.c:38 ../src/main.c:39
++msgid "PORT"
++msgstr "PORT"
++
+ #: ../src/main.c:39
+ msgid "Write the configuration file for gnokii debugging"
+ msgstr "Konfigurationsdatei für gnokii-Debugging schreiben"
+ 
+-#: ../src/main.c:39
+-msgid "PORT"
+-msgstr "PORT"
+-
+ #: ../src/main.c:40
+ msgid "Enable debug"
+ msgstr "Debugging aktivieren"
+@@ -192,7 +196,7 @@ msgstr "Versionsinformationen anzeigen und beenden"
+ msgid "- Manage your mobile phone"
+ msgstr "- Verwalten Ihres Mobiltelefons"
+ 
+-#: ../src/main.c:72
++#: ../src/main.c:74
+ #, c-format
+ msgid "gnome-phone-manager version %s\n"
+ msgstr "gnome-phone-manager version %s\n"
+@@ -216,23 +220,23 @@ msgstr "Phone-Manager-Webseite"
+ msgid "_Send Message"
+ msgstr "Nachrichten _senden"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "Neue Nachricht erhalten"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Ihre Nachricht ist zu lang!"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Benachrichtigung"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Anderer Gerätename, z.B. /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -243,142 +247,142 @@ msgstr ""
+ "dass Ihr Telefon jedes Mal verbunden wird, sobald es in Bluetooth-Reichweite "
+ "kommt."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "Automatisierte Aufgaben"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "Verbindung automatisch wieder herstellen"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Verbleibende Zeichen:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Zum Verbinden ein anderes serielles Gerät verwenden"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Zum Verbinden die Infrarotschnittstelle verwenden"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+ msgstr ""
+ "Zum Verbinden die serielle Schnittstelle 1 verwenden (auch COM1 oder /dev/"
+ "ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+ msgstr ""
+ "Zum Verbinden die serielle Schnittstelle 2 verwenden (auch COM2 oder /dev/"
+ "ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Verbindung"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Datum:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Bitte geben Sie die zu verschickende Textnachricht ein."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Bitte geben Sie Ihre Textnachricht ein"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "_Infrarot (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Schnittstelle"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Nachricht erhalten"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Anderer _Port"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Telefonverbindung"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Einstellungen der Telefonverwaltung"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "Einen _Klang abspielen, wenn eine neue Nachricht eintrifft"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Nachricht versenden"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Sender:"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Serielle Schnittstelle _1 (/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Serielle Schnittstelle _2 (/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "Zei_t und Datum des Mobiltelefons abgleichen"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "Abgleich der Uhr des Telefons mit der des Rechners"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr ""
+ "Wenn diese Option ausgewählt ist, wird das drahtlose Bluetooth-Netzwerk "
+ "verwendet, um eine Verbindung mit Ihrem Telefon herzustellen"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Sie haben eine Nachricht erhalten"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "_Nachricht:"
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "Be_nachrichtigen, wenn eine neue Nachricht eintrifft"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "_Dialogfenster für neue Nachrichten"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_Empfänger:"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Antworten"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Senden"
+ 
+@@ -461,163 +465,3 @@ msgid "Whether to synchronise the phone clock with the computer's."
+ msgstr ""
+ "Legt fest, ob die Uhr des Telefons mit der des Rechners abgeglichen werden "
+ "soll."
+-
+-#~ msgid "Selection mode"
+-#~ msgstr "Auswahlmodus"
+-
+-#~ msgid "The selection mode"
+-#~ msgstr "Der Auswahlmodus"
+-
+-#~ msgid "Sorted"
+-#~ msgstr "Geordnet"
+-
+-#~ msgid "Icon list is sorted"
+-#~ msgstr "Symbolliste ist geordnet"
+-
+-#~ msgid "Sort order"
+-#~ msgstr "Sortierreihenfolge"
+-
+-#~ msgid "Sort direction the icon list should use"
+-#~ msgstr "Sortierrichtung der Symbolliste"
+-
+-#~ msgid "Icon padding"
+-#~ msgstr "Symbolabstand"
+-
+-#~ msgid "Number of pixels between icons"
+-#~ msgstr "Anzahl der Pixel zwischen zwei Symbolen"
+-
+-#~ msgid "Top margin"
+-#~ msgstr "Oberer Rand"
+-
+-#~ msgid "Number of pixels in top margin"
+-#~ msgstr "Anzahl der Pixel des oberen Randes"
+-
+-#~ msgid "Bottom margin"
+-#~ msgstr "Unterer Rand"
+-
+-#~ msgid "Number of pixels in bottom margin"
+-#~ msgstr "Anzahl der Pixel des unteren Randes"
+-
+-#~ msgid "Left margin"
+-#~ msgstr "Linker Rand"
+-
+-#~ msgid "Number of pixels in left margin"
+-#~ msgstr "Anzahl der Pixel des linken Randes"
+-
+-#~ msgid "Right margin"
+-#~ msgstr "Rechter Rand"
+-
+-#~ msgid "Number of pixels in right margin"
+-#~ msgstr "Anzahl der Pixel des rechten Randes"
+-
+-#~ msgid "Selection Box Color"
+-#~ msgstr "Auswahlboxfarbe"
+-
+-#~ msgid "Color of the selection box"
+-#~ msgstr "Die Farbe der Auswahlbox"
+-
+-#~ msgid "Selection Box Alpha"
+-#~ msgstr "Auswahlbox-Alphakanal"
+-
+-#~ msgid "Opacity of the selection box"
+-#~ msgstr "Deckkraft der Auswahlbox"
+-
+-#~ msgid "Pixbuf"
+-#~ msgstr "Pixbuf"
+-
+-#~ msgid "A GdkPixbuf to display"
+-#~ msgstr "Ein anzuzeigender  GdkPixbuf"
+-
+-#~ msgid "Filename"
+-#~ msgstr "Dateiname"
+-
+-#~ msgid "Filename to load and display"
+-#~ msgstr "Der Name der zu ladende und anzuzeigende Datei"
+-
+-#~ msgid "Stock ID"
+-#~ msgstr "Stock ID"
+-
+-#~ msgid "Stock ID for a stock image to display"
+-#~ msgstr "Stock ID für ein anzuzeigendes Stock-Image"
+-
+-#~ msgid "Animation"
+-#~ msgstr "Animation"
+-
+-#~ msgid "GdkPixbufAnimation to display"
+-#~ msgstr "Eine anzuzeigende GdkPixbufAnimation"
+-
+-#~ msgid "Image type"
+-#~ msgstr "Bildtyp"
+-
+-#~ msgid "The representation being used for image data"
+-#~ msgstr "Die zu verwendende Darstellung für Bilddaten"
+-
+-#~ msgid "Size"
+-#~ msgstr "Größe"
+-
+-#~ msgid "The size of the icon"
+-#~ msgstr "Die Größe des Symbols"
+-
+-#~ msgid "Blinking"
+-#~ msgstr "Blinkend"
+-
+-#~ msgid "Whether or not the status icon is blinking"
+-#~ msgstr "Legen Sie hier fest, ob das Statussymbol blinken soll"
+-
+-#~ msgid "Orientation"
+-#~ msgstr "Ausrichtung"
+-
+-#~ msgid "The orientation of the tray."
+-#~ msgstr "Die Ausrichtung des Benachrichtigungsfeldes"
+-
+-#~ msgid ""
+-#~ "<span weight=\"bold\" size=\"larger\">Couldn't find notification area</"
+-#~ "span>\n"
+-#~ "\n"
+-#~ "Phone Manager uses the notification area to display information and "
+-#~ "provide access to message sending and preferences. You can add it by right-"
+-#~ "clicking on your panel and choosing <i>Add to Panel -> Utility -> "
+-#~ "Notification Area</i>."
+-#~ msgstr ""
+-#~ "<span weight=\"bold\" size=\"larger\">Benachrichtigungsfeld konnte nicht "
+-#~ "gefunden werden</span>\n"
+-#~ "\n"
+-#~ "Die Telefonverwaltung verwendet das Benachrichtigungsfeld um Informationen "
+-#~ "anzuzeigen und außerdem um es Ihnen zu ermöglichen Nachrichten zu "
+-#~ "versenden und Einstellungen vorzunehmen. Sie können das "
+-#~ "Benachrichtigungsfeld zu Ihrem Panel hinzufügen, in dem Sie es mit der "
+-#~ "rechten Maustaste anklicken, »Zum Panel hinzufügen...« auswählen und "
+-#~ "anschließend im erscheindenen Dialog»Benachrichtigungsfeld« markieren und "
+-#~ "es mit »Hinzufügen« hinzufügen."
+-
+-#~ msgid "Couldn't create phone listener."
+-#~ msgstr "Der Telefonempfänger konnte nicht angelegt werden."
+-
+-#~ msgid "No Bluetooth device chosen."
+-#~ msgstr "Es wurde kein Bluetooth-Gerät ausgewählt."
+-
+-#~ msgid "/dev/ttyS2"
+-#~ msgstr "/dev/ttyS2"
+-
+-#~ msgid "<b>Error Handling</b>"
+-#~ msgstr "<b>Fehlerbehandlung</b>"
+-
+-#~ msgid "<span weight=\"bold\" size=\"larger\">Enter your text message</span>"
+-#~ msgstr ""
+-#~ "<span weight=\"bold\" size=\"larger\">Bitte geben Sie Ihre Textnachricht "
+-#~ "ein</span>"
+-
+-#~ msgid ""
+-#~ "<span weight=\"bold\" size=\"larger\">You have received a message</span>"
+-#~ msgstr ""
+-#~ "<span weight=\"bold\" size=\"larger\">Sie haben eine Nachricht erhalten</"
+-#~ "span>"
+-
+-#~ msgid "Choo_se"
+-#~ msgstr "Au_swählen"
+-
+-#~ msgid "Number of characters left in the message"
+-#~ msgstr "Die Anzahl der Zeichen, die für diese Nachricht verbleiben"
+-
+-#~ msgid "message body"
+-#~ msgstr "Nachrichtenkörper"
+diff --git a/po/fr.po b/po/fr.po
+index cfacc58..a723c09 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -1,20 +1,21 @@
+ # French translation of phonemgr.
+-# Copyright (C) 2003-2009 The Free Software Foundation, Inc.
++# Copyright (C) 2003-2011 The Free Software Foundation, Inc.
+ # This file is distributed under the GNU General Public License Version 2.
+ #
+ # Gaël Chamoulaud (strider) <strider@freespiders.org>, 2003.
+ # Audrey Simons <asimons@redhat.com>, 2004.
+ # Jonathan Ernst <jonathan@ernstfamily.ch>, 2006.
+ # Robert-André Mauchin <zebob.m@pengzone.org>, 2007-2008.
++# Bruno Brouard <annoa.b@gmail.com>, 2011.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: phonemgr 0.4\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "phone-manager&component=general\n"
+-"POT-Creation-Date: 2010-12-12 15:33+0000\n"
+-"PO-Revision-Date: 2009-10-16 23:38+0200\n"
+-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
++"POT-Creation-Date: 2011-02-15 20:00+0000\n"
++"PO-Revision-Date: 2011-03-20 12:51+0100\n"
++"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
+ "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -128,6 +129,11 @@ msgstr "Erreur GConf : %s"
+ msgid "All further errors shown only on terminal."
+ msgstr "Toutes les futures erreurs apparaissent uniquement dans le terminal."
+ 
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Utiliser ce périphérique avec Phone Manager"
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -173,14 +179,14 @@ msgstr "Non connecté"
+ msgid "Show model name of a specific device"
+ msgstr "Afficher le modèle d'un périphérique spécifique"
+ 
++#: ../src/main.c:38 ../src/main.c:39
++msgid "PORT"
++msgstr "PORT"
++
+ #: ../src/main.c:39
+ msgid "Write the configuration file for gnokii debugging"
+ msgstr "Écrire le fichier de configuration pour le débogage de gnokii"
+ 
+-#: ../src/main.c:39
+-msgid "PORT"
+-msgstr "PORT"
+-
+ #: ../src/main.c:40
+ msgid "Enable debug"
+ msgstr "Activer le débogage"
+@@ -193,7 +199,7 @@ msgstr "Afficher les informations de version et quitter"
+ msgid "- Manage your mobile phone"
+ msgstr "- Gestion de votre téléphone portable"
+ 
+-#: ../src/main.c:72
++#: ../src/main.c:74
+ #, c-format
+ msgid "gnome-phone-manager version %s\n"
+ msgstr "gnome-phone-manager version %s\n"
+@@ -218,23 +224,23 @@ msgstr "Site Web de Phone Manager"
+ msgid "_Send Message"
+ msgstr "Envoyer le me_ssage"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "Nouveau message texte reçu"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Message trop long !"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Avertir"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Autre fichier de périphérique, par exemple /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -244,138 +250,138 @@ msgstr ""
+ "immédiatement disponible. Utilisez ceci avec Bluetooth afin de vous assurer "
+ "que votre téléphone se connecte dès qu'il devient à portée."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "Tâches automatisées"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "Tentatives de _reconnexion automatiques"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Caractères restants :"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Se connecter par un autre périphérique série"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Se connecter par communication infrarouge"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+ msgstr "Se connecter par le port série 1, aussi appelé COM1 ou /dev/ttyS0"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+ msgstr "Se connecter par le port série 2, aussi appelé COM2 ou /dev/ttyS1"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Connexion"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Date :"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Saisissez le message texte à envoyer."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Saisissez le message texte"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "I_nfrarouge (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Interface"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Message reçu"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Autre _port"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Connexion au téléphone"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Préférences de Phone Manager"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "Jouer un _son à l'arrivée d'un message"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Envoyer le message"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Expéditeur :"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Port série _1 (/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Port série _2 (/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "Synchroniser l'_heure et la date du téléphone"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr ""
+ "Synchronise l'heure et la date du téléphone avec celles de l'ordinateur"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr ""
+ "Utiliser la communication Bluetooth pour se connecter à votre téléphone"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Vous avez reçu un message"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "_Message :"
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "_Demander un accusé de réception"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "Afficher les nouveaux messages dans une fenêtre _pop-up"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "Destinatai_re :"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Répondre"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Envoyer"
+ 
+@@ -413,7 +419,7 @@ msgid ""
+ "The device node for the serial device to connect to. Requires "
+ "connection_type to be 4 to be used."
+ msgstr ""
+-"Le nœud de périphérique pour le périphérique série auquel se connecter."
++"Le nœud de périphérique pour le périphérique série auquel se connecter. "
+ "Nécessite que « connection_type » soit défini à 4 pour être utilisé."
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:7
+diff --git a/po/he.po b/po/he.po
+index e73207c..384af21 100644
+--- a/po/he.po
++++ b/po/he.po
+@@ -6,14 +6,14 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-phone-manager\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2011-01-26 17:39+0200\n"
+-"PO-Revision-Date: 2011-01-26 18:02+0200\n"
++"POT-Creation-Date: 2011-02-28 19:27+0200\n"
++"PO-Revision-Date: 2011-02-28 19:27+0200\n"
+ "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+ "Language-Team: Gezer (Hebrew) <gezer@lists.launchpad.net>\n"
+-"Language: he\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"Language: he\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ "X-Generator: Virtaal 0.7.0-beta4\n"
+ "X-Project-Style: gnome\n"
+@@ -126,6 +126,11 @@ msgstr "שגיאת GConf:‏ %s"
+ 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
+@@ -142,7 +147,7 @@ msgstr "מחובר להתקן שב־%s"
+ msgid "Failed connection to device on %s"
+ msgstr "החיבור להתקן שב־%s נכשל"
+ 
+-#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51
++#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:51 ../src/menu.c:53
+ msgid "Phone Manager"
+ msgstr "מנהל הטלפונים"
+ 
+@@ -203,31 +208,31 @@ msgstr "ירון שהרבני <sh.yaron@gmail.com>"
+ msgid "Send and receive messages from your mobile phone."
+ msgstr "קבלה ושליחה של הודעות טקסט אל ומהטלפון הנייד שלך."
+ 
+-#: ../src/menu.c:56
++#: ../src/menu.c:58
+ msgid "Phone Manager website"
+ msgstr "האתר של מנהל הטלפונים"
+ 
+-#: ../src/menu.c:87
++#: ../src/menu.c:89
+ msgid "_Send Message"
+ msgstr "_שליחת הודעה"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "התקבלה הודעת טקסט חדשה"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "ההודעה ארוכה מדי!"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "התרעה"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "שם חלופי להתקן, לדוגמה ‎/dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -236,136 +241,136 @@ msgstr ""
+ "תמיד יש לנסות להתחבר מחדש כאשר החיבור אינו זמין באותו הרגע. יש להשתמש "
+ "בבלוטות׳ כדי לוודא שהטלפון שלך מתחבר מתי שהוא נכנס לטווח."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "משימות אוטומטיות"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "ני_סיון התחברות חוזר"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "תווים שנותרו:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "התחברות באמצעות התקן טורי חלופי"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "התחברות באמצעות תקשורת אינפרא אדום"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../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.glade.h:10
++#: ../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.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "חיבור"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "תאריך:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "נא להזין את הודעה הטקסט אותה ברצונך לשלוח."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "נא להזין את הודעה הטקסט שלך"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "_אינפרא אדום (‎/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "מנשק"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "התקבלה הודעה"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "_פתחה אחרת"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "חיבור טלפון"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "העדפות מנהל הטלפונים"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "השמעת _צליל בעת קבלת הודעות"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "שליחת הודעה"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "שולח"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "יציאה טורית _1 (‎/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "יציאה טורית _2 (‎/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "סנכרון ה_זמן והתאריך של הטלפון"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "סנכרון השעה והתאריך של הטלפון שלך עם אלו של שעון המחשב"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "שימוש ברשת בלוטות׳ אלחוטית כדי להתחבר לטלפון שלך"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "קיבלת הודעה"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_בלוטות׳"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../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.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "ה_צגת התרעה בעת קבלת הודעה"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "ה_קפצת חלון עם קבלת הודעות חדשות"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_נמען:"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "ת_גובה"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_שליחה"
+ 
+diff --git a/po/lv.po b/po/lv.po
+index 373a0ab..d93632f 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -3,25 +3,140 @@
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+ # Raivis Dejus <orvils@gmail.com>, 2008.
++# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-phone-manager\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2008-08-11 00:58+0300\n"
+-"PO-Revision-Date: 2008-08-11 13:18+0300\n"
+-"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
++"cgi?product=gnome-phone-manager&component=general\n"
++"POT-Creation-Date: 2011-02-15 20:00+0000\n"
++"PO-Revision-Date: 2011-03-31 19:23+0300\n"
++"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs@gmail.com>\n"
+ "Language-Team: Latvian <locale@laka.lv>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Poedit-Language: Latvian\n"
+ "X-Poedit-Country: LATVIA\n"
+-"X-Generator: KBabel 1.11.4\n"
+-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
++"X-Generator: Lokalize 1.1\n"
++"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
++"2);\n"
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153
++#, c-format
++msgid "Cannot get contact: %s"
++msgstr "Nevaru dabūt kontaktinformāciju: %s"
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186
++#, c-format
++msgid "Could not find contact: %s"
++msgstr "Nevaru atrast kontaktinformāciju: %s"
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414
++msgid "Cannot create searchable view."
++msgstr "Nevaru izveidot meklējamu skatu."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886
++msgid "Success"
++msgstr "Veiksmīgi"
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888
++msgid "An argument was invalid."
++msgstr "Nepareiza argumenta vērtība."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890
++msgid "The address book is busy."
++msgstr "Pieslēgums adrešu grāmatai ir aizņemts."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892
++msgid "The address book is offline."
++msgstr "Adrešu grāmata ir atsaistē."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894
++msgid "The address book does not exist."
++msgstr "Adrešu grāmata neeksistē."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896
++msgid "The \"Me\" contact does not exist."
++msgstr "\"Mana\" kontaktinformācija nav atrodama."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898
++msgid "The address book is not loaded."
++msgstr "Adrešu grāmata nav ielādēta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900
++msgid "The address book is already loaded."
++msgstr "Adrešu grāmata jau ir ielādēta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902
++msgid "Permission was denied when accessing the address book."
++msgstr "Pieeja adrešu grāmatai liegta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904
++msgid "The contact was not found."
++msgstr "Kontaktinformācija nav atrasta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906
++msgid "This contact ID already exists."
++msgstr "Kontaktinformācijas ID jau eksistē."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908
++msgid "The protocol is not supported."
++msgstr "Protokols netiek atbalstīts."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910
++msgid "The operation was cancelled."
++msgstr "Darbība tika atcelta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912
++msgid "The operation could not be cancelled."
++msgstr "Pieprasīto operāciju nevar atcelt."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914
++msgid "The address book authentication failed."
++msgstr "Adrešu grāmatas autentifikācija neizdevās."
++
++#: ../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 ""
++"Lai lasītu adrešu grāmatu, bija nepieciešama autentificēšanās, kura netika "
++"nodrošināta."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918
++msgid "A secure connection is not available."
++msgstr "Drošs savienojums nav pieejams."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920
++msgid "A CORBA error occurred whilst accessing the address book."
++msgstr "Lasot adrešu grāmatu, notikusi CORBA kļūda."
++
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922
++msgid "The address book source does not exist."
++msgstr "Adrešu grāmatas primārais dokuments neeksistē."
++
++#: ../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 "Atgadījās nezināma kļūda."
++
++#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233
++#, c-format
++msgid "GConf error: %s"
++msgstr "GConf kļūda: %s"
++
++#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238
++msgid "All further errors shown only on terminal."
++msgstr "Visas turpmākās kļūdas tiks parādītas tikai terminālī."
++
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Izmantot šo ierīci ar Tālruņa pārvaldnieku"
+ 
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+-#: ../src/connection.c:113
++#: ../src/connection.c:124
+ #, c-format
+ msgid "Connected to device on %s"
+ msgstr "Savienots ar iekārtu %s"
+@@ -30,23 +145,12 @@ msgstr "Savienots ar iekārtu %s"
+ #. bother changing the icon ourselves at this point
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+-#: ../src/connection.c:119
++#: ../src/connection.c:130
+ #, c-format
+ msgid "Failed connection to device on %s"
+ msgstr "Neizdevās savienoties ar iekārtu %s"
+ 
+-#: ../src/gconf-bridge.c:1218
+-#, c-format
+-msgid "GConf error: %s"
+-msgstr "GConf kļūda: %s"
+-
+-#: ../src/gconf-bridge.c:1228
+-msgid "All further errors shown only on terminal."
+-msgstr "Visas turpmākās kļūdas tiks parādītas tikai terminālī."
+-
+-#: ../src/gnome-phone-manager.desktop.in.h:1
+-#: ../src/menu.c:49
+-#: ../src/menu.c:51
++#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51
+ msgid "Phone Manager"
+ msgstr "Tālruņa pārvaldnieks"
+ 
+@@ -70,27 +174,31 @@ msgstr "Savienojos ar tālruni"
+ msgid "Not connected"
+ msgstr "Nav savienots"
+ 
+-#: ../src/main.c:37
++#: ../src/main.c:38
+ msgid "Show model name of a specific device"
+ msgstr "Rādīt iekārtas modeli"
+ 
+-#: ../src/main.c:38
++#: ../src/main.c:38 ../src/main.c:39
++msgid "PORT"
++msgstr "PORTS"
++
++#: ../src/main.c:39
+ msgid "Write the configuration file for gnokii debugging"
+ msgstr "Rakstīt konfigurācijas failu gnokii lāgošanai"
+ 
+-#: ../src/main.c:39
++#: ../src/main.c:40
+ msgid "Enable debug"
+ msgstr "Ieslēgt lāgošanu"
+ 
+-#: ../src/main.c:40
++#: ../src/main.c:41
+ msgid "Show version information and exit"
+ msgstr "Skatīt versijas informāciju un iziet"
+ 
+-#: ../src/main.c:59
++#: ../src/main.c:60
+ msgid "- Manage your mobile phone"
+ msgstr "- Pārvalda jūsu mobilo tālruni"
+ 
+-#: ../src/main.c:72
++#: ../src/main.c:74
+ #, c-format
+ msgid "gnome-phone-manager version %s\n"
+ msgstr "gnome-phone-manager versija %s\n"
+@@ -111,152 +219,166 @@ msgstr "Tālruņa pārvaldnieka mājas lapa"
+ msgid "_Send Message"
+ msgstr "_Sūtīt īsziņu"
+ 
+-#: ../src/phonemgr-chooser-button.c:80
+-#: ../src/phonemgr-chooser-button.c:190
+-msgid "Click to select device..."
+-msgstr "Klikšķiniet, lai izvēlētos iekārtu..."
++#: ../src/ui.c:111
++#| msgid "Message Received"
++msgid "New text message received"
++msgstr "Saņemta jauna teksta īsziņa"
+ 
+-#: ../src/ui.c:335
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Īsziņa ir pārāk gara!"
+ 
+-#: ../data/phonemgr.glade.h:1
+-msgid "/dev/ttyS2"
+-msgstr "/dev/ttyS2"
+-
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Brīdināšana"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Alternatīvs ierīces faila nosaukums, piem. /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:4
+-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 "Vienmēr censties atjaunot zaudētu savienojumu. Lietojiet Bluetooth, lai nodrošinātu savienojumu, tikko tālrunis ir parādījies pieejamajā diapazonā."
++#: ../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 ""
++"Vienmēr censties atjaunot zaudētu savienojumu. Lietojiet Bluetooth, lai "
++"nodrošinātu savienojumu, tikko tālrunis ir parādījies pieejamajā diapazonā."
++
++#: ../data/phonemgr.ui.h:4
++msgid "Automated Tasks"
++msgstr "Automatizētie uzdevumi"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "Automātiski mēģināt pieslēgties vēl_reiz"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Atlikušais zīmju skaits:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Savienoties ar tālruni, izmantojot citu seriālo iekārtu"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Savienoties ar tālruni, izmantojot infrasarkanos sakarus"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+-msgstr "Savienoties ar tālruni, izmantojot pirmo seriālo portu, zināmu arī kā COM1 vai /dev/ttyS0"
++msgstr ""
++"Savienoties ar tālruni, izmantojot pirmo seriālo portu, zināmu arī kā COM1 "
++"vai /dev/ttyS0"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+-msgstr "Savienoties ar tālruni, izmantojot otro seriālo portu, zināmu arī kā COM2 vai /dev/ttyS1"
++msgstr ""
++"Savienoties ar tālruni, izmantojot otro seriālo portu, zināmu arī kā COM2 "
++"vai /dev/ttyS1"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Savienojums"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Datums:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Ievadiet īsziņas tekstu, kuru vēlaties nosūtīt."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Ievadiet īsziņas tekstu"
+ 
+-#: ../data/phonemgr.glade.h:15
+-msgid "Error Handling"
+-msgstr "Kļūdu apstrāde"
+-
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "I_nfrasarkanais (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Saskarne"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Saņemta īsziņa"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Cits _ports"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Tālruņa savienojums"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Tālruņa pārvaldnieka iestatījumi"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "_Saņemot īsziņu, atskaņot signālu"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Sūtīt īsziņu"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Sūtītājs:"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Pirmais seriālais ports ( _1 /dev/ttyS0) "
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Otrais seriālais ports ( _2 /dev/ttyS1) "
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:26
++msgid "Synchronise phone's _time and date"
++msgstr "Sinhronizēt _tālruņa laiku un datumu"
++
++#: ../data/phonemgr.ui.h:27
++msgid "Synchronise phone's time and date with the computer's clock"
++msgstr "Sinhronizēt tālruņa laiku un datumu ar datora pulksteni"
++
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "Savienoties ar tālruni, izmantojot Bluetooth bezvadu savienojumu"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Saņemta jauna īsziņa"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "Īs_ziņa:"
+ 
+-#: ../data/phonemgr.glade.h:31
++#. 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 "Saņemt īsziņas piegādes paziņojumu"
+ 
+-#: ../data/phonemgr.glade.h:32
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "Jaunās īsziņas _parādīt uznirstošā logā"
+ 
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_Saņēmējs:"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Atbildēt"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Sūtīt"
+ 
+@@ -265,24 +387,36 @@ msgid "Bluetooth address of the device to connect to"
+ msgstr "Iekārtas ar kuru savienoties, Bluetooth adrese"
+ 
+ #: ../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 adrese iekārtai, kurai pieslēgties. Pieprasa izmantot savienojuma veidu 1."
++msgid ""
++"Bluetooth address of the device to connect to. Requires connection_type to "
++"be 1 to be used."
++msgstr ""
++"Bluetooth adrese iekārtai, kurai pieslēgties. Pieprasa izmantot savienojuma "
++"veidu 1."
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:3
+ msgid "The connection type used by gnome-phone-manager"
+ msgstr "Savienojuma veids, kuru izmanto Gnome tālruņa pārvaldnieks"
+ 
+ #: ../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 tālruņa pārvaldnieka savienojuma veidi: Bluetooth - 0, seriālais ports 1 ir 1, seriālais ports2 ir 2, IrDA (infrasarkanais) - 3, citi savienojumi - 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 tālruņa pārvaldnieka savienojuma veidi: Bluetooth - 0, seriālais ports "
++"1 ir 1, seriālais ports2 ir 2, IrDA (infrasarkanais) - 3, citi savienojumi - "
++"4"
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:5
+ msgid "The device node for the serial device to connect to"
+ msgstr "Seriālās iekārtas fails pieslēgumam"
+ 
+ #: ../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 "Seriālās iekārtas fails pieslēgumam. Pieprasa izmantot savienojuma tipu 4."
++msgid ""
++"The device node for the serial device to connect to. Requires "
++"connection_type to be 4 to be used."
++msgstr ""
++"Seriālās iekārtas fails pieslēgumam. Pieprasa izmantot savienojuma tipu 4."
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:7
+ msgid "Whether to play a sound alert when a new message comes in"
+@@ -297,109 +431,36 @@ msgid "Whether to popup new messages on the desktop"
+ msgstr "Jaunas īsziņas izmanto uznirstošu logu darbvirsmā"
+ 
+ #: ../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 "Vai jaunas īsziņas, tikko saņemtas, izmanto uznirstošu logu darbvirsmā, pretējā gadījumā parādot tās noklišķinot uz paneļa ikonas."
++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 ""
++"Vai jaunas īsziņas, tikko saņemtas, izmanto uznirstošu logu darbvirsmā, "
++"pretējā gadījumā parādot tās noklišķinot uz paneļa ikonas."
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:11
+ msgid "Whether to retry connecting to the mobile phone"
+ msgstr "Vai mēģināt atkārtoti savienoties ar tālruni"
+ 
+ #: ../data/gnome-phone-manager.schemas.in.h:12
+-msgid "Whether to retry connecting to the mobile phone if the connection fails at some point."
++msgid ""
++"Whether to retry connecting to the mobile phone if the connection fails at "
++"some point."
+ msgstr "Vai mēģināt atkārtoti atjaunot pārtrauktu savienojumu."
+ 
+-#: ../src/e-contact-entry.c:158
+-#, c-format
+-msgid "Cannot get contact: %s"
+-msgstr "Nevaru dabūt kontaktinformāciju: %s"
+-
+-#: ../src/e-contact-entry.c:191
+-#, c-format
+-msgid "Could not find contact: %s"
+-msgstr "Nevaru atrast kontaktinformāciju: %s"
+-
+-#: ../src/e-contact-entry.c:417
+-msgid "Cannot create searchable view."
+-msgstr "Nevaru izveidot meklējamu skatu."
+-
+-#: ../src/e-contact-entry.c:890
+-msgid "Success"
+-msgstr "Veiksmīgi"
+-
+-#: ../src/e-contact-entry.c:892
+-msgid "An argument was invalid."
+-msgstr "Nepareiza argumenta vērtība."
+-
+-#: ../src/e-contact-entry.c:894
+-msgid "The address book is busy."
+-msgstr "Pieslēgums adrešu grāmatai ir aizņemts."
+-
+-#: ../src/e-contact-entry.c:896
+-msgid "The address book is offline."
+-msgstr "Adrešu grāmata ir atsaistē."
+-
+-#: ../src/e-contact-entry.c:898
+-msgid "The address book does not exist."
+-msgstr "Adrešu grāmata neeksistē."
+-
+-#: ../src/e-contact-entry.c:900
+-msgid "The \"Me\" contact does not exist."
+-msgstr "\"Mana\" kontaktinformācija nav atrodama."
+-
+-#: ../src/e-contact-entry.c:902
+-msgid "The address book is not loaded."
+-msgstr "Adrešu grāmata nav ielādēta."
+-
+-#: ../src/e-contact-entry.c:904
+-msgid "The address book is already loaded."
+-msgstr "Adrešu grāmata jau ir ielādēta."
+-
+-#: ../src/e-contact-entry.c:906
+-msgid "Permission was denied when accessing the address book."
+-msgstr "Pieeja adrešu grāmatai liegta."
+-
+-#: ../src/e-contact-entry.c:908
+-msgid "The contact was not found."
+-msgstr "Kontaktinformācija nav atrasta."
+-
+-#: ../src/e-contact-entry.c:910
+-msgid "This contact ID already exists."
+-msgstr "Kontaktinformācijas ID jau eksistē."
+-
+-#: ../src/e-contact-entry.c:912
+-msgid "The protocol is not supported."
+-msgstr "Protokols netiek atbalstīts."
+-
+-#: ../src/e-contact-entry.c:914
+-msgid "The operation was cancelled."
+-msgstr "Darbība tika atcelta."
+-
+-#: ../src/e-contact-entry.c:916
+-msgid "The operation could not be cancelled."
+-msgstr "Pieprasīto operāciju nevar atcelt."
+-
+-#: ../src/e-contact-entry.c:918
+-msgid "The address book authentication failed."
+-msgstr "Adrešu grāmatas autentifikācija neizdevās."
+-
+-#: ../src/e-contact-entry.c:920
+-msgid "Authentication is required to access the address book and was not given."
+-msgstr "Lai lasītu adrešu grāmatu, bija nepieciešama autentificēšanās, kura netika nodrošināta."
++#: ../data/gnome-phone-manager.schemas.in.h:13
++msgid "Whether to synchronise the phone clock with the computer's"
++msgstr "Vai sinhronizēt tālruņa pulksteni ar datora"
+ 
+-#: ../src/e-contact-entry.c:922
+-msgid "A secure connection is not available."
+-msgstr "Drošs savienojums nav pieejams."
++#: ../data/gnome-phone-manager.schemas.in.h:14
++msgid "Whether to synchronise the phone clock with the computer's."
++msgstr "Vai sinhronizēt tālruņa pulksteni ar datora."
+ 
+-#: ../src/e-contact-entry.c:924
+-msgid "A CORBA error occurred whilst accessing the address book."
+-msgstr "Lasot adrešu grāmatu, notikusi CORBA kļūda."
++#~ msgid "Click to select device..."
++#~ msgstr "Klikšķiniet, lai izvēlētos iekārtu..."
+ 
+-#: ../src/e-contact-entry.c:926
+-msgid "The address book source does not exist."
+-msgstr "Adrešu grāmatas primārais dokuments neeksistē."
+-
+-#: ../src/e-contact-entry.c:928
+-#: ../src/e-contact-entry.c:931
+-msgid "An unknown error occurred."
+-msgstr "Atgadījās nezināma kļūda."
++#~ msgid "/dev/ttyS2"
++#~ msgstr "/dev/ttyS2"
+ 
++#~ msgid "Error Handling"
++#~ msgstr "Kļūdu apstrāde"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index a9c19a5..501f8e9 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -3,19 +3,21 @@
+ # This file is distributed under the same license as the phonemgr package.
+ # Raphael Higino <In Memorian>, 2004.
+ # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008.
+-#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: phonemgr\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "phone-manager&component=general\n"
+-"POT-Creation-Date: 2010-12-26 01:41+0000\n"
+-"PO-Revision-Date: 2010-12-29 14:15-0300\n"
+-"Last-Translator: Mateus Zenaide <matzenh@gmail.com>\n"
+-"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
++"POT-Creation-Date: 2011-02-15 20:00+0000\n"
++"PO-Revision-Date: 2011-05-03 10:45-0200\n"
++"Last-Translator: Djavan Fagundes <djavan@comum.org>\n"
++"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
++"Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=2; plural=(n > 1);\n"
++"X-Generator: Virtaal 0.6.1\n"
+ 
+ #: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153
+ #, c-format
+@@ -124,6 +126,11 @@ msgstr "Erro do gconf: %s"
+ msgid "All further errors shown only on terminal."
+ msgstr "Os próximos erros serão exibidos apenas no terminal."
+ 
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Use este dispositivo com o gerenciador de telefones"
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -168,14 +175,14 @@ msgstr "Desconectado"
+ msgid "Show model name of a specific device"
+ msgstr "Mostra o nome do modelo de um dispositivo específico"
+ 
++#: ../src/main.c:38 ../src/main.c:39
++msgid "PORT"
++msgstr "PORTA"
++
+ #: ../src/main.c:39
+ msgid "Write the configuration file for gnokii debugging"
+ msgstr "Escreve o arquivo de configuração para depuração gnokii"
+ 
+-#: ../src/main.c:39
+-msgid "PORT"
+-msgstr "PORTA"
+-
+ #: ../src/main.c:40
+ msgid "Enable debug"
+ msgstr "Habilita depuração"
+@@ -211,23 +218,23 @@ msgstr "Site do gerenciador de telefones"
+ msgid "_Send Message"
+ msgstr "_Enviar mensagem"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "Nova mensagem recebida"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Mensagem longa demais!"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Alertas"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Nome do arquivo de dispositivo alternativo, p. ex. /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -237,138 +244,138 @@ msgstr ""
+ "imediatamente. Use isso com Bluetooth para garantir que o seu telefone se "
+ "conecte sempre que ele estiver na área do sinal."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "Tarefas automatizadas"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "_Re-tentar conexões automaticamente"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Caracteres restantes:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Conectar usando um dispositivo serial alternativo"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Conectar usando comunicação infra vermelho"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+ msgstr ""
+ "Conectar usando a porta serial 1, também conhecida como COM1 ou /dev/ttyS0"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+ msgstr ""
+ "Conectar usando a porta serial 2, também conhecida como COM2 ou /dev/ttyS1"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Conexão"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Data:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Digite a mensagem de texto que quer enviar."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Digite a mensagem de texto"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "I_nfra vermelho (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Interface"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Mensagem recebida"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Outra _porta"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Conexão com o telefone"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Preferências do gerenciador de telefones"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "Reproduzir um _som quando chegar uma mensagem"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Enviar Mensagem"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Remetente:"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Porta serial _1 (/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Porta serial _2 (/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "Sincronizar a _hora e data do telefone"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "Sincronizar a hora e data do telefone com o relógio do computador"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "Use rede sem fio Bluetooth para conectar no seu telefone"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Você recebeu uma mensagem"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "_Mensagem:"
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "_Informar quando a mensagem for entregue "
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "Janela _instantânea para novas mensagens"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_Destinatário:"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Responder"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Enviar"
+ 
+diff --git a/po/sv.po b/po/sv.po
+index 7cc9ea0..77711d7 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -1,7 +1,7 @@
+ # Swedish messages for phonemgr.
+-# Copyright (C) 2004-2010 Free Software Foundation, Inc.
++# Copyright (C) 2004-2011 Free Software Foundation, Inc.
+ # Christian Rose <menthos@menthos.com>, 2004.
+-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010.
++# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011.
+ #
+ # $Id: sv.po,v 1.2 2006/04/12 18:56:30 dnylande Exp $
+ #
+@@ -9,8 +9,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: phonemgr\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-12-29 15:05+0100\n"
+-"PO-Revision-Date: 2010-12-29 18:35+0100\n"
++"POT-Creation-Date: 2011-03-01 01:09+0100\n"
++"PO-Revision-Date: 2011-03-01 08:54+0100\n"
+ "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+ "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+ "Language: sv\n"
+@@ -122,6 +122,11 @@ msgstr "GConf-fel: %s"
+ msgid "All further errors shown only on terminal."
+ msgstr "Alla ytterligare fel visas endast på terminalen."
+ 
++#. Translators: "device" is a phone or a modem
++#: ../gnome-bluetooth/phonemgr.c:133
++msgid "Use this device with Phone Manager"
++msgstr "Använd denna enhet med Telefonhanterare"
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -139,8 +144,8 @@ msgid "Failed connection to device on %s"
+ msgstr "Anslutning till enhet på %s misslyckades"
+ 
+ #: ../src/gnome-phone-manager.desktop.in.h:1
+-#: ../src/menu.c:49
+ #: ../src/menu.c:51
++#: ../src/menu.c:53
+ msgid "Phone Manager"
+ msgstr "Telefonhanterare"
+ 
+@@ -168,14 +173,15 @@ msgstr "Inte ansluten"
+ msgid "Show model name of a specific device"
+ msgstr "Visa modellnamn för en specifik enhet"
+ 
+-#: ../src/main.c:39
+-msgid "Write the configuration file for gnokii debugging"
+-msgstr "Skriv konfigurationsfilen för gnokii-felsökning"
+-
++#: ../src/main.c:38
+ #: ../src/main.c:39
+ msgid "PORT"
+ msgstr "PORT"
+ 
++#: ../src/main.c:39
++msgid "Write the configuration file for gnokii debugging"
++msgstr "Skriv konfigurationsfilen för gnokii-felsökning"
++
+ #: ../src/main.c:40
+ msgid "Enable debug"
+ msgstr "Aktivera felsökning"
+@@ -196,174 +202,174 @@ msgstr "gnome-phone-manager version %s\n"
+ #: ../src/menu.c:40
+ msgid "translator_credits"
+ msgstr ""
+-"Daniel Nylander\n"
++"Daniel Nylander <po@danielnylander.se>\n"
+ "Christian Rose\n"
+ "\n"
+ "Skicka synpunkter på översättningen till\n"
+-"tp-sv@listor.tp-sv.se"
++"<tp-sv@listor.tp-sv.se>."
+ 
+ #: ../src/menu.c:44
+ msgid "Send and receive messages from your mobile phone."
+ msgstr "Skicka och mottag meddelanden från din mobiltelefon."
+ 
+-#: ../src/menu.c:56
++#: ../src/menu.c:58
+ msgid "Phone Manager website"
+ msgstr "Webbplatsen för Telefonhanterare"
+ 
+-#: ../src/menu.c:87
++#: ../src/menu.c:89
+ msgid "_Send Message"
+ msgstr "_Skicka meddelande"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "Nytt textmeddelande har mottagits"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "Meddelandet är för långt!"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "Varnar"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "Alternativt enhetsfilnamn, t.ex. /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "Försök alltid att ansluta igen när en anslutning inte är omedelbart tillgänglig. Använd detta tillsammans med Bluetooth för att försäkra dig om att din telefon ansluter när den är inom räckhåll."
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "Automatiserade funktioner"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "_Försök ansluta igen automatiskt"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "Tecken kvar:"
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "Anslut genom att använda en alternativ seriell enhet"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "Anslut genom att använda infraröd kommunikation"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../data/phonemgr.ui.h:9
+ msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0"
+ msgstr "Anslut genom att använda serieport 1, även känd som COM1 eller /dev/ttyS0"
+ 
+-#: ../data/phonemgr.glade.h:10
++#: ../data/phonemgr.ui.h:10
+ msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1"
+ msgstr "Anslut genom att använda serieport 2, även känd som COM2 eller /dev/ttyS1"
+ 
+-#: ../data/phonemgr.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "Anslutning"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "Datum:"
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "Ange det textmeddelande som du vill skicka."
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "Ange ditt textmeddelande"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "I_nfrarött (/dev/ircomm0)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "Gränssnitt"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "Meddelande har mottagits"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "Annan _port"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "Telefonanslutning"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "Inställningar för telefonhanteraren"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "Spela _ljudfil när meddelanden ankommer"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "Skicka meddelande"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "Avsändare:"
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "Serieport _1 (/dev/ttyS0)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "Serieport _2 (/dev/ttyS1)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "Synkronisera telefonens _tid och datum"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "Synkronisera telefonens tid och datum med datorns klocka"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "Använd trådlöst blåtandsnätverk för att ansluta till din telefon"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "Du har fått ett meddelande"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "_Meddelande:"
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "_Notifiera när meddelanden ankommer"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "_Popupfönster för nya meddelanden"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "_Mottagare:"
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "_Svara"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "_Skicka"
+ 
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 40a4ede..1f7dce7 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -9,7 +9,7 @@ msgstr ""
+ "Project-Id-Version: phonemgr master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "phone-manager&component=general\n"
+-"POT-Creation-Date: 2010-02-05 17:50+0000\n"
++"POT-Creation-Date: 2011-02-15 20:00+0000\n"
+ "PO-Revision-Date: 2010-02-24 16:31+0800\n"
+ "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+ "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+@@ -17,111 +17,116 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:152
++#: ../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:185
++#: ../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:411
++#: ../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:883
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886
+ msgid "Success"
+ msgstr "成功"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:885
++#: ../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:887
++#: ../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:889
++#: ../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:891
++#: ../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:893
++#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896
+ msgid "The \"Me\" contact does not exist."
+ msgstr "“Me”联系人不存在。"
+ 
+-#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:895
++#: ../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:897
++#: ../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:899
++#: ../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:901
++#: ../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:903
++#: ../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:905
++#: ../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:907
++#: ../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:909
++#: ../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:911
++#: ../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:913
++#: ../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:915
++#: ../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:917
++#: ../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:919
++#: ../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:921
+ #: ../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:1221
++#: ../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:1231
++#: ../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 ""
++
+ #. translators: the '%s' will be substituted with '/dev/ttyS0'
+ #. or similar
+ #: ../src/connection.c:124
+@@ -166,6 +171,10 @@ msgstr "未连接"
+ 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 调试写配置文件"
+@@ -182,7 +191,7 @@ msgstr "显示版本信息然后退出"
+ msgid "- Manage your mobile phone"
+ msgstr " - 管理您的移动电话"
+ 
+-#: ../src/main.c:72
++#: ../src/main.c:74
+ #, c-format
+ msgid "gnome-phone-manager version %s\n"
+ msgstr "gnome-phone-manager 版本 %s\n"
+@@ -203,23 +212,23 @@ msgstr "电话管理器网站"
+ msgid "_Send Message"
+ msgstr "发送消息(_S)"
+ 
+-#: ../src/ui.c:166
++#: ../src/ui.c:111
+ msgid "New text message received"
+ msgstr "收到了新文本消息"
+ 
+-#: ../src/ui.c:331
++#: ../src/ui.c:277
+ msgid "Message too long!"
+ msgstr "消息太长！"
+ 
+-#: ../data/phonemgr.glade.h:1
++#: ../data/phonemgr.ui.h:1
+ msgid "Alerting"
+ msgstr "提醒"
+ 
+-#: ../data/phonemgr.glade.h:2
++#: ../data/phonemgr.ui.h:2
+ msgid "Alternative device filename, e.g. /dev/ttyS3"
+ msgstr "其它设备文件名，例如 /dev/ttyS3"
+ 
+-#: ../data/phonemgr.glade.h:3
++#: ../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 "
+@@ -228,136 +237,136 @@ msgstr ""
+ "每当连接不立即可用时，总使尝试重新连接。对蓝牙使用此选项可以确保，每当手机进"
+ "入可用区域，自动连接。"
+ 
+-#: ../data/phonemgr.glade.h:4
++#: ../data/phonemgr.ui.h:4
+ msgid "Automated Tasks"
+ msgstr "自动任务"
+ 
+-#: ../data/phonemgr.glade.h:5
++#: ../data/phonemgr.ui.h:5
+ msgid "Automatically _retry connections"
+ msgstr "自动重试连接(_R)"
+ 
+-#: ../data/phonemgr.glade.h:6
++#: ../data/phonemgr.ui.h:6
+ msgid "Characters left:"
+ msgstr "所剩字符数："
+ 
+-#: ../data/phonemgr.glade.h:7
++#: ../data/phonemgr.ui.h:7
+ msgid "Connect using an alternative serial device"
+ msgstr "使用另外的串行设备连接"
+ 
+-#: ../data/phonemgr.glade.h:8
++#: ../data/phonemgr.ui.h:8
+ msgid "Connect using infrared communication"
+ msgstr "使用红外连接"
+ 
+-#: ../data/phonemgr.glade.h:9
++#: ../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.glade.h:10
++#: ../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.glade.h:11
++#: ../data/phonemgr.ui.h:11
+ msgid "Connection"
+ msgstr "连接"
+ 
+-#: ../data/phonemgr.glade.h:12
++#: ../data/phonemgr.ui.h:12
+ msgid "Date:"
+ msgstr "日期："
+ 
+-#: ../data/phonemgr.glade.h:13
++#: ../data/phonemgr.ui.h:13
+ msgid "Enter the text message you want to send."
+ msgstr "输入您想要发送的文字消息。"
+ 
+-#: ../data/phonemgr.glade.h:14
++#: ../data/phonemgr.ui.h:14
+ msgid "Enter your text message"
+ msgstr "输入您的文本消息。"
+ 
+-#: ../data/phonemgr.glade.h:15
++#: ../data/phonemgr.ui.h:15
+ msgid "I_nfra red (/dev/ircomm0)"
+ msgstr "红外(/dev/ircomm0)(_N)"
+ 
+-#: ../data/phonemgr.glade.h:16
++#: ../data/phonemgr.ui.h:16
+ msgid "Interface"
+ msgstr "界面"
+ 
+-#: ../data/phonemgr.glade.h:17
++#: ../data/phonemgr.ui.h:17
+ msgid "Message Received"
+ msgstr "收到了消息"
+ 
+-#: ../data/phonemgr.glade.h:18
++#: ../data/phonemgr.ui.h:18
+ msgid "Other _port"
+ msgstr "其它端口(_P)"
+ 
+-#: ../data/phonemgr.glade.h:19
++#: ../data/phonemgr.ui.h:19
+ msgid "Phone Connection"
+ msgstr "电话连接"
+ 
+-#: ../data/phonemgr.glade.h:20
++#: ../data/phonemgr.ui.h:20
+ msgid "Phone Manager Preferences"
+ msgstr "电话管理器首选项"
+ 
+-#: ../data/phonemgr.glade.h:21
++#: ../data/phonemgr.ui.h:21
+ msgid "Play _sound when messages arrive"
+ msgstr "收到消息时播放声音(_S)"
+ 
+-#: ../data/phonemgr.glade.h:22
++#: ../data/phonemgr.ui.h:22
+ msgid "Send Message"
+ msgstr "发送消息"
+ 
+-#: ../data/phonemgr.glade.h:23
++#: ../data/phonemgr.ui.h:23
+ msgid "Sender:"
+ msgstr "发送人："
+ 
+-#: ../data/phonemgr.glade.h:24
++#: ../data/phonemgr.ui.h:24
+ msgid "Serial port _1 (/dev/ttyS0)"
+ msgstr "串口1(/dev/ttyS0)(_1)"
+ 
+-#: ../data/phonemgr.glade.h:25
++#: ../data/phonemgr.ui.h:25
+ msgid "Serial port _2 (/dev/ttyS1)"
+ msgstr "串口2(/dev/ttyS1)(_2)"
+ 
+-#: ../data/phonemgr.glade.h:26
++#: ../data/phonemgr.ui.h:26
+ msgid "Synchronise phone's _time and date"
+ msgstr "同步电话的时间和日期(_T)"
+ 
+-#: ../data/phonemgr.glade.h:27
++#: ../data/phonemgr.ui.h:27
+ msgid "Synchronise phone's time and date with the computer's clock"
+ msgstr "使用计算机时钟同步电话时间和日期"
+ 
+-#: ../data/phonemgr.glade.h:28
++#: ../data/phonemgr.ui.h:28
+ msgid "Use Bluetooth wireless networking to connect to your phone"
+ msgstr "使用蓝牙无线网络连接到您的电话"
+ 
+-#: ../data/phonemgr.glade.h:29
++#: ../data/phonemgr.ui.h:29
+ msgid "You have received a message"
+ msgstr "您收到了一条消息"
+ 
+-#: ../data/phonemgr.glade.h:30
++#: ../data/phonemgr.ui.h:30
+ msgid "_Bluetooth"
+ msgstr "蓝牙(_B)"
+ 
+-#: ../data/phonemgr.glade.h:31
++#: ../data/phonemgr.ui.h:31
+ msgid "_Message:"
+ msgstr "消息(_M)："
+ 
+ #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone
+-#: ../data/phonemgr.glade.h:33
++#: ../data/phonemgr.ui.h:33
+ msgid "_Notify when message is delivered"
+ msgstr "消息成功传送时通知(_N)"
+ 
+-#: ../data/phonemgr.glade.h:34
++#: ../data/phonemgr.ui.h:34
+ msgid "_Pop-up window for new messages"
+ msgstr "新消息弹出窗口(_P)"
+ 
+-#: ../data/phonemgr.glade.h:35
++#: ../data/phonemgr.ui.h:35
+ msgid "_Recipient:"
+ msgstr "收件人(_R)："
+ 
+-#: ../data/phonemgr.glade.h:36
++#: ../data/phonemgr.ui.h:36
+ msgid "_Reply"
+ msgstr "回复(_R)"
+ 
+-#: ../data/phonemgr.glade.h:37
++#: ../data/phonemgr.ui.h:37
+ msgid "_Send"
+ msgstr "发送(_S)"
+ 
+diff --git a/src/e-phone-entry.h b/src/e-phone-entry.h
+index 2b4eae6..2431836 100644
+--- a/src/e-phone-entry.h
++++ b/src/e-phone-entry.h
+@@ -29,10 +29,10 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define E_PHONE_ENTRY(obj) (GTK_CHECK_CAST ((obj), e_phone_entry_get_type (), EPhoneEntry))
+-#define E_PHONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), e_phone_entry_get_type (), EPhoneEntryClass))
+-#define E_IS_PHONE_ENTRY(obj) (GTK_CHECK_TYPE (obj, e_phone_entry_get_type ()))
+-#define E_IS_PHONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_phone_entry_get_type ()))
++#define E_PHONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), e_phone_entry_get_type (), EPhoneEntry))
++#define E_PHONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), e_phone_entry_get_type (), EPhoneEntryClass))
++#define E_IS_PHONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, e_phone_entry_get_type ()))
++#define E_IS_PHONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), e_phone_entry_get_type ()))
+ #define E_PHONE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_PHONE_ENTRY_TYPE, EPhoneEntryClass))
+ 
+ typedef struct EPhoneEntry EPhoneEntry;
+diff --git a/src/icon.c b/src/icon.c
+index 45d1683..4224ae2 100644
+--- a/src/icon.c
++++ b/src/icon.c
+@@ -56,18 +56,18 @@ set_icon_state (MyApp *app)
+ 		gtk_widget_set_sensitive (app->send_item, TRUE);
+ 		if (app->messages) {
+ 			gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-message");
+-			gtk_status_icon_set_tooltip (app->tray_icon, _("Message arrived"));
++			gtk_status_icon_set_tooltip_text (app->tray_icon, _("Message arrived"));
+ 		} else {
+ 			gtk_status_icon_set_from_icon_name (app->tray_icon, "phone");
+-			gtk_status_icon_set_tooltip (app->tray_icon, _("Connected"));
++			gtk_status_icon_set_tooltip_text (app->tray_icon, _("Connected"));
+ 		}
+ 	} else if (app->connecting) {
+ 		gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-connecting");
+-		gtk_status_icon_set_tooltip (app->tray_icon, _("Connecting to phone"));
++		gtk_status_icon_set_tooltip_text (app->tray_icon, _("Connecting to phone"));
+ 		gtk_widget_set_sensitive (app->send_item, FALSE);
+ 	} else {
+ 		gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-error");
+-		gtk_status_icon_set_tooltip (app->tray_icon, _("Not connected"));
++		gtk_status_icon_set_tooltip_text (app->tray_icon, _("Not connected"));
+ 		gtk_widget_set_sensitive (app->send_item, FALSE);
+ 	}
+ }
+diff --git a/src/menu.c b/src/menu.c
+index e8ebeae..98905a0 100644
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -37,7 +37,6 @@ about_activated(GtkMenuItem *item, gpointer data)
+ {
+ 	const char *authors[] = { "Bastien Nocera <hadess@hadess.net>", "Edd Dumbill <edd@usefulinc.com>", NULL };
+ 	const char *documenters[] = { NULL };
+-	const char *translator_credits = _("translator_credits");
+ 
+ 	gtk_show_about_dialog (NULL,
+ 			       "authors", authors,
+@@ -53,7 +52,7 @@ about_activated(GtkMenuItem *item, gpointer data)
+ 			       "name", _("Phone Manager"),
+ #endif /* GTK+ 2.11.0 */
+ 			       "version", VERSION,
+-			       "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ?  translator_credits : NULL,
++			       "translator-credits", _("translator_credits"),
+ 			       "website", "http://live.gnome.org/PhoneManager",
+ 			       "website-label", _("Phone Manager website"),
+ 			       NULL);
+diff --git a/src/ui.c b/src/ui.c
+index 7daf22d..56a70ad 100644
+--- a/src/ui.c
++++ b/src/ui.c
+@@ -451,12 +451,6 @@ ui_init (MyApp *app)
+ 				    "active");
+ 
+ 	/* And the address chooser */
+-	/* XXX Force a value to the device property else if there is no valid value in gconf
+-	   and the Bluetooth chooser button won't show any label
+-	 */
+-	g_object_set (G_OBJECT (gtk_builder_get_object (app->ui, "btchooser")),
+-		      "device", NULL,
+-		      NULL);
+ 	gconf_bridge_bind_property (bridge,
+ 				    CONFBASE"/bluetooth_addr",
+ 				    G_OBJECT (gtk_builder_get_object (app->ui, "btchooser")),
diff --git a/extra/gnome-phone-manager/gtk3.patch b/extra/gnome-phone-manager/gtk3.patch
new file mode 100644
index 000000000..141e53a2c
--- /dev/null
+++ b/extra/gnome-phone-manager/gtk3.patch
@@ -0,0 +1,66 @@
+From 4944880ed2227f666b0761961663b0fbbcc45aa8 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jan@jgc.homeip.net>
+Date: Thu, 30 Jun 2011 19:54:21 +0200
+Subject: [PATCH] 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 ------
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2338f4b..e486768 100644
+--- a/configure.in
++++ b/configure.in
+@@ -13,7 +13,7 @@ dnl Initialize libtool
+ AM_PROG_LIBTOOL
+ 
+ GNOKII_REQS="gnokii >= 0.6.28"
+-GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0"
++GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0"
+ 
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -44,11 +44,10 @@ PKG_CHECK_MODULES(TMP_EVO, libebook-1.2,
+ 
+ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $evo_pc_file)
+ 
+-PKG_CHECK_MODULES(PHONEMGR, gtk+-2.0 >= 2.18 glib-2.0 >= 2.25.0
+-	libcanberra-gtk gconf-2.0
++PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.25.0
++	libcanberra-gtk3 gconf-2.0
+ 	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+-	gtkspell-2.0
+ )
+ 
+ DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"
+diff --git a/src/ui.c b/src/ui.c
+index 56a70ad..bc89bf4 100644
+--- a/src/ui.c
++++ b/src/ui.c
+@@ -22,7 +22,6 @@
+ #include <glib/gi18n.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+-#include <gtkspell/gtkspell.h>
+ #include <canberra-gtk.h>
+ #include <time.h>
+ #include <string.h>
+@@ -343,11 +342,6 @@ create_send_dialog (MyApp *app, GtkDialog *parent, const char *recip)
+ 	buf = gtk_text_view_get_buffer (view);
+ 	gtk_text_buffer_set_text (buf, "", 0);
+ 
+-        if (!gtkspell_new_attach (view, NULL, &err)) {
+-        	g_warning ("Couldn't initialise spell checking: %s", err->message);
+-                g_error_free (err);
+-        }
+-
+ 	entry = GTK_ENTRY (gtk_builder_get_object (ui, "recipient"));
+ 	if (recip)
+ 		gtk_entry_set_text (entry, recip);
+-- 
+1.7.6
+
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 346f19858..a71c5c93e 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120925 2011-04-27 13:05:01Z pierre $
+# $Id: PKGBUILD 130222 2011-07-04 13:03:05Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.28
-pkgrel=6
+pkgver=1.4.29
+pkgrel=1
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('586eb535d31ac299652495b058dd87c4'
+md5sums=('e6e67b09986cb504db630b5a86b2dd76'
          '369f2eea6231342b514ca4777bf395c8'
          '913e2157fa78d990c32146f387d44c2b'
          '2803a9ee7f20409c69f1566d2d90720e')
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
index d4cd6d896..61497abd3 100644
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ b/extra/qtcurve-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118935 2011-04-09 13:48:28Z andrea $
+# $Id: PKGBUILD 130208 2011-07-04 08:59:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-gtk2
-pkgver=1.8.8
+pkgver=1.8.9
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,10 +14,10 @@ depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-md5sums=('2146fda49c8e078c985725db30228b9a')
+md5sums=('e3248bd1b926f250b3a6ff9699134abd')
 
 build() {
-	cd $srcdir
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../QtCurve-Gtk2-${pkgver} \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
index c9cd7c910..05191b22b 100644
--- a/extra/qtcurve-kde4/PKGBUILD
+++ b/extra/qtcurve-kde4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118930 2011-04-09 13:46:54Z andrea $
+# $Id: PKGBUILD 130203 2011-07-04 08:57:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-kde4
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,16 +14,16 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
         'bypass-kde-config.patch')
-md5sums=('a874fade6bf67ee052dc656dd76ffe37'
+md5sums=('b264d80b4c1e0e8d59e91d571cb639e4'
          '3f6681147cc361bd2bfd4d7477f2a8d0')
 
 build() {
-	cd ${srcdir}/QtCurve-KDE4-${pkgver}
+	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
 	# Bypass KDE prefix detection by kde4-config, see:
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -Np1 -i ${srcdir}/bypass-kde-config.patch
+	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
 
-	cd ${srcdir}
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../QtCurve-KDE4-${pkgver} \
@@ -33,6 +33,6 @@ build() {
 }
 
 package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index 4c7d585ed..ac08317d4 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 105442 2011-01-08 22:25:31Z paul $
+# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
 pkgver=7.0a
-pkgrel=2
+pkgrel=3
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
 arch=('i686' 'x86_64')
 license=('custom') # TrueCrypt License v2.6
 depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
+makedepends=('nasm')
 optdepends=('sudo: mounting encrypted volumes as nonroot users')
 conflicts=('truecrypt-utils')
 replaces=('truecrypt-utils')
-options=('force')
 # N.B. Truecrypt's web-based source download is incompatible with
 # makepkg. Source has been placed on ftp.archlinux.org instead
 source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \
         'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
-        "${pkgname}.desktop") 
+        "${pkgname}.desktop" \
+	"${pkgname}-arch-detection.patch") 
 
 build() {
   export PKCS11_INC="${srcdir}/pkcs-2.20"
 
   cd ${srcdir}/${pkgname}-${pkgver}-source || return 1
+
+  # Work around buggy CPU type detection
+  patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1
+  
+  # Build
   make || return 1
 
   # Install Binary
@@ -37,4 +43,5 @@ build() {
 }
 md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
          'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01')
+         '183b9bf04a943454d4e216130bcbac01'
+         '00ea70fa8437de877b31b027ac2b4060')
diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch
new file mode 100644
index 000000000..bc16a2a36
--- /dev/null
+++ b/extra/truecrypt/truecrypt-arch-detection.patch
@@ -0,0 +1,15 @@
+diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile
+--- truecrypt-7.0a-source/Makefile	2010-09-05 10:32:10.000000000 -0400
++++ truecrypt-7.0a-source.fixed/Makefile	2011-07-05 21:41:50.296437879 -0400
+@@ -120,10 +120,7 @@
+ 
+ export CPU_ARCH ?= unknown
+ 
+-ARCH = $(shell uname -p)
+-ifeq "$(ARCH)" "unknown"
+-	ARCH = $(shell uname -m)
+-endif
++ARCH = $(shell uname -m)
+ 
+ ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
+ 	CPU_ARCH = x86
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
index 259190904..df6037c93 100644
--- a/extra/vsftpd/PKGBUILD
+++ b/extra/vsftpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111119 2011-02-24 05:05:08Z eric $
+# $Id: PKGBUILD 130325 2011-07-05 09:57:35Z andrea $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -7,17 +7,19 @@ pkgver=2.3.4
 pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
-url="http://vsftpd.beasts.org/"
+url="https://security.appspot.com/vsftpd.html"
 license=('GPL2')
 depends=('tcp_wrappers' 'openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
-source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
-        vsftpd.xinetd vsftpd.d)
-md5sums=('2ea5d19978710527bb7444d93b67767a' 'b07fd4609c70063c1d6b20142910c1a6'\
+source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
+        'vsftpd.xinetd' 'vsftpd.d')
+md5sums=('2ea5d19978710527bb7444d93b67767a'
+         'b07fd4609c70063c1d6b20142910c1a6'
          '60060a6c7db3b3b7baa1561a302e6923')
-sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' 'c87b4ce56dac15223694a6e86c01ea813b877596'\
-         '24f268956c24e78be0c234c6d31f41487922eafe')
+sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea'
+          'c87b4ce56dac15223694a6e86c01ea813b877596'
+          '24f268956c24e78be0c234c6d31f41487922eafe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD
index 3a8498c10..e9876a82e 100644
--- a/extra/xawtv/PKGBUILD
+++ b/extra/xawtv/PKGBUILD
@@ -1,42 +1,25 @@
-# $Id: PKGBUILD 63661 2010-01-18 09:35:32Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 130228 2011-07-04 14:14:56Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=xawtv
-pkgver=3.95
-pkgrel=7
+pkgver=3.101
+pkgrel=1
 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
 arch=('i686' 'x86_64')
-url="http://linux.bytesex.org/xawtv/"
+url="http://git.linuxtv.org/xawtv3.git"
 license=('GPL')
-depends=('libjpeg' 'alsa-lib' 'lesstif' 'libdv' 'zvbi' 'aalib' 'libv4l'
-         'libxxf86dga' 'libfs' 'libxrandr' 'libxinerama' 'libxv' 'libxaw'
-	 'libxxf86vm' 'libgl' 'gpm' 'lirc-utils' 'libxft')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc')
 makedepends=('mesa')
-options=('!makeflags')
-source=(http://dl.bytesex.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-        xawtv-395.diff
-        xawtv-3.95-pagemask-fix.patch
-        xawtv-3.95-fixes.patch
-        xawtv-3.95-libv4l2.patch
-        xawtv-3.95-no-dga.patch)
-md5sums=('ad25e03f7e128b318e392cb09f52207d'
-         '87a87b6c62b39348053704f052141843'
-         '97493dfaac8c80084d8b66891becd76c'
-         'dc83378a5c76c029f4e49434214fc824'
-         '56932100c5060bf9dfc45b8af927e697'
-         'c456147f15c8f836c678c6499f068085')
+source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
+md5sums=('330ce1789595e370be34ad4cae3dc3fa')
                   
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/xawtv-395.diff || return 1
-  patch -Np1 -i $srcdir/xawtv-3.95-pagemask-fix.patch || return 1
-  # Add patches from https://bugzilla.redhat.com/show_bug.cgi?id=457796
-  patch -Np1 -i $srcdir/xawtv-3.95-fixes.patch || return 1
-  patch -Np1 -i $srcdir/xawtv-3.95-libv4l2.patch || return 1
-  patch -Np1 -i $srcdir/xawtv-3.95-no-dga.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$pkgdir resdir=$pkgdir/usr/lib/X11 install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  autoconf
+  autoheader
+  ./configure --prefix=/usr --disable-motif --disable-quicktime
+  make
+  make DESTDIR="${pkgdir}" install
 }