Added Occitan translation

Bump version to 3.8.4 for release
Update NEWS for release
2015-05-17 08:50:52 +00:00 · 2014-12-18 10:16:38 -05:00 · 2014-12-18 10:02:18 -05:00 · 2014-12-18 14:33:13 +00:00 · 2014-02-04 18:04:34 +05:30 · 2013-11-05 07:50:49 +02:00
27 changed files with 1671 additions and 608 deletions
--- a/19
+++ b/19
@ -1,3 +1,22 @@
+Major changes in 3.8.4 are:
+* Fixed New Contact dialog address field issue
+
+Major changes in 3.8.3 are:
+* Fixed in-app notification display
+* Make labels in ContactsPane ellipsize properly
+* Synced webcam related cheese code
+
+Major changes in 3.8.2 are:
+* Updated translations
+* Fixed "new" button height
+* Fix webcam dialog shows blank camera
+* Fix searching when string is empty
+
+Major changes in 3.8.1 are:
+* Updated translations
+* Fixed font color in contacts list
+* Make changing birthdate work
+
 Major changes in 3.8.0 are:
 * Updated translations

--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ([2.67])
-AC_INIT([gnome-contacts],[3.8.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts])
+AC_INIT([gnome-contacts],[3.8.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts])
 AC_CONFIG_SRCDIR([src/main.vala])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -38,6 +38,7 @@ ml
 mr
 nb
 nl
+oc
 or
 pa
 pl
--- a/po/da.po
+++ b/po/da.po
@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-12 23:36+0100\n"
-"PO-Revision-Date: 2013-03-12 23:31+0100\n"
+"POT-Creation-Date: 2013-05-10 17:29+0200\n"
+"PO-Revision-Date: 2013-05-10 12:51+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@ -240,8 +240,8 @@ msgstr "Kaldenavn"
 msgid "Birthday"
 msgstr "Fødselsdag"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "Note"
@ -314,6 +314,10 @@ msgstr "Sammenkædede konti"
 msgid "Remove Contact"
 msgstr "Fjern kontakt"

+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "Vælg en kontakt"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "Gade"
@ -650,11 +654,11 @@ msgstr "Telex"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "Forslag"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "Andre Kontakter"

@ -709,9 +713,6 @@ msgstr "Vis kontaktdelmængde"
 #~ msgid "Select what to call"
 #~ msgstr "Vælg hvad der ringes til"

-#~ msgid "Select chat account"
-#~ msgstr "Vælg chatkonto"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "Tilføj/fjern koblede kontakter..."

--- a/po/fi.po
+++ b/po/fi.po
@ -8,14 +8,15 @@
 # Timo Jyrinki
 # Timo Jyrinki <timo.jyrinki@iki.fi>, 2011-2012.
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012, 2013.
+# Lasse Liehu <lasse.liehu@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-19 10:56+0000\n"
-"PO-Revision-Date: 2013-03-26 20:12+0200\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
+"POT-Creation-Date: 2013-07-15 18:40+0000\n"
+"PO-Revision-Date: 2013-10-28 15:12+0200\n"
+"Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@ -106,56 +107,56 @@ msgstr "Yhteystietoa sähköpostiosoitteella %s ei löydy"
 msgid "New"
 msgstr "Uusi"

-#: ../src/contacts-app.vala:326
+#: ../src/contacts-app.vala:331
 msgid "Edit"
 msgstr "Muokkaa"

-#: ../src/contacts-app.vala:332
+#: ../src/contacts-app.vala:337
 msgid "Done"
 msgstr "Valmis"

-#: ../src/contacts-app.vala:381
+#: ../src/contacts-app.vala:396
 msgid "Editing"
 msgstr "Muokataan"

-#: ../src/contacts-app.vala:498
+#: ../src/contacts-app.vala:515
 #, c-format
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d yhteystietoa linkitetty"
 msgstr[1] "%d yhteystietoa linkitetty"

-#: ../src/contacts-app.vala:529
+#: ../src/contacts-app.vala:547
 #, c-format
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d yhteystieto poistettu"
 msgstr[1] "%d yhteystietoa poistettu"

-#: ../src/contacts-app.vala:570
+#: ../src/contacts-app.vala:589
 #, c-format
 msgid "Contact deleted: \"%s\""
 msgstr "Yhteystieto poistettu: \"%s\""

-#: ../src/contacts-app.vala:596
+#: ../src/contacts-app.vala:615
 msgid "Show contact with this individual id"
 msgstr "Näytä yhteystieto tällä yksilöllisellä tunnisteella"

-#: ../src/contacts-app.vala:598
+#: ../src/contacts-app.vala:617
 msgid "Show contact with this email address"
 msgstr "Näytä yhteystieto tällä sähköpostiosoitteella"

-#: ../src/contacts-app.vala:611
+#: ../src/contacts-app.vala:631
 #, c-format
 msgid "%s linked to %s"
 msgstr "%s linkitetty → %s"

-#: ../src/contacts-app.vala:613
+#: ../src/contacts-app.vala:633
 #, c-format
 msgid "%s linked to the contact"
 msgstr "%s linkitetty yhteystietoon"

-#: ../src/contacts-app.vala:630
+#: ../src/contacts-app.vala:650
 msgid "— contact management"
 msgstr "— yhteystietojen hallinta"

@ -222,27 +223,27 @@ msgstr "Joulukuu"

 #: ../src/contacts-contact-editor.vala:489
 #: ../src/contacts-contact-editor.vala:496
-#: ../src/contacts-contact-sheet.vala:169
+#: ../src/contacts-contact-sheet.vala:175
 msgid "Website"
 msgstr "Verkkosivusto"

 #: ../src/contacts-contact-editor.vala:515
 #: ../src/contacts-contact-editor.vala:522
 #: ../src/contacts-contact-pane.vala:395
-#: ../src/contacts-contact-sheet.vala:179
+#: ../src/contacts-contact-sheet.vala:185
 msgid "Nickname"
 msgstr "Lempinimi"

 #: ../src/contacts-contact-editor.vala:542
 #: ../src/contacts-contact-editor.vala:549
 #: ../src/contacts-contact-pane.vala:400
-#: ../src/contacts-contact-sheet.vala:186
+#: ../src/contacts-contact-sheet.vala:192
 msgid "Birthday"
 msgstr "Syntymäpäivä"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
-#: ../src/contacts-contact-sheet.vala:193
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
+#: ../src/contacts-contact-sheet.vala:199
 msgid "Note"
 msgstr "Huomautus"

@ -313,6 +314,11 @@ msgstr "Linkitetyt tilit"
 msgid "Remove Contact"
 msgstr "Poista yhteystieto"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "Valitse yhteystieto"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "Katu"
@ -648,11 +654,11 @@ msgstr "Telex-kaukokirjoitin"
 msgid "TTY"
 msgstr "Kaukokirjoitin"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "Ehdotukset"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "Muut yhteystiedot"

@ -668,12 +674,11 @@ msgstr ""

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:3
 msgid "View subset"
-msgstr ""
+msgstr "Näytä osajoukko"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#, fuzzy
 msgid "View contacts subset"
-msgstr "Uusi yhteystieto"
+msgstr "Näytä yhteystiedon osajoukko"

 #~ msgctxt "Addresses on the Web"
 #~ msgid "Links"
@ -710,9 +715,6 @@ msgstr "Uusi yhteystieto"
 #~ msgid "Select what to call"
 #~ msgstr "Valitse soittovälinä"

-#~ msgid "Select chat account"
-#~ msgstr "Valitse keskustelutili"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "Lisää tai poista linkitettyjä yhteystietoja..."

--- a/po/fr.po
+++ b/po/fr.po
@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-14 23:21+0000\n"
-"PO-Revision-Date: 2013-03-19 12:24+0100\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-04-17 15:22+0200\n"
 "Last-Translator: Frédéric Keigler <fredebgnux@mailoo.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: \n"
@ -121,7 +121,6 @@ msgstr[1] "%d contacts liés"

 #: ../src/contacts-app.vala:529
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d contact supprimé"
@ -235,8 +234,8 @@ msgstr "Pseudonyme"
 msgid "Birthday"
 msgstr "Date de naissance"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "Notes"
@ -308,6 +307,10 @@ msgstr "Comptes liés"
 msgid "Remove Contact"
 msgstr "Retirer le contact"

+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "Sélectionner un contact"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "Rue"
@ -644,11 +647,11 @@ msgstr "Télex"
 msgid "TTY"
 msgstr "Téléscripteur"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "Suggestions"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "Autres contacts"

@ -705,9 +708,6 @@ msgstr "Afficher le sous-ensemble de contacts"
 #~ msgid "Select what to call"
 #~ msgstr "Sélectionner ce qu'il faut appeler"

-#~ msgid "Select chat account"
-#~ msgstr "Sélectionner le compte de discussion"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "Ajouter/supprimer des contacts liés..."

--- a/po/gu.po
+++ b/po/gu.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-20 18:38+0000\n"
-"PO-Revision-Date: 2013-02-28 12:26+0530\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-04-22 15:57+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@ -33,12 +33,10 @@ msgid "View"
 msgstr "દૃશ્ય"

 #: ../src/app-menu.ui.h:2
-#| msgid "Link Contact"
 msgid "Main contacts"
 msgstr "મુખ્ય સપર્કો"

 #: ../src/app-menu.ui.h:3
-#| msgid "Contacts"
 msgid "All contacts"
 msgstr "બધા સંપર્કો"

@ -109,13 +107,11 @@ msgid "Done"
 msgstr "થઈ ગયું"

 #: ../src/contacts-app.vala:381
-#| msgid "Edit"
 msgid "Editing"
 msgstr "ફેરફાર કરી રહ્યા છે"

 #: ../src/contacts-app.vala:498
 #, c-format
-#| msgid "Select contact to link to"
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d સંપર્કો કડી થયેલ છે"
@ -123,7 +119,6 @@ msgstr[1] "%d સંપર્કો કડી થયેલ છે"

 #: ../src/contacts-app.vala:529
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d સંપર્ક કાઢી નાંખેલ છે"
@ -237,8 +232,8 @@ msgstr "ઉપનામ"
 msgid "Birthday"
 msgstr "જન્મદિવસ"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "નોંધ"
@ -262,7 +257,6 @@ msgid "No"
 msgstr "ના"

 #: ../src/contacts-contact-pane.vala:349
-#| msgid "Add Detail"
 msgid "New Detail"
 msgstr "નવી વિગત"

@ -272,12 +266,10 @@ msgid "Personal email"
 msgstr "વ્યક્તિગત ઇમેઇલ"

 #: ../src/contacts-contact-pane.vala:368
-#| msgid "Work Fax"
 msgid "Work email"
 msgstr "કામનો ઈમેઈલ"

 #: ../src/contacts-contact-pane.vala:374
-#| msgid "Mobile"
 msgid "Mobile phone"
 msgstr "મોબાઇલ ફોન"

@ -289,35 +281,35 @@ msgstr "ઘરનો ફોન"
 msgid "Work phone"
 msgstr "કાર્યાલય ફોન"

-#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:138
+#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:140
 msgid "Link"
 msgstr "કડી"

 #: ../src/contacts-contact-pane.vala:406
-#| msgid "Address"
 msgid "Home address"
 msgstr "ઘરનું સરનામું"

 #: ../src/contacts-contact-pane.vala:411
-#| msgid "Address"
 msgid "Work address"
 msgstr "કાર્યાલય સરનામું"

 #: ../src/contacts-contact-pane.vala:417
-#| msgid "Note"
 msgid "Notes"
 msgstr "નોંધો"

 #: ../src/contacts-contact-pane.vala:434
-#| msgid "Online Accounts"
 msgid "Linked Accounts"
 msgstr "કડી થયેલ ખાતા"

 #: ../src/contacts-contact-pane.vala:446
-#| msgid "Create Contact"
 msgid "Remove Contact"
 msgstr "સંપર્કને દૂર કરો"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "સંપર્ક પસંદ કરો"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "શેરી"
@ -476,7 +468,6 @@ msgstr "સ્થાનિક સંપર્ક"

 #: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-#| msgid "Online Accounts"
 msgid "%s - Linked Accounts"
 msgstr "%s - કડી થયેલ ખાતા"

@ -488,7 +479,7 @@ msgstr "તમે સંપર્ક યાદીમાંથી જાતે
 msgid "Remove"
 msgstr "દૂર કરો"

-#: ../src/contacts-list-pane.vala:141
+#: ../src/contacts-list-pane.vala:143
 msgid "Delete"
 msgstr "કાઢી નાંખો"

@ -654,11 +645,11 @@ msgstr "ટેલિફોન"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "સૂચનો"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "બીજા સંપર્કો"

@ -675,7 +666,6 @@ msgid "View subset"
 msgstr "ઉપગણ જુઓ"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#| msgid "New contact"
 msgid "View contacts subset"
 msgstr "સંપર્ક ઉપગણને જુઓ"

@ -714,9 +704,6 @@ msgstr "સંપર્ક ઉપગણને જુઓ"
 #~ msgid "Select what to call"
 #~ msgstr "પસંદ કરો શું કોલ કરવાનું છે"

-#~ msgid "Select chat account"
-#~ msgstr "વાર્તાલાપ ખાતુ પસંદ કરો"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "કડી થયેલ સંપર્કોને ઉમેરો/દૂર કરો..."

--- a/po/hi.po
+++ b/po/hi.po
@ -4,16 +4,16 @@
 # This file is distributed under the same license as the gnome-contacts package.
 #
 # Rajesh <rranjan>, 2011.
-# rajesh <rajeshkajha@yahoo.com>, 2012.
+# rajesh <rajeshkajha@yahoo.com>, 2012, 2013.
 # chandankumar <chandankumar.093047@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts.po.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-17 12:05+0000\n"
-"PO-Revision-Date: 2013-03-25 11:36+0000\n"
-"Last-Translator: chandankumar <chandankumar.093047@gmail.com>\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-05-02 13:56+0530\n"
+"Last-Translator: Rajesh Ranjan <rajeshkajha@yahoo.com>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
@ -37,12 +37,10 @@ msgid "View"
 msgstr "दृश्य"

 #: ../src/app-menu.ui.h:2
-#| msgid "Link Contact"
 msgid "Main contacts"
 msgstr "मुख्य संपर्क"

 #: ../src/app-menu.ui.h:3
-#| msgid "Contacts"
 msgid "All contacts"
 msgstr "सभी संपर्कों"

@ -113,13 +111,11 @@ msgid "Done"
 msgstr "संपन्न"

 #: ../src/contacts-app.vala:381
-#| msgid "Edit"
 msgid "Editing"
 msgstr "संपादन"

 #: ../src/contacts-app.vala:498
 #, c-format
-#| msgid "Select contact to link to"
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d संपर्क कड़ीबद्ध "
@ -127,7 +123,6 @@ msgstr[1] "%d संपर्क कड़ीबद्ध "

 #: ../src/contacts-app.vala:529
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d संपर्क मिटाया गया"
@ -241,8 +236,8 @@ msgstr "उपनाम"
 msgid "Birthday"
 msgstr "जन्मदिन"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "टिप्पणी"
@ -266,7 +261,6 @@ msgid "No"
 msgstr "नहीं"

 #: ../src/contacts-contact-pane.vala:349
-#| msgid "Add Detail"
 msgid "New Detail"
 msgstr "नया विवरण"

@ -276,12 +270,10 @@ msgid "Personal email"
 msgstr "व्यक्तिगत ईमेल"

 #: ../src/contacts-contact-pane.vala:368
-#| msgid "Work Fax"
 msgid "Work email"
 msgstr "कार्यालय ई-मेल "

 #: ../src/contacts-contact-pane.vala:374
-#| msgid "Mobile"
 msgid "Mobile phone"
 msgstr "मोबाइल फोन "

@ -298,30 +290,30 @@ msgid "Link"
 msgstr "कड़ी"

 #: ../src/contacts-contact-pane.vala:406
-#| msgid "Address"
 msgid "Home address"
 msgstr " घर का पता"

 #: ../src/contacts-contact-pane.vala:411
-#| msgid "Address"
 msgid "Work address"
 msgstr " आफिस का पता"

 #: ../src/contacts-contact-pane.vala:417
-#| msgid "Note"
 msgid "Notes"
 msgstr " टिप्पणी"

 #: ../src/contacts-contact-pane.vala:434
-#| msgid "Online Accounts"
 msgid "Linked Accounts"
 msgstr "लिंक्ड खातों"

 #: ../src/contacts-contact-pane.vala:446
-#| msgid "Create Contact"
 msgid "Remove Contact"
 msgstr "कान्टेक्ट मिटाएँ"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "कोई संपर्क चुनें"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "सड़क"
@ -480,7 +472,6 @@ msgstr "स्थानीय संपर्क"

 #: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-#| msgid "Online Accounts"
 msgid "%s - Linked Accounts"
 msgstr "%s -  लिंक्ड खातों"

@ -659,11 +650,11 @@ msgstr "टेलेक्स"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "सुझाव"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "अन्य संपर्क"

@ -680,7 +671,6 @@ msgid "View subset"
 msgstr "सबसेट देखें"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#| msgid "New contact"
 msgid "View contacts subset"
 msgstr "संपर्क उपसमुच्चय देखें"

@ -727,9 +717,6 @@ msgstr "संपर्क उपसमुच्चय देखें"
 #~ msgid "Select what to call"
 #~ msgstr "चुनें कि क्या कॉल करने हैं"

-#~ msgid "Select chat account"
-#~ msgstr "चैट खाता चुनें"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "कड़ीबद्ध संपर्क जोड़ें/हटाएँ..."

--- a/po/ja.po
+++ b/po/ja.po
@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-10-15 08:36+0000\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
 "PO-Revision-Date: 2012-10-16 20:58+0000\n"
 "Last-Translator: OKANO Takayoshi <kano@na.rim.or.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@ -20,95 +20,141 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:240
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:285
 #: ../src/main.vala:28
 msgid "Contacts"
 msgstr "連絡先"

+#: ../data/gnome-contacts.desktop.in.in.h:2
+msgid "friends;address book;"
+msgstr "friends;address book;友達;アドレス帳;contacts;"
+
 #: ../src/app-menu.ui.h:1
+msgid "View"
+msgstr ""
+
+#: ../src/app-menu.ui.h:2
+#, fuzzy
+#| msgid "Link Contact"
+msgid "Main contacts"
+msgstr "連絡先をリンク"
+
+#: ../src/app-menu.ui.h:3
+#, fuzzy
+#| msgid "Contacts"
+msgid "All contacts"
+msgstr "連絡先"
+
+#: ../src/app-menu.ui.h:4
 msgid "_Change Address Book..."
 msgstr "アドレス帳を変更...(_C)"

-#: ../src/app-menu.ui.h:2
+#: ../src/app-menu.ui.h:5
 msgid "_About Contacts"
 msgstr "このアプリケーションについて(_A)"

-#: ../src/app-menu.ui.h:3
+#: ../src/app-menu.ui.h:6
 msgid "_Help"
 msgstr "ヘルプ(_H)"

-#: ../src/app-menu.ui.h:4
+#: ../src/app-menu.ui.h:7
 msgid "_Quit"
 msgstr "終了(_Q)"

-#: ../src/contacts-app.vala:79
+#: ../src/contacts-app.vala:108
 #, c-format
 msgid "No contact with id %s found"
 msgstr "ID %s に該当する連絡先はありません。"

-#: ../src/contacts-app.vala:80 ../src/contacts-app.vala:204
+#: ../src/contacts-app.vala:109 ../src/contacts-app.vala:233
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"

-#: ../src/contacts-app.vala:89
+#: ../src/contacts-app.vala:118
 msgid "Change Address Book"
 msgstr "アドレス帳を変更"

-#: ../src/contacts-app.vala:94 ../src/contacts-setup-window.vala:152
+#: ../src/contacts-app.vala:123 ../src/contacts-setup-window.vala:152
 msgid "Select"
 msgstr "選択"

-#: ../src/contacts-app.vala:182
+#: ../src/contacts-app.vala:211
 msgid "translator-credits"
 msgstr ""
 "Hajime Taira <htaira@redhat.com>\n"
 "Mako N <mako@pasero.net>"

-#: ../src/contacts-app.vala:183
+#: ../src/contacts-app.vala:212
 msgid "GNOME Contacts"
 msgstr "GNOME Contacts"

-#: ../src/contacts-app.vala:184
+#: ../src/contacts-app.vala:213
 msgid "About GNOME Contacts"
 msgstr "このアプリケーションについて"

-#: ../src/contacts-app.vala:185
+#: ../src/contacts-app.vala:214
 msgid "Contact Management Application"
 msgstr "連絡先管理アプリケーション"

-#: ../src/contacts-app.vala:203
+#: ../src/contacts-app.vala:232
 #, c-format
 msgid "No contact with email address %s found"
 msgstr "Eメールアドレス %s に該当する連絡先はありません"

-#: ../src/contacts-app.vala:256
+#: ../src/contacts-app.vala:299
 msgid "New"
 msgstr "新規"

-#: ../src/contacts-app.vala:391
+#: ../src/contacts-app.vala:326
+msgid "Edit"
+msgstr "編集"
+
+#: ../src/contacts-app.vala:332
+msgid "Done"
+msgstr "完了"
+
+#: ../src/contacts-app.vala:381
+#, fuzzy
+#| msgid "Edit"
+msgid "Editing"
+msgstr "編集"
+
+#: ../src/contacts-app.vala:498
+#, c-format
+msgid "%d contacts linked"
+msgid_plural "%d contacts linked"
+msgstr[0] "連絡先を %d 件リンクしました"
+
+#: ../src/contacts-app.vala:529
+#, c-format
+msgid "%d contact deleted"
+msgid_plural "%d contacts deleted"
+msgstr[0] "連絡先を %d 件削除しました"
+
+#: ../src/contacts-app.vala:570
 #, c-format
 msgid "Contact deleted: \"%s\""
 msgstr "連絡先を削除しました: \"%s\""

-#: ../src/contacts-app.vala:418
+#: ../src/contacts-app.vala:596
 msgid "Show contact with this individual id"
 msgstr "この個別IDで連絡先を表示"

-#: ../src/contacts-app.vala:420
+#: ../src/contacts-app.vala:598
 msgid "Show contact with this email address"
 msgstr "このEメールアドレスで連絡先を表示"

-#: ../src/contacts-app.vala:433
+#: ../src/contacts-app.vala:611
 #, c-format
 msgid "%s linked to %s"
 msgstr "%s を %s にリンク"

-#: ../src/contacts-app.vala:435 ../src/contacts-link-dialog.vala:87
+#: ../src/contacts-app.vala:613
 #, c-format
 msgid "%s linked to the contact"
 msgstr "%s をこの連絡先にリンク"

-#: ../src/contacts-app.vala:452
+#: ../src/contacts-app.vala:630
 msgid "— contact management"
 msgstr "— 連絡先の管理"

@ -120,309 +166,297 @@ msgstr "もっと写真を見る"
 msgid "Select Picture"
 msgstr "写真を選択"

-#: ../src/contacts-avatar-dialog.vala:247 ../src/contacts-link-dialog.vala:152
+#: ../src/contacts-avatar-dialog.vala:247
+#: ../src/contacts-linked-accounts-dialog.vala:37
 msgid "Close"
 msgstr "閉じる"

-#: ../src/contacts-contact-pane.vala:591
-msgctxt "Addresses on the Web"
-msgid "Links"
-msgstr "リンク"
-
-#: ../src/contacts-contact-pane.vala:592
-msgctxt "Web address"
-msgid "Link"
-msgstr "リンク"
-
-#: ../src/contacts-contact-pane.vala:679 ../src/contacts-contact-pane.vala:680
-#: ../src/contacts-link-dialog.vala:116
-#: ../src/contacts-new-contact-dialog.vala:86
-#: ../src/contacts-new-contact-dialog.vala:121
-msgid "Email"
-msgstr "Eメール"
-
-#: ../src/contacts-contact-pane.vala:721
-#: ../src/contacts-new-contact-dialog.vala:95
-#: ../src/contacts-new-contact-dialog.vala:126
-msgid "Phone"
-msgstr "電話"
-
-#: ../src/contacts-contact-pane.vala:722 ../src/contacts-link-dialog.vala:132
-msgid "Phone number"
-msgstr "電話番号"
-
-#: ../src/contacts-contact-pane.vala:782 ../src/contacts-contact-pane.vala:783
-msgid "Chat"
-msgstr "チャット"
-
-#: ../src/contacts-contact-pane.vala:848
+#: ../src/contacts-contact-editor.vala:352
 msgid "January"
 msgstr "1月"

-#: ../src/contacts-contact-pane.vala:849
+#: ../src/contacts-contact-editor.vala:353
 msgid "February"
 msgstr "2月"

-#: ../src/contacts-contact-pane.vala:850
+#: ../src/contacts-contact-editor.vala:354
 msgid "March"
 msgstr "3月"

-#: ../src/contacts-contact-pane.vala:851
+#: ../src/contacts-contact-editor.vala:355
 msgid "April"
 msgstr "4月"

-#: ../src/contacts-contact-pane.vala:852
+#: ../src/contacts-contact-editor.vala:356
 msgid "May"
 msgstr "5月"

-#: ../src/contacts-contact-pane.vala:853
+#: ../src/contacts-contact-editor.vala:357
 msgid "June"
 msgstr "6月"

-#: ../src/contacts-contact-pane.vala:854
+#: ../src/contacts-contact-editor.vala:358
 msgid "July"
 msgstr "7月"

-#: ../src/contacts-contact-pane.vala:855
+#: ../src/contacts-contact-editor.vala:359
 msgid "August"
 msgstr "8月"

-#: ../src/contacts-contact-pane.vala:856
+#: ../src/contacts-contact-editor.vala:360
 msgid "September"
 msgstr "9月"

-#: ../src/contacts-contact-pane.vala:857
+#: ../src/contacts-contact-editor.vala:361
 msgid "October"
 msgstr "10月"

-#: ../src/contacts-contact-pane.vala:858
+#: ../src/contacts-contact-editor.vala:362
 msgid "November"
 msgstr "11月"

-#: ../src/contacts-contact-pane.vala:859
+#: ../src/contacts-contact-editor.vala:363
 msgid "December"
 msgstr "12月"

-#: ../src/contacts-contact-pane.vala:897 ../src/contacts-contact-pane.vala:898
-msgid "Birthday"
-msgstr "誕生日"
+#: ../src/contacts-contact-editor.vala:489
+#: ../src/contacts-contact-editor.vala:496
+#: ../src/contacts-contact-sheet.vala:169
+msgid "Website"
+msgstr "ウェブサイト"

-#: ../src/contacts-contact-pane.vala:970 ../src/contacts-contact-pane.vala:971
+#: ../src/contacts-contact-editor.vala:515
+#: ../src/contacts-contact-editor.vala:522
+#: ../src/contacts-contact-pane.vala:395
+#: ../src/contacts-contact-sheet.vala:179
 msgid "Nickname"
 msgstr "ニックネーム"

-#: ../src/contacts-contact-pane.vala:1061
-#: ../src/contacts-contact-pane.vala:1062
+#: ../src/contacts-contact-editor.vala:542
+#: ../src/contacts-contact-editor.vala:549
+#: ../src/contacts-contact-pane.vala:400
+#: ../src/contacts-contact-sheet.vala:186
+msgid "Birthday"
+msgstr "誕生日"
+
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
+#: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "メモ"

-#: ../src/contacts-contact-pane.vala:1201
-msgid "Addresses"
-msgstr "住所"
-
-#: ../src/contacts-contact-pane.vala:1202
-#: ../src/contacts-new-contact-dialog.vala:104
-#: ../src/contacts-new-contact-dialog.vala:131
-msgid "Address"
-msgstr "住所"
-
-#: ../src/contacts-contact-pane.vala:1304
-msgid "Add to My Contacts"
-msgstr "連絡先に追加"
-
-#: ../src/contacts-contact-pane.vala:1314
-msgid "Unlink"
-msgstr "リンク解除"
-
-#: ../src/contacts-contact-pane.vala:1346
-msgid "Add detail..."
-msgstr "詳細を追加..."
-
-#: ../src/contacts-contact-pane.vala:1361
-#, c-format
-msgid "Select detail to add to %s"
-msgstr "%s に追加する詳細情報を選択"
-
-#: ../src/contacts-contact-pane.vala:1752
+#: ../src/contacts-contact-pane.vala:183
 #, c-format
 msgid "Does %s from %s belong here?"
 msgstr "%s (%s) が属するのはここですか?"

-#: ../src/contacts-contact-pane.vala:1754
+#: ../src/contacts-contact-pane.vala:185
 #, c-format
 msgid "Do these details belong to %s?"
 msgstr "これらの詳細情報は %s に関するものですか?"

-#: ../src/contacts-contact-pane.vala:1764
+#: ../src/contacts-contact-pane.vala:196
 msgid "Yes"
 msgstr "はい"

-#: ../src/contacts-contact-pane.vala:1765
+#: ../src/contacts-contact-pane.vala:197
 msgid "No"
 msgstr "いいえ"

-#: ../src/contacts-contact-pane.vala:1962
-msgid "Select email address"
-msgstr "Eメールアドレスを選択"
+#: ../src/contacts-contact-pane.vala:349
+msgid "New Detail"
+msgstr "詳細を追加"

-#: ../src/contacts-contact-pane.vala:2035
-msgid "Select what to call"
-msgstr "何を呼び出すか選択する"
+#. building menu
+#: ../src/contacts-contact-pane.vala:363
+msgid "Personal email"
+msgstr "個人のメール"

-#: ../src/contacts-contact-pane.vala:2099
-msgid "Select chat account"
-msgstr "チャットアカウントを選択"
+#: ../src/contacts-contact-pane.vala:368
+msgid "Work email"
+msgstr "職場のメール"

-#: ../src/contacts-contact-pane.vala:2179
-msgid "Add/Remove Linked Contacts..."
-msgstr "リンクされた連絡先の追加と削除..."
+#: ../src/contacts-contact-pane.vala:374
+msgid "Mobile phone"
+msgstr "携帯電話"

-#. Utils.add_menu_item (context_menu,_("Send..."));
-#: ../src/contacts-contact-pane.vala:2183
-msgid "Delete"
-msgstr "削除"
+#: ../src/contacts-contact-pane.vala:379
+msgid "Home phone"
+msgstr "自宅の電話"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact-pane.vala:384
+msgid "Work phone"
+msgstr "職場の電話"
+
+#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:140
+msgid "Link"
+msgstr "リンク"
+
+#: ../src/contacts-contact-pane.vala:406
+msgid "Home address"
+msgstr "自宅の住所"
+
+#: ../src/contacts-contact-pane.vala:411
+msgid "Work address"
+msgstr "職場の住所"
+
+#: ../src/contacts-contact-pane.vala:417
+msgid "Notes"
+msgstr "メモ"
+
+#: ../src/contacts-contact-pane.vala:434
+msgid "Linked Accounts"
+msgstr "リンク済みアカウント"
+
+#: ../src/contacts-contact-pane.vala:446
+msgid "Remove Contact"
+msgstr "連絡先を削除"
+
+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "連絡先を選択してください"
+
+#: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "町丁名"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "Extension"
 msgstr "番地"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "City"
 msgstr "市(区町村)"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "State/Province"
 msgstr "県(州)"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "Zip/Postal Code"
 msgstr "郵便番号"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "PO box"
 msgstr "私書箱"

-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:675
 msgid "Country"
 msgstr "国"

-#: ../src/contacts-contact.vala:742
+#: ../src/contacts-contact.vala:731
 msgid "Google Talk"
 msgstr "Google トーク"

-#: ../src/contacts-contact.vala:743
+#: ../src/contacts-contact.vala:732
 msgid "Ovi Chat"
 msgstr "Ovi Chat"

-#: ../src/contacts-contact.vala:744 ../src/contacts-contact.vala:1026
+#: ../src/contacts-contact.vala:733 ../src/contacts-contact.vala:1017
 msgid "Facebook"
 msgstr "Facebook"

-#: ../src/contacts-contact.vala:745
+#: ../src/contacts-contact.vala:734
 msgid "Livejournal"
 msgstr "Livejournal"

-#: ../src/contacts-contact.vala:746
+#: ../src/contacts-contact.vala:735
 msgid "AOL Instant Messenger"
 msgstr "AOL インスタントメッセンジャー"

-#: ../src/contacts-contact.vala:747
+#: ../src/contacts-contact.vala:736
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"

-#: ../src/contacts-contact.vala:748
+#: ../src/contacts-contact.vala:737
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"

-#: ../src/contacts-contact.vala:749
+#: ../src/contacts-contact.vala:738
 msgid "ICQ"
 msgstr "ICQ"

-#: ../src/contacts-contact.vala:750
+#: ../src/contacts-contact.vala:739
 msgid "IRC"
 msgstr "IRC"

-#: ../src/contacts-contact.vala:751
+#: ../src/contacts-contact.vala:740
 msgid "Jabber"
 msgstr "Jabber"

-#: ../src/contacts-contact.vala:752
+#: ../src/contacts-contact.vala:741
 msgid "Local network"
 msgstr "ローカルネットワーク"

-#: ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:742
 msgid "Windows Live Messenger"
 msgstr "Windows Live メッセンジャー"

-#: ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:743
 msgid "MySpace"
 msgstr "MySpace"

-#: ../src/contacts-contact.vala:755
+#: ../src/contacts-contact.vala:744
 msgid "MXit"
 msgstr "MXit"

-#: ../src/contacts-contact.vala:756
+#: ../src/contacts-contact.vala:745
 msgid "Napster"
 msgstr "Napster"

-#: ../src/contacts-contact.vala:757
+#: ../src/contacts-contact.vala:746
 msgid "Tencent QQ"
 msgstr "Tencent QQ"

-#: ../src/contacts-contact.vala:758
+#: ../src/contacts-contact.vala:747
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"

-#: ../src/contacts-contact.vala:759
+#: ../src/contacts-contact.vala:748
 msgid "SILC"
 msgstr "SILC"

-#: ../src/contacts-contact.vala:760
+#: ../src/contacts-contact.vala:749
 msgid "sip"
 msgstr "sip"

-#: ../src/contacts-contact.vala:761
+#: ../src/contacts-contact.vala:750
 msgid "Skype"
 msgstr "Skype"

-#: ../src/contacts-contact.vala:762
+#: ../src/contacts-contact.vala:751
 msgid "Telephony"
 msgstr "テレフォニー"

-#: ../src/contacts-contact.vala:763
+#: ../src/contacts-contact.vala:752
 msgid "Trepia"
 msgstr "Trepia"

-#: ../src/contacts-contact.vala:764 ../src/contacts-contact.vala:765
+#: ../src/contacts-contact.vala:753 ../src/contacts-contact.vala:754
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! メッセンジャー"

-#: ../src/contacts-contact.vala:766
+#: ../src/contacts-contact.vala:755
 msgid "Zephyr"
 msgstr "Zephyr"

-#: ../src/contacts-contact.vala:1029
+#: ../src/contacts-contact.vala:1020
 msgid "Twitter"
 msgstr "Twitter"

-#: ../src/contacts-contact.vala:1032
+#: ../src/contacts-contact.vala:1023
 msgid "Google Profile"
 msgstr "Google プロフィール"

-#: ../src/contacts-contact.vala:1096
+#: ../src/contacts-contact.vala:1087
 msgid "Unexpected internal error: created contact was not found"
 msgstr "予期しない内部エラー: 新しく作成した連絡先が見つかりませんでした"

-#: ../src/contacts-contact.vala:1234
+#: ../src/contacts-contact.vala:1261
 msgid "Google Circles"
 msgstr "Google サークル"

-#: ../src/contacts-contact.vala:1236
+#: ../src/contacts-contact.vala:1263
 msgid "Google Other Contact"
 msgstr "Google のその他の連絡先"

@ -438,35 +472,22 @@ msgstr "Google"
 msgid "Local Contact"
 msgstr "ローカルの連絡先"

-#: ../src/contacts-link-dialog.vala:73
-msgctxt "contacts link action"
-msgid "Link"
-msgstr "リンク"
-
-#: ../src/contacts-link-dialog.vala:84
-msgid "Undo"
-msgstr "やり直し"
-
-#: ../src/contacts-link-dialog.vala:148
-msgid "Link Contact"
-msgstr "連絡先をリンク"
-
-#: ../src/contacts-link-dialog.vala:154 ../src/contacts-setup-window.vala:137
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../src/contacts-link-dialog.vala:154
-msgid "Link"
-msgstr "リンク"
-
-#: ../src/contacts-link-dialog.vala:182
+#: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-msgid "Link contacts to %s"
-msgstr "連絡先を %s にリンクする"
+msgid "%s - Linked Accounts"
+msgstr "%s - リンク済みアカウント"

-#: ../src/contacts-link-dialog.vala:184
-msgid "Select contact to link to"
-msgstr "リンクする連絡先を選択"
+#: ../src/contacts-linked-accounts-dialog.vala:56
+msgid "You can manually link contacts from the contacts list"
+msgstr "連絡先リストから手動で連絡先をリンクできます"
+
+#: ../src/contacts-linked-accounts-dialog.vala:102
+msgid "Remove"
+msgstr "削除"
+
+#: ../src/contacts-list-pane.vala:143
+msgid "Delete"
+msgstr "削除"

 #: ../src/contacts-new-contact-dialog.vala:35
 msgid "New contact"
@ -488,6 +509,21 @@ msgstr ""
 msgid "Contact Name"
 msgstr "連絡先名"

+#: ../src/contacts-new-contact-dialog.vala:86
+#: ../src/contacts-new-contact-dialog.vala:121
+msgid "Email"
+msgstr "Eメール"
+
+#: ../src/contacts-new-contact-dialog.vala:95
+#: ../src/contacts-new-contact-dialog.vala:126
+msgid "Phone"
+msgstr "電話"
+
+#: ../src/contacts-new-contact-dialog.vala:104
+#: ../src/contacts-new-contact-dialog.vala:131
+msgid "Address"
+msgstr "住所"
+
 #: ../src/contacts-new-contact-dialog.vala:113
 msgid "Add Detail"
 msgstr "詳細を追加"
@ -534,83 +570,91 @@ msgstr "ローカルのアドレス帳を使う"
 msgid "Contacts Setup"
 msgstr "連絡先の設定"

-#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:133
-#: ../src/contacts-types.vala:234 ../src/contacts-types.vala:324
+#: ../src/contacts-setup-window.vala:137
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. Refers to the type of the detail, could be Home, Work or Other for email, and the same
+#. * for phone numbers, addresses, etc.
+#: ../src/contacts-types.vala:115 ../src/contacts-types.vala:127
+#: ../src/contacts-types.vala:228 ../src/contacts-types.vala:341
 msgid "Other"
 msgstr "その他"

-#: ../src/contacts-types.vala:121
-msgid "Custom..."
-msgstr "カスタム..."
-
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:289 ../src/contacts-types.vala:320
+#: ../src/contacts-types.vala:283 ../src/contacts-types.vala:337
 msgid "Home"
 msgstr "自宅"

-#: ../src/contacts-types.vala:290 ../src/contacts-types.vala:315
+#: ../src/contacts-types.vala:284 ../src/contacts-types.vala:307
+#: ../src/contacts-types.vala:332
 msgid "Work"
 msgstr "仕事"

 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:314
+#: ../src/contacts-types.vala:306
+msgid "Personal"
+msgstr "個人"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:331
 msgid "Assistant"
 msgstr "アシスタント"

-#: ../src/contacts-types.vala:316
+#: ../src/contacts-types.vala:333
 msgid "Work Fax"
 msgstr "職場 Fax"

-#: ../src/contacts-types.vala:317
+#: ../src/contacts-types.vala:334
 msgid "Callback"
 msgstr "コールバック"

-#: ../src/contacts-types.vala:318
+#: ../src/contacts-types.vala:335
 msgid "Car"
 msgstr "自動車電話"

-#: ../src/contacts-types.vala:319
+#: ../src/contacts-types.vala:336
 msgid "Company"
 msgstr "会社"

-#: ../src/contacts-types.vala:321
+#: ../src/contacts-types.vala:338
 msgid "Home Fax"
 msgstr "自宅 Fax"

-#: ../src/contacts-types.vala:322
+#: ../src/contacts-types.vala:339
 msgid "ISDN"
 msgstr "ISDN"

-#: ../src/contacts-types.vala:323
+#: ../src/contacts-types.vala:340
 msgid "Mobile"
 msgstr "携帯電話"

-#: ../src/contacts-types.vala:325
+#: ../src/contacts-types.vala:342
 msgid "Fax"
 msgstr "Fax"

-#: ../src/contacts-types.vala:326
+#: ../src/contacts-types.vala:343
 msgid "Pager"
 msgstr "ポケベル"

-#: ../src/contacts-types.vala:327
+#: ../src/contacts-types.vala:344
 msgid "Radio"
 msgstr "ラジオ"

-#: ../src/contacts-types.vala:328
+#: ../src/contacts-types.vala:345
 msgid "Telex"
 msgstr "テレックス"

 #. To translators: TTY is Teletypewriter
-#: ../src/contacts-types.vala:330
+#: ../src/contacts-types.vala:347
 msgid "TTY"
 msgstr "テレタイプライター"

-#: ../src/contacts-view.vala:271
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "提案"

-#: ../src/contacts-view.vala:296
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "その他の連絡先"

@ -622,6 +666,62 @@ msgstr "初期設定を完了しました。"
 msgid "Set to true when the user ran the first-time setup wizard."
 msgstr "ユーザーが初期設定ウィザードを実行すると、true に設定されます。"

+#: ../src/org.gnome.Contacts.gschema.xml.in.h:3
+msgid "View subset"
+msgstr "表示するサブセット"
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:4
+msgid "View contacts subset"
+msgstr "表示する連絡先のサブセットを設定します。"
+
+#~ msgctxt "Addresses on the Web"
+#~ msgid "Links"
+#~ msgstr "リンク"
+
+#~ msgctxt "Web address"
+#~ msgid "Link"
+#~ msgstr "リンク"
+
+#~ msgid "Phone number"
+#~ msgstr "電話番号"
+
+#~ msgid "Chat"
+#~ msgstr "チャット"
+
+#~ msgid "Addresses"
+#~ msgstr "住所"
+
+#~ msgid "Add to My Contacts"
+#~ msgstr "連絡先に追加"
+
+#~ msgid "Unlink"
+#~ msgstr "リンク解除"
+
+#~ msgid "Add detail..."
+#~ msgstr "詳細を追加..."
+
+#~ msgid "Select detail to add to %s"
+#~ msgstr "%s に追加する詳細情報を選択"
+
+#~ msgid "Select email address"
+#~ msgstr "Eメールアドレスを選択"
+
+#~ msgid "Select what to call"
+#~ msgstr "何を呼び出すか選択する"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "リンクされた連絡先の追加と削除..."
+
+#~ msgctxt "contacts link action"
+#~ msgid "Link"
+#~ msgstr "リンク"
+
+#~ msgid "Link contacts to %s"
+#~ msgstr "連絡先を %s にリンクする"
+
+#~ msgid "Custom..."
+#~ msgstr "カスタム..."
+
 #~ msgid "Unknown status"
 #~ msgstr "不明な在席状況"

@ -682,9 +782,6 @@ msgstr "ユーザーが初期設定ウィザードを実行すると、true に
 #~ msgid "Manager"
 #~ msgstr "マネージャー"

-#~ msgid "Edit"
-#~ msgstr "編集"
-
 #~ msgid "More"
 #~ msgstr "詳細"

--- a/po/kn.po
+++ b/po/kn.po
@ -1,26 +1,28 @@
 # Kannada translation for gnome-contacts.
 # Copyright (C) 2012 gnome-contacts's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-contacts package.
-#
+# 
 # Shankar Prasad <prasad.mvs@gmail.com>, 2012.
 # Shankar Prasad <svenkate@redhat.com>, 2012, 2013.
+# Shankar <svenkate@redhat.com>, 2013. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2013-03-17 12:05+0000\n"
-"PO-Revision-Date: 2013-03-26 00:30+0530\n"
-"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+"PO-Revision-Date: 2013-10-21 05:12-0400\n"
+"Last-Translator: Shankar <svenkate@redhat.com>\n"
 "Language-Team: Kannada <kn@li.org>\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"Language: kn\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Zanata 3.2.3\n"

-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:285
+#: ../data/gnome-contacts.desktop.in.in.h:1
+#: ../src/contacts-app.vala:285
 #: ../src/main.vala:28
 msgid "Contacts"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳು"
@ -34,12 +36,10 @@ msgid "View"
 msgstr "ನೋಟ"

 #: ../src/app-menu.ui.h:2
-#| msgid "Link Contact"
 msgid "Main contacts"
 msgstr "ಮುಖ್ಯ ಸಂಪರ್ಕಗಳು"

 #: ../src/app-menu.ui.h:3
-#| msgid "Contacts"
 msgid "All contacts"
 msgstr "ಎಲ್ಲಾ ಸಂಪರ್ಕವಿಳಾಸಗಳು"

@ -64,7 +64,8 @@ msgstr "ನಿರ್ಗಮಿಸು (_Q)"
 msgid "No contact with id %s found"
 msgstr "ಯಾವುದೆ ಸಂಪರ್ಕವಿಳಾಸ id %s ಕಂಡು ಬಂದಿಲ್ಲ"

-#: ../src/contacts-app.vala:109 ../src/contacts-app.vala:233
+#: ../src/contacts-app.vala:109
+#: ../src/contacts-app.vala:233
 msgid "Contact not found"
 msgstr "ಸಂಪರ್ಕವು ಕಂಡು ಬಂದಿಲ್ಲ"

@ -72,7 +73,8 @@ msgstr "ಸಂಪರ್ಕವು ಕಂಡು ಬಂದಿಲ್ಲ"
 msgid "Change Address Book"
 msgstr "ವಿಳಾಸಪುಸ್ತಕವನ್ನು ಬದಲಾಯಿಸಿ"

-#: ../src/contacts-app.vala:123 ../src/contacts-setup-window.vala:152
+#: ../src/contacts-app.vala:123
+#: ../src/contacts-setup-window.vala:152
 msgid "Select"
 msgstr "ಆರಿಸು"

@ -101,58 +103,56 @@ msgstr "%s ವಿಅಂಚೆ ವಿಳಾಸವನ್ನು ಹೊಂದಿರ
 msgid "New"
 msgstr "ಹೊಸ"

-#: ../src/contacts-app.vala:326
+#: ../src/contacts-app.vala:327
 msgid "Edit"
 msgstr "ಸಂಪಾದಿಸು"

-#: ../src/contacts-app.vala:332
+#: ../src/contacts-app.vala:333
 msgid "Done"
 msgstr "ಆಯಿತು"

-#: ../src/contacts-app.vala:381
+#: ../src/contacts-app.vala:382
 msgid "Editing"
 msgstr "ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"

-#: ../src/contacts-app.vala:498
+#: ../src/contacts-app.vala:499
 #, c-format
-#| msgid "Select contact to link to"
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಜೋಡಿಸಲಾಗಿದೆ"
 msgstr[1] "%d ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ಜೋಡಿಸಲಾಗಿದೆ"

-#: ../src/contacts-app.vala:529
+#: ../src/contacts-app.vala:530
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಅಳಿಸಲಾಗಿದೆ"
 msgstr[1] "%d ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಅಳಿಸಲಾಗಿದೆ"

-#: ../src/contacts-app.vala:570
+#: ../src/contacts-app.vala:571
 #, c-format
 msgid "Contact deleted: \"%s\""
 msgstr "ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಲಾದ: \"%s\""

-#: ../src/contacts-app.vala:596
+#: ../src/contacts-app.vala:597
 msgid "Show contact with this individual id"
 msgstr "ಈ ಪ್ರತ್ಯೇಕ id ಯನ್ನು ಹೊಂದಿರುವ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ತೋರಿಸು"

-#: ../src/contacts-app.vala:598
+#: ../src/contacts-app.vala:599
 msgid "Show contact with this email address"
 msgstr "ಈ ವಿಅಂಚೆ ವಿಳಾಸವನ್ನು ಹೊಂದಿರುವ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ತೋರಿಸು"

-#: ../src/contacts-app.vala:611
+#: ../src/contacts-app.vala:612
 #, c-format
 msgid "%s linked to %s"
 msgstr "%s ಅನ್ನು %s ಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"

-#: ../src/contacts-app.vala:613
+#: ../src/contacts-app.vala:614
 #, c-format
 msgid "%s linked to the contact"
 msgstr "%s ಅನ್ನು ಸಂಪರ್ಕವಿಳಾಸಕ್ಕೆ ಜೋಡಿಸಲಾಗಿದೆ"

-#: ../src/contacts-app.vala:630
+#: ../src/contacts-app.vala:631
 msgid "— contact management"
 msgstr "— ಸಂಪರ್ಕವಿಳಾಸ ವ್ಯವಸ್ಥಾಪನೆ"

@ -237,8 +237,8 @@ msgstr "ಅಡ್ಡಹೆಸರು"
 msgid "Birthday"
 msgstr "ಹುಟ್ಟಿದದಿನ"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "ಟಿಪ್ಪಣಿ"
@ -262,7 +262,6 @@ msgid "No"
 msgstr "ಇಲ್ಲ"

 #: ../src/contacts-contact-pane.vala:349
-#| msgid "Add Detail"
 msgid "New Detail"
 msgstr "ಹೊಸ ವಿವರ"

@ -272,12 +271,10 @@ msgid "Personal email"
 msgstr "ವೈಯಕ್ತಿಕ ವಿಅಂಚೆ"

 #: ../src/contacts-contact-pane.vala:368
-#| msgid "Work Fax"
 msgid "Work email"
 msgstr "ಕೆಲಸದ ಇಮೇಲ್"

 #: ../src/contacts-contact-pane.vala:374
-#| msgid "Mobile"
 msgid "Mobile phone"
 msgstr "ಮೊಬೈಲ್ ದೂರವಾಣಿ"

@ -289,35 +286,35 @@ msgstr "ಮನೆಯ ದೂರವಾಣಿ"
 msgid "Work phone"
 msgstr "ಕೆಲಸದ ದೂರವಾಣಿ"

-#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:140
+#: ../src/contacts-contact-pane.vala:390
+#: ../src/contacts-list-pane.vala:140
 msgid "Link"
 msgstr "ಕೊಂಡಿ"

 #: ../src/contacts-contact-pane.vala:406
-#| msgid "Address"
 msgid "Home address"
 msgstr "ಮನೆಯ ವಿಳಾಸ"

 #: ../src/contacts-contact-pane.vala:411
-#| msgid "Address"
 msgid "Work address"
 msgstr "ಕೆಲಸದ ವಿಳಾಸ"

 #: ../src/contacts-contact-pane.vala:417
-#| msgid "Note"
 msgid "Notes"
 msgstr "ಟಿಪ್ಪಣಿಗಳು"

 #: ../src/contacts-contact-pane.vala:434
-#| msgid "Online Accounts"
 msgid "Linked Accounts"
 msgstr "ಕೊಂಡಿ ಮಾಡಲಾದ ಖಾತೆಗಳು"

 #: ../src/contacts-contact-pane.vala:446
-#| msgid "Create Contact"
 msgid "Remove Contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ತೆಗೆದು ಹಾಕು"

+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "ಒಂದು ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಆರಿಸಿ"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "ರಸ್ತೆ"
@ -354,7 +351,8 @@ msgstr "ಗೂಗಲ್ ಟಾಕ್"
 msgid "Ovi Chat"
 msgstr "Ovi ಚಾಟ್"

-#: ../src/contacts-contact.vala:733 ../src/contacts-contact.vala:1017
+#: ../src/contacts-contact.vala:733
+#: ../src/contacts-contact.vala:1017
 msgid "Facebook"
 msgstr "ಫೇಸ್‌ಬುಕ್"

@ -434,7 +432,8 @@ msgstr "ಟೆಲಿಫೋನಿ"
 msgid "Trepia"
 msgstr "ಟ್ರೆಪಿಯಾ"

-#: ../src/contacts-contact.vala:753 ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:754
 msgid "Yahoo! Messenger"
 msgstr "ಯಾಹೂ! ಮೆಸೆಂಜರ್"

@ -466,7 +465,8 @@ msgstr "ಗೂಗಲ್ ಇತರೆ ಸಂಪರ್ಕಗಳು"
 msgid "Local Address Book"
 msgstr "ಸ್ಥಳೀಯ ವಿಳಾಸ ಪುಸ್ತಕ"

-#: ../src/contacts-esd-setup.c:117 ../src/contacts-esd-setup.c:145
+#: ../src/contacts-esd-setup.c:117
+#: ../src/contacts-esd-setup.c:145
 msgid "Google"
 msgstr "ಗೂಗಲ್"

@ -476,7 +476,6 @@ msgstr "ಸ್ಥಳೀಯ ಸಂಪರ್ಕ"

 #: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-#| msgid "Online Accounts"
 msgid "%s - Linked Accounts"
 msgstr "%s - ಸಂಪರ್ಕ ಜೋಡಿಸಲಾದ ಖಾತೆಗಳು"

@ -502,11 +501,9 @@ msgid "Create Contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ರಚಿಸಿ"

 #: ../src/contacts-new-contact-dialog.vala:67
-msgid ""
-"Add or \n"
+msgid "Add or \n"
 "select a picture"
-msgstr ""
-"ಸೇರಿಸಿ ಅಥವ \n"
+msgstr "ಸೇರಿಸಿ ಅಥವ \n"
 "ಒಂದು ಚಿತ್ರವನ್ನು ಆರಿಸಿ"

 #: ../src/contacts-new-contact-dialog.vala:78
@ -572,7 +569,8 @@ msgstr "ಅಂತರಜಾಲದಲ್ಲಿನ ಖಾತೆಗಳು"
 msgid "Use Local Address Book"
 msgstr "ಸ್ಥಳೀಯ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ಬಳಸು"

-#: ../src/contacts-setup-window.vala:125 ../src/contacts-setup-window.vala:146
+#: ../src/contacts-setup-window.vala:125
+#: ../src/contacts-setup-window.vala:146
 msgid "Contacts Setup"
 msgstr "ಸಂಪರ್ಕಗಳ ಸಿದ್ಧತೆ"

@ -582,17 +580,21 @@ msgstr "ರದ್ದು ಮಾಡು"

 #. Refers to the type of the detail, could be Home, Work or Other for email, and the same
 #. * for phone numbers, addresses, etc.
-#: ../src/contacts-types.vala:115 ../src/contacts-types.vala:127
-#: ../src/contacts-types.vala:228 ../src/contacts-types.vala:341
+#: ../src/contacts-types.vala:115
+#: ../src/contacts-types.vala:127
+#: ../src/contacts-types.vala:228
+#: ../src/contacts-types.vala:341
 msgid "Other"
 msgstr "ಇತರೆ"

 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:283 ../src/contacts-types.vala:337
+#: ../src/contacts-types.vala:283
+#: ../src/contacts-types.vala:337
 msgid "Home"
 msgstr "ನೆಲೆ"

-#: ../src/contacts-types.vala:284 ../src/contacts-types.vala:307
+#: ../src/contacts-types.vala:284
+#: ../src/contacts-types.vala:307
 #: ../src/contacts-types.vala:332
 msgid "Work"
 msgstr "ಕೆಲಸ"
@ -656,11 +658,11 @@ msgstr "ಟೆಲೆಕ್ಸ್‍"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "ಸಲಹೆಗಳು"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "ಇತರೆ ಸಂಪರ್ಕವಿಳಾಸಗಳು"

@ -678,60 +680,5 @@ msgid "View subset"
 msgstr "ಉಪಗುಂಪನ್ನು ನೋಡು"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#| msgid "New contact"
 msgid "View contacts subset"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳ ಉಪಗುಂಪನ್ನು ನೋಡು"
-
-#~ msgctxt "Addresses on the Web"
-#~ msgid "Links"
-#~ msgstr "ಕೊಂಡಿಗಳು"
-
-#~ msgctxt "Web address"
-#~ msgid "Link"
-#~ msgstr "ಕೊಂಡಿ"
-
-#~ msgid "Phone number"
-#~ msgstr "ದೂರವಾಣಿಯ ಸಂಖ್ಯೆ"
-
-#~ msgid "Chat"
-#~ msgstr "ಹರಟೆ"
-
-#~ msgid "Addresses"
-#~ msgstr "ವಿಳಾಸಗಳು"
-
-#~ msgid "Add to My Contacts"
-#~ msgstr "ನನ್ನ ಸಂಪರ್ಕವಿಳಾಸಗಳಿಗೆ ಸೇರಿಸು"
-
-#~ msgid "Unlink"
-#~ msgstr "ಸಂಪರ್ಕ ತಪ್ಪಿಸು"
-
-#~ msgid "Add detail..."
-#~ msgstr "ವಿವರವನ್ನು ಸೇರಿಸು..."
-
-#~ msgid "Select detail to add to %s"
-#~ msgstr "%s ಗೆ ಸೇರಿಸಲು ವಿವರವನ್ನು ಆರಿಸು"
-
-#~ msgid "Select email address"
-#~ msgstr "ವಿಅಂಚೆ ವಿಳಾಸವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#~ msgid "Select what to call"
-#~ msgstr "ಏನನ್ನು ಕರೆಯಬೇಕು ಎನ್ನುವುದನ್ನು ಆರಿಸಿ"
-
-#~ msgid "Select chat account"
-#~ msgstr "ಹರಟೆಯ ಖಾತೆಯನ್ನು ಆರಿಸಿ"
-
-#~ msgid "Add/Remove Linked Contacts..."
-#~ msgstr "ಜೋಡಿಸಲಾದ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ಸೇರಿಸು/ತೆಗೆದುಹಾಕು..."
-
-#~ msgctxt "contacts link action"
-#~ msgid "Link"
-#~ msgstr "ಕೊಂಡಿ"
-
-#~ msgid "Undo"
-#~ msgstr "ರದ್ದುಮಾಡು"
-
-#~ msgid "Link contacts to %s"
-#~ msgstr "ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು %s ಗೆ ಕೊಂಡಿ ಜೋಡಿಸು"
-
-#~ msgid "Custom..."
-#~ msgstr "ಅಗತ್ಯಾನುಗುಣ..."
--- a/po/mr.po
+++ b/po/mr.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-17 12:05+0000\n"
-"PO-Revision-Date: 2013-03-22 13:42+0530\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-06-05 16:40+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
 "Language: mr\n"
@ -33,12 +33,10 @@ msgid "View"
 msgstr "दृष्य"

 #: ../src/app-menu.ui.h:2
-#| msgid "Link Contact"
 msgid "Main contacts"
 msgstr "मुख्य संपर्क"

 #: ../src/app-menu.ui.h:3
-#| msgid "Contacts"
 msgid "All contacts"
 msgstr "सर्व संपर्क"

@ -114,7 +112,6 @@ msgstr "संपादन"

 #: ../src/contacts-app.vala:498
 #, c-format
-#| msgid "Select contact to link to"
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d संपर्क जुळले"
@ -122,7 +119,6 @@ msgstr[1] "%d संपर्कांना जुळले"

 #: ../src/contacts-app.vala:529
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d संपर्क नष्ट केले"
@ -236,8 +232,8 @@ msgstr "टोपननाव"
 msgid "Birthday"
 msgstr "वाढदिवस"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "टिप"
@ -261,7 +257,6 @@ msgid "No"
 msgstr "नाही"

 #: ../src/contacts-contact-pane.vala:349
-#| msgid "Add Detail"
 msgid "New Detail"
 msgstr "नवीन तपशील"

@ -271,12 +266,10 @@ msgid "Personal email"
 msgstr "वैयक्तिक ईमेल"

 #: ../src/contacts-contact-pane.vala:368
-#| msgid "Work Fax"
 msgid "Work email"
 msgstr "कार्य ईमेल"

 #: ../src/contacts-contact-pane.vala:374
-#| msgid "Mobile"
 msgid "Mobile phone"
 msgstr "मोबाइल फोन"

@ -293,30 +286,30 @@ msgid "Link"
 msgstr "दुवा"

 #: ../src/contacts-contact-pane.vala:406
-#| msgid "Address"
 msgid "Home address"
 msgstr "घरचा पत्ता"

 #: ../src/contacts-contact-pane.vala:411
-#| msgid "Address"
 msgid "Work address"
 msgstr "कार्य पत्ता"

 #: ../src/contacts-contact-pane.vala:417
-#| msgid "Note"
 msgid "Notes"
 msgstr "टिपा"

 #: ../src/contacts-contact-pane.vala:434
-#| msgid "Online Accounts"
 msgid "Linked Accounts"
 msgstr "जुळलेल्या खाती"

 #: ../src/contacts-contact-pane.vala:446
-#| msgid "Create Contact"
 msgid "Remove Contact"
 msgstr "संपर्क काढून टाका"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "संपर्क निवडा"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "रस्ता"
@ -475,7 +468,6 @@ msgstr "स्थानीय संपर्क"

 #: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-#| msgid "Online Accounts"
 msgid "%s - Linked Accounts"
 msgstr "%s - जुळलेल्या खाती"

@ -653,11 +645,11 @@ msgstr "टेलेक्स"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "शिफारस"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "इतर संपर्क"

@ -674,7 +666,6 @@ msgid "View subset"
 msgstr "उपसंचाचे दृष्य"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#| msgid "New contact"
 msgid "View contacts subset"
 msgstr "संपर्क उपसंचाचे दृष्य"

@ -713,9 +704,6 @@ msgstr "संपर्क उपसंचाचे दृष्य"
 #~ msgid "Select what to call"
 #~ msgstr "काय कॉल करायचे ते नीवडा"

-#~ msgid "Select chat account"
-#~ msgstr "गप्पा खाते निवडा"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "जुळलेले संपर्क समाविष्ट करा/काढून टाका..."

--- a/po/oc.po
+++ b/po/oc.po
@ -0,0 +1,877 @@
+# Occitan translation for gnome-contacts.
+# Copyright (C) 2011-12 gnome-contacts's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-contacts package.
+# Cedric31 <cvalmary@yahoo.fr>, 2013.
+# Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-contacts master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-07-03 07:53+0000\n"
+"PO-Revision-Date: 2015-05-17 10:49+0100\n"
+"Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
+"Language-Team: Tot en òc (totenoc.eu)\n"
+"Language: oc\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: Poedit 1.7.5\n"
+"X-Project-Style: gnome\n"
+
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:279
+#: ../src/main.vala:28
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../data/gnome-contacts.desktop.in.in.h:2
+msgid "friends;address book;"
+msgstr "amics;quasernet d'adreças;"
+
+#: ../src/app-menu.ui.h:1
+msgid "View"
+msgstr "Afichar"
+
+#: ../src/app-menu.ui.h:2
+msgid "Main contacts"
+msgstr "Contactes principals"
+
+#: ../src/app-menu.ui.h:3
+msgid "All contacts"
+msgstr "Totes los contactes"
+
+#: ../src/app-menu.ui.h:4
+msgid "_Change Address Book..."
+msgstr "_Cambiar lo quasernet d'adreças..."
+
+#: ../src/app-menu.ui.h:5
+msgid "_About Contacts"
+msgstr "A _prepaus de Contactes"
+
+#: ../src/app-menu.ui.h:6
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../src/app-menu.ui.h:7
+msgid "_Quit"
+msgstr "_Quitar"
+
+#: ../src/contacts-app.vala:108
+#, c-format
+msgid "No contact with id %s found"
+msgstr "Cap de contacte amb l'identificant %s pas trobat"
+
+#: ../src/contacts-app.vala:109 ../src/contacts-app.vala:233
+msgid "Contact not found"
+msgstr "Contacte introbable"
+
+#: ../src/contacts-app.vala:118
+msgid "Change Address Book"
+msgstr "Cambiament de quasernet d'adreças"
+
+#: ../src/contacts-app.vala:123 ../src/contacts-setup-window.vala:152
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../src/contacts-app.vala:211
+msgid "translator-credits"
+msgstr "Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>"
+
+#: ../src/contacts-app.vala:212
+msgid "GNOME Contacts"
+msgstr "Contactes GNOME"
+
+#: ../src/contacts-app.vala:213
+msgid "About GNOME Contacts"
+msgstr "A prepaus de GNOME Contactes"
+
+#: ../src/contacts-app.vala:214
+msgid "Contact Management Application"
+msgstr "Aplicacion de gestion dels contactes"
+
+#: ../src/contacts-app.vala:232
+#, c-format
+msgid "No contact with email address %s found"
+msgstr "Cap de contacte amb l'adreça corrièl %s pas trobat"
+
+#: ../src/contacts-app.vala:293
+msgid "New"
+msgstr "Novèl"
+
+#: ../src/contacts-app.vala:324
+msgid "Edit"
+msgstr "Editar"
+
+#: ../src/contacts-app.vala:330
+msgid "Done"
+msgstr "Acabat"
+
+#: ../src/contacts-app.vala:389
+msgid "Editing"
+msgstr "Modificacion"
+
+#: ../src/contacts-app.vala:508
+#, c-format
+msgid "%d contacts linked"
+msgid_plural "%d contacts linked"
+msgstr[0] "%d contacte ligat"
+msgstr[1] "%d contactes ligats"
+
+#: ../src/contacts-app.vala:540
+#, c-format
+msgid "%d contact deleted"
+msgid_plural "%d contacts deleted"
+msgstr[0] "%d contacte suprimit"
+msgstr[1] "%d contactes suprimits"
+
+#: ../src/contacts-app.vala:582
+#, c-format
+msgid "Contact deleted: \"%s\""
+msgstr "Contacte suprimit : « %s »"
+
+#: ../src/contacts-app.vala:608
+msgid "Show contact with this individual id"
+msgstr "Afichar lo contacte que possedís aqueste identificant individual"
+
+#: ../src/contacts-app.vala:610
+msgid "Show contact with this email address"
+msgstr "Afichar lo contacte que possedís aquesta adreça corrièl"
+
+#: ../src/contacts-app.vala:624
+#, c-format
+msgid "%s linked to %s"
+msgstr "%s ligat a %s"
+
+#: ../src/contacts-app.vala:626
+#, c-format
+msgid "%s linked to the contact"
+msgstr "%s ligat al contacte"
+
+#: ../src/contacts-app.vala:643
+msgid "— contact management"
+msgstr "— gestion de contactes"
+
+#: ../src/contacts-avatar-dialog.vala:197
+msgid "Browse for more pictures"
+msgstr "Cercar mai d'imatges"
+
+#: ../src/contacts-avatar-dialog.vala:244
+msgid "Select Picture"
+msgstr "Causir un imatge"
+
+#: ../src/contacts-avatar-dialog.vala:247
+#: ../src/contacts-linked-accounts-dialog.vala:37
+msgid "Close"
+msgstr "Tampar"
+
+#: ../src/contacts-contact-editor.vala:352
+msgid "January"
+msgstr "Genièr"
+
+#: ../src/contacts-contact-editor.vala:353
+msgid "February"
+msgstr "Febrièr"
+
+#: ../src/contacts-contact-editor.vala:354
+msgid "March"
+msgstr "Març"
+
+#: ../src/contacts-contact-editor.vala:355
+msgid "April"
+msgstr "Abril"
+
+#: ../src/contacts-contact-editor.vala:356
+msgid "May"
+msgstr "Mai"
+
+#: ../src/contacts-contact-editor.vala:357
+msgid "June"
+msgstr "Junh"
+
+#: ../src/contacts-contact-editor.vala:358
+msgid "July"
+msgstr "Julhet"
+
+#: ../src/contacts-contact-editor.vala:359
+msgid "August"
+msgstr "Agost"
+
+#: ../src/contacts-contact-editor.vala:360
+msgid "September"
+msgstr "Setembre"
+
+#: ../src/contacts-contact-editor.vala:361
+msgid "October"
+msgstr "Octobre"
+
+#: ../src/contacts-contact-editor.vala:362
+msgid "November"
+msgstr "Novembre"
+
+#: ../src/contacts-contact-editor.vala:363
+msgid "December"
+msgstr "Decembre"
+
+#: ../src/contacts-contact-editor.vala:489
+#: ../src/contacts-contact-editor.vala:496 ../src/contacts-contact-sheet.vala:175
+msgid "Website"
+msgstr "Site Web"
+
+#: ../src/contacts-contact-editor.vala:515
+#: ../src/contacts-contact-editor.vala:522 ../src/contacts-contact-pane.vala:397
+#: ../src/contacts-contact-sheet.vala:185
+msgid "Nickname"
+msgstr "Escais"
+
+#: ../src/contacts-contact-editor.vala:542
+#: ../src/contacts-contact-editor.vala:549 ../src/contacts-contact-pane.vala:402
+#: ../src/contacts-contact-sheet.vala:192
+msgid "Birthday"
+msgstr "Anniversari"
+
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570 ../src/contacts-contact-sheet.vala:199
+msgid "Note"
+msgstr "Nòta"
+
+#: ../src/contacts-contact-pane.vala:183
+#, c-format
+msgid "Does %s from %s belong here?"
+msgstr "%s de %s es a sa plaça aicí ?"
+
+#: ../src/contacts-contact-pane.vala:185
+#, c-format
+msgid "Do these details belong to %s?"
+msgstr "Aquestes detalhs apartenon a %s ?"
+
+#: ../src/contacts-contact-pane.vala:196
+msgid "Yes"
+msgstr "Òc"
+
+#: ../src/contacts-contact-pane.vala:197
+msgid "No"
+msgstr "Non"
+
+#: ../src/contacts-contact-pane.vala:351
+msgid "New Detail"
+msgstr "Detalh novèl"
+
+#. building menu
+#: ../src/contacts-contact-pane.vala:365
+msgid "Personal email"
+msgstr "Adreça de corrièr electronica personala"
+
+#: ../src/contacts-contact-pane.vala:370
+msgid "Work email"
+msgstr "Adreça de corrièr electronic professionala"
+
+#: ../src/contacts-contact-pane.vala:376
+msgid "Mobile phone"
+msgstr "Telefòn mobil"
+
+#: ../src/contacts-contact-pane.vala:381
+msgid "Home phone"
+msgstr "Telefòn personal"
+
+#: ../src/contacts-contact-pane.vala:386
+msgid "Work phone"
+msgstr "Telefòn professional"
+
+#: ../src/contacts-contact-pane.vala:392 ../src/contacts-list-pane.vala:129
+msgid "Link"
+msgstr "Ligam"
+
+#: ../src/contacts-contact-pane.vala:408
+msgid "Home address"
+msgstr "Adreça personala"
+
+#: ../src/contacts-contact-pane.vala:413
+msgid "Work address"
+msgstr "Adreça professionala"
+
+#: ../src/contacts-contact-pane.vala:419
+msgid "Notes"
+msgstr "Nòtas"
+
+#: ../src/contacts-contact-pane.vala:436
+msgid "Linked Accounts"
+msgstr "Comptes ligats"
+
+#: ../src/contacts-contact-pane.vala:448
+msgid "Remove Contact"
+msgstr "Levar lo contacte"
+
+#: ../src/contacts-contact-pane.vala:507
+msgid "Select a contact"
+msgstr "Seleccionar un contacte"
+
+#: ../src/contacts-contact.vala:676
+msgid "Street"
+msgstr "Carrièra"
+
+#: ../src/contacts-contact.vala:676
+msgid "Extension"
+msgstr "Extension"
+
+#: ../src/contacts-contact.vala:676
+msgid "City"
+msgstr "Vila"
+
+#: ../src/contacts-contact.vala:676
+msgid "State/Province"
+msgstr "Estat/província"
+
+#: ../src/contacts-contact.vala:676
+msgid "Zip/Postal Code"
+msgstr "Còde Postal"
+
+#: ../src/contacts-contact.vala:676
+msgid "PO box"
+msgstr "Bóstia postala"
+
+#: ../src/contacts-contact.vala:676
+msgid "Country"
+msgstr "País"
+
+#: ../src/contacts-contact.vala:732
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/contacts-contact.vala:733
+msgid "Ovi Chat"
+msgstr "Ovi Chat"
+
+#: ../src/contacts-contact.vala:734 ../src/contacts-contact.vala:1018
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../src/contacts-contact.vala:735
+msgid "Livejournal"
+msgstr "LiveJournal"
+
+#: ../src/contacts-contact.vala:736
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: ../src/contacts-contact.vala:737
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../src/contacts-contact.vala:738
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: ../src/contacts-contact.vala:739
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../src/contacts-contact.vala:740
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/contacts-contact.vala:741
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../src/contacts-contact.vala:742
+msgid "Local network"
+msgstr "Ret locala"
+
+#: ../src/contacts-contact.vala:743
+msgid "Windows Live Messenger"
+msgstr "Windows Live Messenger"
+
+#: ../src/contacts-contact.vala:744
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../src/contacts-contact.vala:745
+msgid "MXit"
+msgstr "MXit"
+
+#: ../src/contacts-contact.vala:746
+msgid "Napster"
+msgstr "Napster"
+
+#: ../src/contacts-contact.vala:747
+msgid "Tencent QQ"
+msgstr "Tencent QQ"
+
+#: ../src/contacts-contact.vala:748
+msgid "IBM Lotus Sametime"
+msgstr "IBM Lotus Sametime"
+
+#: ../src/contacts-contact.vala:749
+msgid "SILC"
+msgstr "SILC"
+
+#: ../src/contacts-contact.vala:750
+msgid "sip"
+msgstr "sip"
+
+#: ../src/contacts-contact.vala:751
+msgid "Skype"
+msgstr "Skype"
+
+#: ../src/contacts-contact.vala:752
+msgid "Telephony"
+msgstr "Telefonia"
+
+#: ../src/contacts-contact.vala:753
+msgid "Trepia"
+msgstr "Trepia"
+
+#: ../src/contacts-contact.vala:754 ../src/contacts-contact.vala:755
+msgid "Yahoo! Messenger"
+msgstr "Yahoo! Messenger"
+
+#: ../src/contacts-contact.vala:756
+msgid "Zephyr"
+msgstr "Zephyr"
+
+#: ../src/contacts-contact.vala:1021
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../src/contacts-contact.vala:1024
+msgid "Google Profile"
+msgstr "Perfil Google"
+
+#: ../src/contacts-contact.vala:1088
+msgid "Unexpected internal error: created contact was not found"
+msgstr "Error intèrna inesperada : lo contacte creat es introbable"
+
+#: ../src/contacts-contact.vala:1262
+msgid "Google Circles"
+msgstr "Cercles Google"
+
+#: ../src/contacts-contact.vala:1264
+msgid "Google Other Contact"
+msgstr "Autre contacte Google"
+
+#: ../src/contacts-esd-setup.c:114
+msgid "Local Address Book"
+msgstr "Quasernet d'adreças local"
+
+#: ../src/contacts-esd-setup.c:117 ../src/contacts-esd-setup.c:145
+msgid "Google"
+msgstr "Google"
+
+#: ../src/contacts-esd-setup.c:142
+msgid "Local Contact"
+msgstr "Contacte local"
+
+#: ../src/contacts-linked-accounts-dialog.vala:32
+#, c-format
+msgid "%s - Linked Accounts"
+msgstr "%s - Comptes ligats"
+
+#: ../src/contacts-linked-accounts-dialog.vala:56
+msgid "You can manually link contacts from the contacts list"
+msgstr "Podètz ligar manualament de contactes dempuèi la lista de contactes"
+
+#: ../src/contacts-linked-accounts-dialog.vala:102
+msgid "Remove"
+msgstr "Levar"
+
+#: ../src/contacts-list-pane.vala:89
+msgid "Type to search"
+msgstr "Tipe de recèrca"
+
+#: ../src/contacts-list-pane.vala:132
+msgid "Delete"
+msgstr "Suprimir"
+
+#: ../src/contacts-new-contact-dialog.vala:45
+msgid "New contact"
+msgstr "Contacte novèl"
+
+#: ../src/contacts-new-contact-dialog.vala:51
+msgid "Create Contact"
+msgstr "Crear un Contacte"
+
+#: ../src/contacts-new-contact-dialog.vala:77
+msgid ""
+"Add or \n"
+"select a picture"
+msgstr ""
+"Apondre o \n"
+"seleccionar un imatge"
+
+#: ../src/contacts-new-contact-dialog.vala:88
+msgid "Contact Name"
+msgstr "Nom del contacte"
+
+#: ../src/contacts-new-contact-dialog.vala:96
+#: ../src/contacts-new-contact-dialog.vala:131
+msgid "Email"
+msgstr "Adreça electronica"
+
+#: ../src/contacts-new-contact-dialog.vala:105
+#: ../src/contacts-new-contact-dialog.vala:136
+msgid "Phone"
+msgstr "Telefòn"
+
+#: ../src/contacts-new-contact-dialog.vala:114
+#: ../src/contacts-new-contact-dialog.vala:141
+msgid "Address"
+msgstr "Adreça"
+
+#: ../src/contacts-new-contact-dialog.vala:123
+msgid "Add Detail"
+msgstr "Apondre un detalh"
+
+#: ../src/contacts-new-contact-dialog.vala:222
+msgid "You must specify a contact name"
+msgstr "Vos cal especificar un nom de contacte"
+
+#: ../src/contacts-new-contact-dialog.vala:332
+msgid "No primary addressbook configured\n"
+msgstr ""
+
+#: ../src/contacts-new-contact-dialog.vala:353
+#, c-format
+msgid "Unable to create new contacts: %s\n"
+msgstr "Impossible de crear de contactes novèls : %s\n"
+
+#: ../src/contacts-new-contact-dialog.vala:364
+msgid "Unable to find newly created contact\n"
+msgstr "Impossible de trobar los contactes aponduts recentament\n"
+
+#: ../src/contacts-setup-window.vala:36
+msgid ""
+"Welcome to Contacts! Please select where you want to keep your address book:"
+msgstr ""
+"Benvenguda dins Contactes ! Causissètz l'emplaçament ont volètz conservar "
+"vòstre quasernet d'adreças :"
+
+#: ../src/contacts-setup-window.vala:81
+msgid "Online Account Settings"
+msgstr "Paramètres del compte en linha"
+
+#: ../src/contacts-setup-window.vala:86
+msgid "Setup an online account or use a local address book"
+msgstr "Configurar un compte en linha o utilizar un quasernet d'adreças local"
+
+#: ../src/contacts-setup-window.vala:89
+msgid "Online Accounts"
+msgstr "Comptes en linha"
+
+#: ../src/contacts-setup-window.vala:92
+msgid "Use Local Address Book"
+msgstr "Utilizar un quasernet d'adreças local"
+
+#: ../src/contacts-setup-window.vala:125 ../src/contacts-setup-window.vala:146
+msgid "Contacts Setup"
+msgstr "Paramètres de Contactes"
+
+#: ../src/contacts-setup-window.vala:137
+msgid "Cancel"
+msgstr "Anullar"
+
+#. Refers to the type of the detail, could be Home, Work or Other for email, and the same
+#. * for phone numbers, addresses, etc.
+#: ../src/contacts-types.vala:115 ../src/contacts-types.vala:127
+#: ../src/contacts-types.vala:228 ../src/contacts-types.vala:341
+msgid "Other"
+msgstr "Autre"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:283 ../src/contacts-types.vala:337
+msgid "Home"
+msgstr "Ostal"
+
+#: ../src/contacts-types.vala:284 ../src/contacts-types.vala:307
+#: ../src/contacts-types.vala:332
+msgid "Work"
+msgstr "Professional"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:306
+msgid "Personal"
+msgstr "Personal"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:331
+msgid "Assistant"
+msgstr "Assistent"
+
+#: ../src/contacts-types.vala:333
+msgid "Work Fax"
+msgstr "Fax professional"
+
+#: ../src/contacts-types.vala:334
+msgid "Callback"
+msgstr "Rapèl"
+
+#: ../src/contacts-types.vala:335
+msgid "Car"
+msgstr "Veitura"
+
+#: ../src/contacts-types.vala:336
+msgid "Company"
+msgstr "Entrepresa"
+
+#: ../src/contacts-types.vala:338
+msgid "Home Fax"
+msgstr "Fax personal"
+
+#: ../src/contacts-types.vala:339
+msgid "ISDN"
+msgstr "ISDN"
+
+#: ../src/contacts-types.vala:340
+msgid "Mobile"
+msgstr "Telefonet"
+
+#: ../src/contacts-types.vala:342
+msgid "Fax"
+msgstr "Fax"
+
+#: ../src/contacts-types.vala:343
+msgid "Pager"
+msgstr "Recebedor d'apèl"
+
+#: ../src/contacts-types.vala:344
+msgid "Radio"
+msgstr "Ràdio"
+
+#: ../src/contacts-types.vala:345
+msgid "Telex"
+msgstr "Telex"
+
+#. To translators: TTY is Teletypewriter
+#: ../src/contacts-types.vala:347
+msgid "TTY"
+msgstr "TTY"
+
+#: ../src/contacts-view.vala:188
+msgid "No results matched search"
+msgstr "Cap de resultat correspond pas a la recèrca"
+
+#: ../src/contacts-view.vala:288
+msgid "Suggestions"
+msgstr "Suggestions"
+
+#: ../src/contacts-view.vala:313
+msgid "Other Contacts"
+msgstr "Autres contactes"
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:1
+msgid "First-time setup done."
+msgstr "Configuracion iniciala acabada."
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:2
+msgid "Set to true when the user ran the first-time setup wizard."
+msgstr ""
+"Definit a verai (true) quand l'utilizaire a aviat l'assistent de configuracion "
+"iniciala."
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:3
+msgid "View subset"
+msgstr "Afichar lo sosensemble"
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:4
+msgid "View contacts subset"
+msgstr "Afichar lo sosensemble de contactes"
+
+#~ msgid ""
+#~ "Contacts keeps and organize your contacts information. You can create, edit, "
+#~ "delete and link together pieces of information about your contacts. Contacts "
+#~ "aggregates the details from all your sources providing a centralized place "
+#~ "for managing your contacts."
+#~ msgstr ""
+#~ "Contacts conserve et organise les informations liées à vos contacts. Vous "
+#~ "pouvez créer, éditer, supprimer et relier des informations à propos de vos "
+#~ "contacts. Contacts regroupe les détails provenant de toutes vos sources, "
+#~ "vous fournissant ainsi un endroit centralisé pour gérer vos contacts."
+
+#~ msgid ""
+#~ "Contacts will also integrate with online address books and automatically "
+#~ "link contacts from different online sources."
+#~ msgstr ""
+#~ "Contacts permet également l'intégration de carnets d'adresses en ligne et "
+#~ "relie automatiquement les contacts de différentes sources en ligne."
+
+#~ msgid "A contacts manager for GNOME"
+#~ msgstr "Un gestionnaire de contacts pour GNOME"
+
+#~ msgid "Install GNOME Maps to open location."
+#~ msgstr "Veuillez installer GNOME Cartes pour afficher l'emplacement."
+
+#~ msgid "Change"
+#~ msgstr "Modifier"
+
+#~ msgid ""
+#~ "New contacts will be added to the selected address book.\n"
+#~ "You are able to view and edit contacts from other address books."
+#~ msgstr ""
+#~ "Les nouveaux contacts seront ajoutés au carnet d'adresse sélectionné.\n"
+#~ "Vous avez la possibilité de parcourir et modifier les contacts de votre "
+#~ "carnet d'adresse."
+
+#~ msgid "_Cancel"
+#~ msgstr "A_nnuler"
+
+#~ msgid "_Open"
+#~ msgstr "_Ouvrir"
+
+#~ msgid "New Contact"
+#~ msgstr "Nouveau contact"
+
+#~ msgid "Add email"
+#~ msgstr "Ajouter un courriel"
+
+#~ msgid "Add number"
+#~ msgstr "Ajouter un numéro"
+
+#~ msgid "Delete field"
+#~ msgstr "Supprimer le champ"
+
+#~ msgid "Add name"
+#~ msgstr "Ajouter un nom"
+
+#~ msgid "You need to enter some data"
+#~ msgstr "Vous devez saisir des données"
+
+#~ msgid "No primary addressbook configured"
+#~ msgstr "Aucun carnet d'adresses principal configuré"
+
+#~ msgid "Unable to create new contacts: %s"
+#~ msgstr "Impossible de créer les nouveaux contacts : %s"
+
+#~ msgid "Unable to find newly created contact"
+#~ msgstr "Impossible de trouver les contacts récemment ajoutés"
+
+#~ msgid "Change avatar"
+#~ msgstr "Changer d'avatar"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "You can link contacts by selecting them from the contacts list"
+#~ msgstr ""
+#~ "Vous pouvez lier manuellement des contacts en les sélectionnant dans la "
+#~ "liste de contacts"
+
+#~ msgid "Unlink"
+#~ msgstr "Délier"
+
+#~ msgid "%d Selected"
+#~ msgid_plural "%d Selected"
+#~ msgstr[0] "%d sélectionné"
+#~ msgstr[1] "%d sélectionnés"
+
+#~ msgid "All Contacts"
+#~ msgstr "Tous les contacts"
+
+#~ msgid "Editing %s"
+#~ msgstr "Modification de %s"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "_Undo"
+#~ msgstr "_Défaire"
+
+#~ msgid "_About"
+#~ msgstr "_À propos"
+
+#, fuzzy
+#~| msgid "Work email"
+#~ msgid "Home email"
+#~ msgstr "Courriel professionnel"
+
+#~ msgid "Loading"
+#~ msgstr "Chargement"
+
+#~ msgid "Add contact"
+#~ msgstr "Ajouter un contact"
+
+#~ msgid "Selection mode"
+#~ msgstr "Mode de sélection"
+
+#~ msgid "Select Address Book"
+#~ msgstr "Choisir le carnet d'adresses"
+
+#~ msgid "Cancel setup"
+#~ msgstr "Annuler la configuration initiale"
+
+#~ msgid "Setup complete"
+#~ msgstr "Configuration initiale terminée"
+
+#~ msgid "Primary Contacts Account"
+#~ msgstr "Compte de contacts principal"
+
+#~ msgid "Please select your primary contacts account"
+#~ msgstr "Veuillez sélectionner votre compte de contacts principal"
+
+#~ msgctxt "Addresses on the Web"
+#~ msgid "Links"
+#~ msgstr "Liens"
+
+#~ msgctxt "Web address"
+#~ msgid "Link"
+#~ msgstr "Lien"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "Addresses"
+#~ msgstr "Adresses"
+
+#~ msgid "Add to My Contacts"
+#~ msgstr "Ajouter à mes contacts"
+
+#~ msgid "Add detail..."
+#~ msgstr "Ajouter des détails..."
+
+#~ msgid "Select detail to add to %s"
+#~ msgstr "Sélectionner le détail à ajouter à %s"
+
+#~ msgid "Select email address"
+#~ msgstr "Saisir une adresse courriel"
+
+#~ msgid "Select what to call"
+#~ msgstr "Sélectionner ce qu'il faut appeler"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "Ajouter/supprimer des contacts liés..."
+
+#~ msgctxt "contacts link action"
+#~ msgid "Link"
+#~ msgstr "Lier"
+
+#~ msgid "Link contacts to %s"
+#~ msgstr "Lier les contacts à %s"
+
+#~ msgid "Custom..."
+#~ msgstr "Personnalisé..."
+
+#~ msgid "Unknown status"
+#~ msgstr "Statut inconnu"
+
+#~ msgid "Offline"
+#~ msgstr "Hors-ligne"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Available"
+#~ msgstr "Disponible"
+
+#~ msgid "Away"
+#~ msgstr "Absent"
+
+#~ msgid "Extended away"
+#~ msgstr "Absence prolongée"
+
+#~ msgid "Busy"
+#~ msgstr "Occupé"
+
+#~ msgid "Hidden"
+#~ msgstr "Caché"
+
+#~ msgid "<span weight='bold'>Link contacts to %s</span>"
+#~ msgstr "<span weight='bold'>Lier les contacts à %s</span>"
--- a/po/pa.po
+++ b/po/pa.po
@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-session.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-20 18:38+0000\n"
-"PO-Revision-Date: 2013-02-22 01:46+0000\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-04-17 21:40+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
@ -35,12 +35,10 @@ msgid "View"
 msgstr "ਵੇਖੋ"

 #: ../src/app-menu.ui.h:2
-#| msgid "Link Contact"
 msgid "Main contacts"
 msgstr "ਮੁੱਖ ਸੰਪਰਕ"

 #: ../src/app-menu.ui.h:3
-#| msgid "Contacts"
 msgid "All contacts"
 msgstr "ਸਭ ਸੰਪਰਕ"

@ -115,13 +113,11 @@ msgid "Done"
 msgstr "ਮੁਕੰਮਲ"

 #: ../src/contacts-app.vala:381
-#| msgid "Edit"
 msgid "Editing"
 msgstr "ਸੋਧ ਜਾਰੀ"

 #: ../src/contacts-app.vala:498
 #, c-format
-#| msgid "Select contact to link to"
 msgid "%d contacts linked"
 msgid_plural "%d contacts linked"
 msgstr[0] "%d ਸੰਪਰਕ ਲਿੰਕ ਕੀਤੇ"
@ -129,7 +125,6 @@ msgstr[1] "%d ਸੰਪਰਕ ਲਿੰਕ ਕੀਤੇ"

 #: ../src/contacts-app.vala:529
 #, c-format
-#| msgid "Contact deleted: \"%s\""
 msgid "%d contact deleted"
 msgid_plural "%d contacts deleted"
 msgstr[0] "%d ਸੰਪਰਕ ਹਟਾਇਆ"
@ -243,8 +238,8 @@ msgstr "ਆਮ ਨਾਂ"
 msgid "Birthday"
 msgstr "ਜਨਮਦਿਨ"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "ਨੋਟ"
@ -268,23 +263,19 @@ msgid "No"
 msgstr "ਨਹੀਂ"

 #: ../src/contacts-contact-pane.vala:349
-#| msgid "Add Detail"
 msgid "New Detail"
 msgstr "ਨਵਾਂ ਵੇਰਵਾ"

 #. building menu
 #: ../src/contacts-contact-pane.vala:363
-#| msgid "Personal"
 msgid "Personal email"
 msgstr "ਨਿੱਜੀ ਈਮੇਲ"

 #: ../src/contacts-contact-pane.vala:368
-#| msgid "Work Fax"
 msgid "Work email"
 msgstr "ਕੰਮਕਾਜੀ ਈਮੇਲ"

 #: ../src/contacts-contact-pane.vala:374
-#| msgid "Mobile"
 msgid "Mobile phone"
 msgstr "ਮੋਬਾਈਲ ਫੋਨ"

@ -296,35 +287,35 @@ msgstr "ਘਰ ਫੋਨ"
 msgid "Work phone"
 msgstr "ਕੰਮ ਫੋਨ"

-#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:138
+#: ../src/contacts-contact-pane.vala:390 ../src/contacts-list-pane.vala:140
 msgid "Link"
 msgstr "ਲਿੰਕ"

 #: ../src/contacts-contact-pane.vala:406
-#| msgid "Address"
 msgid "Home address"
 msgstr "ਘਰ ਐਡਰੈੱਸ"

 #: ../src/contacts-contact-pane.vala:411
-#| msgid "Address"
 msgid "Work address"
 msgstr "ਕੰਮ ਐਡਰੈੱਸ"

 #: ../src/contacts-contact-pane.vala:417
-#| msgid "Note"
 msgid "Notes"
 msgstr "ਨੋਟ"

 #: ../src/contacts-contact-pane.vala:434
-#| msgid "Online Accounts"
 msgid "Linked Accounts"
 msgstr "ਲਿੰਕ ਕੀਤੇ ਅਕਾਊਂਟ"

 #: ../src/contacts-contact-pane.vala:446
-#| msgid "Create Contact"
 msgid "Remove Contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "ਅਕਾਊਂਟ ਚੁਣੋ"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "ਗਲੀ"
@ -484,7 +475,6 @@ msgstr "ਲੋਕਲ ਸੰਪਰਕ"

 #: ../src/contacts-linked-accounts-dialog.vala:32
 #, c-format
-#| msgid "Online Accounts"
 msgid "%s - Linked Accounts"
 msgstr "%s - ਲਿੰਕ ਕੀਤੇ ਅਕਾਊਂਟ"

@ -496,7 +486,7 @@ msgstr "ਤੁਸੀਂ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਖੁ
 msgid "Remove"
 msgstr "ਹਟਾਓ"

-#: ../src/contacts-list-pane.vala:141
+#: ../src/contacts-list-pane.vala:143
 msgid "Delete"
 msgstr "ਹਟਾਓ"

@ -666,11 +656,11 @@ msgstr "ਟੈਲੀਕਸ"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "ਸੁਝਾਅ"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "ਹੋਰ ਸੰਪਰਕ"

@ -687,7 +677,6 @@ msgid "View subset"
 msgstr "ਸਬ-ਸੈੱਟ ਵੇਖੋ"

 #: ../src/org.gnome.Contacts.gschema.xml.in.h:4
-#| msgid "New contact"
 msgid "View contacts subset"
 msgstr "ਸੰਪਰਕ ਸਬ-ਸੈੱਟ ਵੇਖੋ"

@ -726,9 +715,6 @@ msgstr "ਸੰਪਰਕ ਸਬ-ਸੈੱਟ ਵੇਖੋ"
 #~ msgid "Select what to call"
 #~ msgstr "ਚੁਣੋ ਕਿ ਕੀ ਕਾਲ ਕਰਨਾ ਹੈ"

-#~ msgid "Select chat account"
-#~ msgstr "ਗੱਲਬਾਤ ਅਕਾਊਂਟ ਚੁਣੋ"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ/ਹਟਾਓ..."

--- a/po/ru.po
+++ b/po/ru.po
@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-17 12:05+0000\n"
-"PO-Revision-Date: 2013-03-22 16:44+0400\n"
+"POT-Creation-Date: 2013-05-02 08:29+0000\n"
+"PO-Revision-Date: 2013-05-12 11:41+0400\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.5.5\n"

 #: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:285
 #: ../src/main.vala:28
@ -239,8 +239,8 @@ msgstr "Псевдоним"
 msgid "Birthday"
 msgstr "День рождения"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "Примечание"
@ -312,6 +312,10 @@ msgstr "Связанные учётные записи"
 msgid "Remove Contact"
 msgstr "Удалить контакт"

+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "Выберите контакт"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "Улица"
@ -652,11 +656,11 @@ msgstr "Telex"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "Предложения"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "Другие контакты"

--- a/po/ta.po
+++ b/po/ta.po
@ -3,14 +3,16 @@
 # This file is distributed under the same license as the gnome-contacts package.
 #
 # Dr.T.Vasudevan <agnihot3@gmail.com>, 2011, 2012, 2013.
+# Shantha kumar <shkumar@redhat.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-21 12:48+0530\n"
-"PO-Revision-Date: 2013-03-21 12:54+0530\n"
-"Last-Translator: Dr.T.Vasudevan <drtvasudevan@gmail.com>\n"
-"Language-Team: Tamil <<gnome-tamil-translation@googlegroups.com>>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 20:17+0000\n"
+"PO-Revision-Date: 2013-04-26 11:53+0000\n"
+"Last-Translator: Shantha kumar <shkumar@redhat.com>\n"
+"Language-Team: Tamil <>\n"
 "Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -231,8 +233,8 @@ msgstr "செல்லப்பெயர்"
 msgid "Birthday"
 msgstr "பிறந்தநாள்"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "குறிப்பு"
@ -304,6 +306,11 @@ msgstr "இணைக்கப்பட்ட கணக்குகள்"
 msgid "Remove Contact"
 msgstr "தொடர்பை நீக்கு"

+#: ../src/contacts-contact-pane.vala:505
+#| msgid "Select chat account"
+msgid "Select a contact"
+msgstr "ஒரு தொடர்பைத் தேர்ந்தெடுக்கவும்"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "தெரு:"
@ -640,11 +647,11 @@ msgstr "டெலக்ஸ்"
 msgid "TTY"
 msgstr "டிடிஒய்"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "பரிந்துரைகள்"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "மற்ற தொடர்புகள்"

@ -699,9 +706,6 @@ msgstr "தொடர்பு துணை வகையை காண்க"
 #~ msgid "Select what to call"
 #~ msgstr "எதை அழைக்க வேன்டும் என தேர்ந்தெடுக்கவும்"

-#~ msgid "Select chat account"
-#~ msgstr "அரட்டை கணக்கை தேர்ந்தெடுக்கவும்"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "தொடுப்பில் உள்ள தொடர்புகளை சேர்/நீக்கு..."

--- a/po/th.po
+++ b/po/th.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-07 15:33+0000\n"
-"PO-Revision-Date: 2013-03-10 13:47+0700\n"
+"POT-Creation-Date: 2013-04-11 15:29+0000\n"
+"PO-Revision-Date: 2013-04-12 02:21+0700\n"
 "Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "Language: th\n"
@ -229,8 +229,8 @@ msgstr "ชื่อเล่น"
 msgid "Birthday"
 msgstr "วันเกิด"

-#: ../src/contacts-contact-editor.vala:569
-#: ../src/contacts-contact-editor.vala:576
+#: ../src/contacts-contact-editor.vala:563
+#: ../src/contacts-contact-editor.vala:570
 #: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "หมายเหตุ"
@ -302,6 +302,10 @@ msgstr "บัญชีที่เชื่อมโยง"
 msgid "Remove Contact"
 msgstr "ลบผู้ติดต่อ"

+#: ../src/contacts-contact-pane.vala:505
+msgid "Select a contact"
+msgstr "เลือกผู้ติดต่อ"
+
 #: ../src/contacts-contact.vala:675
 msgid "Street"
 msgstr "ถนน"
@ -636,11 +640,11 @@ msgstr "เทเล็กซ์"
 msgid "TTY"
 msgstr "TTY"

-#: ../src/contacts-view.vala:294
+#: ../src/contacts-view.vala:307
 msgid "Suggestions"
 msgstr "แนะนำ"

-#: ../src/contacts-view.vala:319
+#: ../src/contacts-view.vala:332
 msgid "Other Contacts"
 msgstr "ผู้ติดต่ออื่น"

@ -705,9 +709,6 @@ msgstr "แสดงผู้ติดต่อกลุ่มย่อย"
 #~ msgid "Select what to call"
 #~ msgstr "เลือกเป้าหมายที่จะเรียกสาย"

-#~ msgid "Select chat account"
-#~ msgstr "เลือกบัญชีสนทนา"
-
 #~ msgid "Add/Remove Linked Contacts..."
 #~ msgstr "เพิ่ม/ลบการเชื่อมโยงผู้ติดต่อ..."

--- a/src/cheese-flash.c
+++ b/src/cheese-flash.c
@ -19,46 +19,75 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-/* This is a "flash" object that you can create and invoke a method "flash" on to
- * flood the screen with white temporarily */
-
 #include <gtk/gtk.h>

+#include "cheese-camera.h"
 #include "cheese-flash.h"

-#ifdef GDK_WINDOWING_X11
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <gdk/gdkx.h>
-#endif /* GDK_WINDOWING_X11 */
+/**
+ * SECTION:cheese-flash
+ * @short_description: Flash the screen, like a real camera flash
+ * @stability: Unstable
+ * @include: cheese/cheese-flash.h
+ *
+ * #CheeseFlash is a window that you can create and invoke a method "flash" on
+ * to temporarily flood the screen with white.
+ */

-/* How long to hold the flash for */
-#define FLASH_DURATION 150
+enum
+{
+  PROP_0,
+  PROP_PARENT,
+  PROP_LAST
+};
+
+static GParamSpec *properties[PROP_LAST];
+
+/* How long to hold the flash for, in milliseconds. */
+static const guint FLASH_DURATION = 250;

 /* The factor which defines how much the flash fades per frame */
-#define FLASH_FADE_FACTOR 0.95
+static const gdouble FLASH_FADE_FACTOR = 0.95;

 /* How many frames per second */
-#define FLASH_ANIMATION_RATE 120
+static const guint FLASH_ANIMATION_RATE = 50;

 /* When to consider the flash finished so we can stop fading */
-#define FLASH_LOW_THRESHOLD 0.01
+static const gdouble FLASH_LOW_THRESHOLD = 0.01;

-G_DEFINE_TYPE (CheeseFlash, cheese_flash, G_TYPE_OBJECT);
+G_DEFINE_TYPE (CheeseFlash, cheese_flash, GTK_TYPE_WINDOW);

 #define CHEESE_FLASH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHEESE_TYPE_FLASH, CheeseFlashPrivate))

-typedef struct
+/*
+ * CheeseFlashPrivate:
+ * @parent: the parent #GtkWidget, for choosing on which display to fire the
+ * flash
+ * @flash_timeout_tag: signal ID of the timeout to start fading in the flash
+ * @fade_timeout_tag: signal ID of the timeout to start fading out the flash
+ *
+ * Private data for #CheeseFlash.
+ */
+struct _CheeseFlashPrivate
 {
-  GtkWindow *window;
+  /*< private >*/
+  GtkWidget *parent;
  guint flash_timeout_tag;
  guint fade_timeout_tag;
-} CheeseFlashPrivate;
+};

+/*
+ * cheese_flash_draw_event_cb:
+ * @widget: the #CheeseFlash
+ * @cr: the Cairo context
+ * @user_data: the user data of the signal
+ *
+ * Draw the flash.
+ *
+ * Returns: %TRUE
+ */
 static gboolean
-cheese_flash_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
+cheese_flash_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
 {
  cairo_fill (cr);
  return TRUE;
@ -67,57 +96,38 @@ cheese_flash_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer user
 static void
 cheese_flash_init (CheeseFlash *self)
 {
-  CheeseFlashPrivate *priv = CHEESE_FLASH_GET_PRIVATE (self);
+  CheeseFlashPrivate *priv = self->priv = CHEESE_FLASH_GET_PRIVATE (self);
  cairo_region_t *input_region;
-  GtkWindow *window;
-  GdkScreen *screen;
-  GdkVisual *visual;
+  GtkWindow *window = GTK_WINDOW (self);

  priv->flash_timeout_tag = 0;
  priv->fade_timeout_tag  = 0;

-  window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP));
-
  /* make it so it doesn't look like a window on the desktop (+fullscreen) */
  gtk_window_set_decorated (window, FALSE);
  gtk_window_set_skip_taskbar_hint (window, TRUE);
  gtk_window_set_skip_pager_hint (window, TRUE);
  gtk_window_set_keep_above (window, TRUE);
-  gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_NOTIFICATION);

  /* Don't take focus */
  gtk_window_set_accept_focus (window, FALSE);
  gtk_window_set_focus_on_map (window, FALSE);

-  /* no shadow */
-  screen = gtk_widget_get_screen (GTK_WIDGET (window));
-  visual = gdk_screen_get_rgba_visual (screen);
-  if (visual == NULL)
-    visual = gdk_screen_get_system_visual (screen);
-
-  gtk_widget_set_visual (GTK_WIDGET (window), visual);
-
  /* Don't consume input */
  gtk_widget_realize (GTK_WIDGET (window));
-
  input_region = cairo_region_create ();
  gdk_window_input_shape_combine_region (gtk_widget_get_window (GTK_WIDGET (window)), input_region, 0, 0);
  cairo_region_destroy (input_region);

-  g_signal_connect (G_OBJECT (window), "draw", G_CALLBACK (cheese_flash_window_draw_event_cb), NULL);
-  priv->window = window;
+  g_signal_connect (G_OBJECT (window), "draw", G_CALLBACK (cheese_flash_draw_event_cb), NULL);
 }

 static void
 cheese_flash_dispose (GObject *object)
 {
-  CheeseFlashPrivate *priv = CHEESE_FLASH_GET_PRIVATE (object);
+  CheeseFlashPrivate *priv = CHEESE_FLASH (object)->priv;

-  if (priv->window != NULL)
-  {
-    gtk_widget_destroy (GTK_WIDGET (priv->window));
-    priv->window = NULL;
-  }
+  g_clear_object (&priv->parent);

  if (G_OBJECT_CLASS (cheese_flash_parent_class)->dispose)
    G_OBJECT_CLASS (cheese_flash_parent_class)->dispose (object);
@ -130,6 +140,31 @@ cheese_flash_finalize (GObject *object)
    G_OBJECT_CLASS (cheese_flash_parent_class)->finalize (object);
 }

+static void
+cheese_flash_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  CheeseFlashPrivate *priv = CHEESE_FLASH (object)->priv;
+
+  switch (prop_id)
+  {
+    case PROP_PARENT: {
+      GObject *object;
+      object = g_value_get_object (value);
+      if (object != NULL)
+        priv->parent = g_object_ref (object);
+      else
+        priv->parent = NULL;
+    }
+    break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
 static void
 cheese_flash_class_init (CheeseFlashClass *klass)
 {
@ -137,17 +172,40 @@ cheese_flash_class_init (CheeseFlashClass *klass)

  g_type_class_add_private (klass, sizeof (CheeseFlashPrivate));

+  object_class->set_property = cheese_flash_set_property;
  object_class->dispose      = cheese_flash_dispose;
  object_class->finalize     = cheese_flash_finalize;
+
+  /**
+   * CheeseFlash:parent:
+   *
+   * Parent #GtkWidget for the #CheeseFlash. The flash will be fired on the
+   * screen where the parent widget is shown.
+   */
+  properties[PROP_PARENT] = g_param_spec_object ("parent",
+                                                 "Parent widget",
+                                                 "The flash will be fired on the screen where the parent widget is shown",
+                                                 GTK_TYPE_WIDGET,
+                                                 G_PARAM_WRITABLE |
+                                                 G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (object_class, PROP_LAST, properties);
 }

+/*
+ * cheese_flash_opacity_fade:
+ * @data: the #CheeseFlash
+ *
+ * Fade the flash out.
+ *
+ * Returns: %TRUE if the fade was completed, %FALSE if the flash must continue
+ * to fade
+ */
 static gboolean
 cheese_flash_opacity_fade (gpointer data)
 {
-  CheeseFlash        *flash        = data;
-  CheeseFlashPrivate *flash_priv   = CHEESE_FLASH_GET_PRIVATE (flash);
-  GtkWindow          *flash_window = flash_priv->window;
-  double              opacity      = gtk_window_get_opacity (flash_window);
+  GtkWindow *flash_window = GTK_WINDOW (data);
+  gdouble opacity = gtk_window_get_opacity (flash_window);

  /* exponentially decrease */
  gtk_window_set_opacity (flash_window, opacity * FLASH_FADE_FACTOR);
@ -156,60 +214,98 @@ cheese_flash_opacity_fade (gpointer data)
  {
    /* the flasher has finished when we reach the quit value */
    gtk_widget_hide (GTK_WIDGET (flash_window));
-    return FALSE;
+    return G_SOURCE_REMOVE;
  }

-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }

+/*
+ * cheese_flash_start_fade:
+ * @data: the #CheeseFlash
+ *
+ * Add a timeout to start the fade animation.
+ *
+ * Returns: %FALSE
+ */
 static gboolean
 cheese_flash_start_fade (gpointer data)
 {
-  CheeseFlash *self = data;
-  CheeseFlashPrivate *flash_priv = CHEESE_FLASH_GET_PRIVATE (self);
-  GtkWindow *flash_window = flash_priv->window;
+  CheeseFlashPrivate *flash_priv = CHEESE_FLASH (data)->priv;
+
+  GtkWindow *flash_window = GTK_WINDOW (data);

  /* If the screen is non-composited, just hide and finish up */
  if (!gdk_screen_is_composited (gtk_window_get_screen (flash_window)))
  {
    gtk_widget_hide (GTK_WIDGET (flash_window));
-    return FALSE;
+    return G_SOURCE_REMOVE;
  }

-  flash_priv->fade_timeout_tag = 
-    g_timeout_add_full (G_PRIORITY_DEFAULT,
-                        1000.0 / FLASH_ANIMATION_RATE,
-                        cheese_flash_opacity_fade,
-                        g_object_ref (self), g_object_unref);
-  return FALSE;
+  flash_priv->fade_timeout_tag = g_timeout_add (1000.0 / FLASH_ANIMATION_RATE, cheese_flash_opacity_fade, data);
+  return G_SOURCE_REMOVE;
 }

+/**
+ * cheese_flash_fire:
+ * @flash: a #CheeseFlash
+ *
+ * Fire the flash.
+ */
 void
-cheese_flash_fire (CheeseFlash  *flash,
-                   GdkRectangle *rect)
+cheese_flash_fire (CheeseFlash *flash)
 {
-  CheeseFlashPrivate *flash_priv = CHEESE_FLASH_GET_PRIVATE (flash);
-  GtkWindow *flash_window = flash_priv->window;
+  CheeseFlashPrivate *flash_priv;
+  GtkWidget          *parent;
+  GdkScreen          *screen;
+  GdkRectangle        rect, work_rect;
+  int                 monitor;
+  GtkWindow *flash_window;
+
+  g_return_if_fail (CHEESE_IS_FLASH (flash));
+
+  flash_priv = flash->priv;
+
+  g_return_if_fail (flash_priv->parent != NULL);
+
+  flash_window = GTK_WINDOW (flash);

  if (flash_priv->flash_timeout_tag > 0)
    g_source_remove (flash_priv->flash_timeout_tag);
  if (flash_priv->fade_timeout_tag > 0)
    g_source_remove (flash_priv->fade_timeout_tag);

-  gtk_window_resize (flash_window, rect->width, rect->height);
-  gtk_window_move (flash_window, rect->x, rect->y);
+  parent  = gtk_widget_get_toplevel (flash_priv->parent);
+  screen  = gtk_widget_get_screen (parent);
+  monitor = gdk_screen_get_monitor_at_window (screen,
+					      gtk_widget_get_window (parent));

-  gtk_window_set_opacity (flash_window, 0.99);
+  gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+  gdk_screen_get_monitor_workarea (screen, monitor, &work_rect);
+  gdk_rectangle_intersect (&work_rect, &rect, &rect);
+
+  gtk_window_set_transient_for (GTK_WINDOW (flash_window), GTK_WINDOW (parent));
+  gtk_window_resize (flash_window, rect.width, rect.height);
+  gtk_window_move (flash_window, rect.x, rect.y);
+
+  gtk_window_set_opacity (flash_window, 1);
  gtk_widget_show_all (GTK_WIDGET (flash_window));
-  flash_priv->flash_timeout_tag = 
-    g_timeout_add_full (G_PRIORITY_DEFAULT,
-                        FLASH_DURATION,
-                        cheese_flash_start_fade,
-                        g_object_ref (flash), g_object_unref);
+  flash_priv->flash_timeout_tag = g_timeout_add (FLASH_DURATION, cheese_flash_start_fade, (gpointer) flash);
 }

+/**
+ * cheese_flash_new:
+ * @parent: a parent #GtkWidget
+ *
+ * Create a new #CheeseFlash, associated with the @parent widget.
+ *
+ * Returns: a new #CheeseFlash
+ */
 CheeseFlash *
-cheese_flash_new (void)
+cheese_flash_new (GtkWidget *parent)
 {
-  return g_object_new (CHEESE_TYPE_FLASH, NULL);
+  return g_object_new (CHEESE_TYPE_FLASH,
+                       "parent", parent,
+		       "type", GTK_WINDOW_POPUP,
+                       NULL);
 }
--- a/src/cheese-flash.h
+++ b/src/cheese-flash.h
@ -20,6 +20,7 @@
 #ifndef _CHEESE_FLASH_H_
 #define _CHEESE_FLASH_H_

+#include <gtk/gtk.h>
 #include <glib-object.h>

 G_BEGIN_DECLS
@ -31,21 +32,37 @@ G_BEGIN_DECLS
 #define CHEESE_IS_FLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHEESE_TYPE_FLASH))
 #define CHEESE_FLASH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHEESE_TYPE_FLASH, CheeseFlashClass))

-typedef struct
-{
-  GObjectClass parent_class;
-} CheeseFlashClass;
+typedef struct _CheeseFlashPrivate CheeseFlashPrivate;
+typedef struct _CheeseFlashClass CheeseFlashClass;
+typedef struct _CheeseFlash CheeseFlash;

-typedef struct
+/**
+ * CheeseFlashClass:
+ *
+ * Use the accessor functions below.
+ */
+struct _CheeseFlashClass
 {
-  GObject parent_instance;
-} CheeseFlash;
+  /*< private >*/
+  GtkWindowClass parent_class;
+};
+
+/**
+ * CheeseFlash:
+ *
+ * Use the accessor functions below.
+ */
+struct _CheeseFlash
+{
+  /*< private >*/
+  GtkWindow parent_instance;
+  CheeseFlashPrivate *priv;
+};

 GType        cheese_flash_get_type (void) G_GNUC_CONST;
-CheeseFlash *cheese_flash_new (void);
+CheeseFlash *cheese_flash_new (GtkWidget *parent);

-void cheese_flash_fire (CheeseFlash *flash,
-                        GdkRectangle *rect);
+void cheese_flash_fire (CheeseFlash *flash);

 #include <cheese/cheese-widget.h>

--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@ -298,6 +298,7 @@ public class Contacts.App : Gtk.Application {

    var add_button = left_toolbar.add_button (null, _("New"), true) as Gtk.Button;
    add_button.set_size_request (70, -1);
+    add_button.set_vexpand (true);
    add_button.clicked.connect (app.new_contact);

    select_button = left_toolbar.add_toggle ("object-select-symbolic", null, false) as ToggleButton;
@ -308,12 +309,16 @@ public class Contacts.App : Gtk.Application {
    grid.attach (right_toolbar, 1, 0, 1, 1);

    contact_name = new Label (null);
+    contact_name.set_ellipsize (Pango.EllipsizeMode.END);
+    contact_name.wrap_mode = Pango.WrapMode.CHAR;
+    contact_name.set_halign (Align.START);
    contact_name.set_valign (Align.CENTER);
    contact_name.set_vexpand (true);
    contact_name.set_hexpand (true);
    contact_name.margin_left = 12;
    contact_name.margin_right = 12;
    var item = new ToolItem ();
+    item.set_expand (true);
    item.add (contact_name);
    right_toolbar.insert (item, -1);

@ -336,16 +341,26 @@ public class Contacts.App : Gtk.Application {
    item.add (done_button);
    right_toolbar.insert (item, -1);

-    window.add (grid);

-    /* We put in an overlay overlapping the left and right pane for the
-       notifications, so they can show up below the toolbar */
    overlay = new Gtk.Overlay ();
    Gdk.RGBA transparent = { 0, 0, 0, 0 };
    overlay.override_background_color (0, transparent);
-    // Need to put something in here for it to work
-    overlay.add (new Alignment (0,0,0,0));
-    grid.attach (overlay, 0, 1, 2, 1);
+    overlay.add (grid);
+    overlay.get_child_position.connect ((overlay, widget, alloc) => {
+	int nat;
+	widget.get_preferred_width (null, out nat);
+	alloc.width = nat;
+
+	alloc.x = (overlay.get_allocated_width () - nat) / 2;
+	alloc.y = left_toolbar.get_allocated_height ();
+
+	widget.get_preferred_height (null, out nat);
+	alloc.height = nat;
+
+	return true;
+      });
+
+    window.add (overlay);

    list_pane = new ListPane (contacts_store);
    list_pane.selection_changed.connect (selection_changed);
@ -365,7 +380,7 @@ public class Contacts.App : Gtk.Application {

    grid.attach (right_overlay, 1, 1, 1, 1);

-    grid.show_all ();
+    overlay.show_all ();

    select_button.toggled.connect (() => {
        if (select_button.active)
@ -462,6 +477,7 @@ public class Contacts.App : Gtk.Application {

  public void show_message (string message) {
    var notification = new Gd.Notification ();
+    notification.timeout = 5;

    var g = new Grid ();
    g.set_column_spacing (8);
@ -490,6 +506,7 @@ public class Contacts.App : Gtk.Application {
      });

    var notification = new Gd.Notification ();
+    notification.timeout = 5;

    var g = new Grid ();
    g.set_column_spacing (8);
@ -521,6 +538,7 @@ public class Contacts.App : Gtk.Application {
    select_button.set_active (false);

    var notification = new Gd.Notification ();
+    notification.timeout = 5;

    var g = new Grid ();
    g.set_column_spacing (8);
@ -562,6 +580,7 @@ public class Contacts.App : Gtk.Application {
    contacts_pane.set_edit_mode (false);

    var notification = new Gd.Notification ();
+    notification.timeout = 5;

    var g = new Grid ();
    g.set_column_spacing (8);
@ -601,6 +620,7 @@ public class Contacts.App : Gtk.Application {

  private void contacts_linked (string? main_contact, string linked_contact, LinkOperation operation) {
    var notification = new Gd.Notification ();
+    notification.timeout = 5;

    var g = new Grid ();
    g.set_column_spacing (8);
--- a/src/contacts-avatar-dialog.vala
+++ b/src/contacts-avatar-dialog.vala
@ -381,7 +381,7 @@ public class Contacts.AvatarDialog : Dialog {
    cheese.set_no_show_all (true);
    frame_grid.add (cheese);

-    flash = new Cheese.Flash ();
+    flash = new Cheese.Flash (this);

    toolbar = new Toolbar ();
    toolbar.get_style_context ().add_class (STYLE_CLASS_PRIMARY_TOOLBAR);
@ -398,9 +398,7 @@ public class Contacts.AvatarDialog : Dialog {
    accept_button.clicked.connect ( (button) => {
 	var camera = cheese.get_camera () as Cheese.Camera;

-	var screen = button.get_screen ();
-        Gdk.Rectangle rect = { 0, 0, screen.get_width (), screen.get_height ()};
-        flash.fire (rect);
+        flash.fire ();

 	camera.photo_taken.connect ( (pix) => {
 	    set_crop_widget (pix);
@ -448,6 +446,14 @@ public class Contacts.AvatarDialog : Dialog {
 	  }
 	}

+#if HAVE_CHEESE
+	/* Ensure the Vala garbage collector disposes of the Cheese widget.
+	 * This prevents the 'Device or resource busy' warnings, see:
+	 *   https://bugzilla.gnome.org/show_bug.cgi?id=700959
+	 */
+	cheese = null;
+#endif
+
 	this.destroy ();
      });

--- a/src/contacts-contact-editor.vala
+++ b/src/contacts-contact-editor.vala
@ -553,13 +553,7 @@ public class Contacts.ContactEditor : Grid {
 	}
      }
      if (! rows.is_empty) {
-	if (writable_personas[p].has_key (prop_name)) {
-	  foreach (var entry in rows.entries) {
-	    writable_personas[p][prop_name].rows.set (entry.key, entry.value);
-	  }
-	} else {
-	  writable_personas[p].set (prop_name, { false, rows });
-	}
+	writable_personas[p].set (prop_name, { add_empty, rows });
      }
      break;
    case "notes":
@ -699,13 +693,6 @@ public class Contacts.ContactEditor : Grid {
      }

      var rw_props = Contact.sort_persona_properties (p.writeable_properties);
-      /* FIXME: remove debug code */
-      string pps = "";
-      foreach (var pw in rw_props) {
-	pps += " %s;".printf (pw);
-      }
-      debug ("%s => rw_props: %s", p.uid, pps);
-
      if (rw_props.length != 0) {
 	writable_personas.set (p, new HashMap<string, Field?> ());
 	foreach (var prop in rw_props) {
@ -742,11 +729,6 @@ public class Contacts.ContactEditor : Grid {
    foreach (var entry in writable_personas.entries) {
      foreach (var field_entry in entry.value.entries) {
 	if (field_entry.value.changed && ! (field_entry.key in props_set)) {
-	  string rows = "";
-	  foreach (var index in field_entry.value.rows.keys) {
-	    rows += "%d ".printf (index);
-	  }
-
 	  PropertyData p = PropertyData ();
 	  p.persona = entry.key;

--- a/src/contacts-contact-sheet.vala
+++ b/src/contacts-contact-sheet.vala
@ -37,6 +37,10 @@ public class Contacts.ContactSheet : Grid {
    attach (value_button, 1, row, 1, 1);
    row++;

+    (value_button.get_child () as Label).set_ellipsize (Pango.EllipsizeMode.END);
+    (value_button.get_child () as Label).wrap_mode = Pango.WrapMode.CHAR;
+
+
    return value_button;
  }

@ -52,6 +56,8 @@ public class Contacts.ContactSheet : Grid {
    value_label.set_line_wrap (true);
    value_label.xalign = 0.0f;
    value_label.set_halign (Align.START);
+    value_label.set_ellipsize (Pango.EllipsizeMode.END);
+    value_label.wrap_mode = Pango.WrapMode.CHAR;

    /* FIXME: hardcode gap to match the button size */
    type_label.margin_top = 3;
--- a/src/contacts-list-pane.vala
+++ b/src/contacts-list-pane.vala
@ -40,7 +40,7 @@ public class Contacts.ListPane : Frame {
    string []? values;
    string str = filter_entry.get_text ();

-    if (str.length == 0)
+    if (Utils.string_is_empty (str))
      values = null;
    else {
      str = Utils.canonicalize_for_search (str);
--- a/src/contacts-new-contact-dialog.vala
+++ b/src/contacts-new-contact-dialog.vala
@ -176,6 +176,14 @@ public class Contacts.NewContactDialog : Dialog {
    sub_grid.set_hexpand (true);
    entries.add (sub_grid);

+    /* Ensure that class_init() of Contact has been called, to initialize the
+     * static members, including postal_element_props. */
+    var contact_type = Type.from_name ("ContactsContact");
+    if (contact_type != 0) {
+      // Type has been registered, make sure that class_init() has been called.
+      contact_type.class_ref ();
+    }
+
    for (int i = 0; i < Contact.postal_element_props.length; i++) {
      var entry = new Entry ();
      entry.set ("placeholder-text", Contact.postal_element_names[i]);
--- a/src/contacts-utils.vala
+++ b/src/contacts-utils.vala
@ -174,6 +174,20 @@ public class Contacts.Utils : Object {
    }
  }

+  /* Returns false if the given string contains at least one non-"space"
+   * character.
+   */
+  public static bool string_is_empty (string str) {
+    unichar c;
+
+    for (int i = 0; str.get_next_char (ref i, out c);) {
+      if (!c.isspace ())
+	return false;
+    }
+
+    return true;
+  }
+
  public static string canonicalize_for_search (string str) {
    unowned string s;
    var buf = new unichar[18];
--- a/src/contacts-view.vala
+++ b/src/contacts-view.vala
@ -56,8 +56,9 @@ public class Contacts.View : Egg.ListBox {
  int nr_contacts_marked;

  string []? filter_values;
-  private TextDisplay text_display;
-  private bool selectors_visible;
+  TextDisplay text_display;
+  bool selectors_visible;
+  Widget last_selected;

  public View (Store store, TextDisplay text_display = TextDisplay.PRESENCE) {
    set_selection_mode (SelectionMode.BROWSE);
@ -270,6 +271,18 @@ public class Contacts.View : Egg.ListBox {
    selection_changed (contact);
    if (contact != null)
      contact.fetch_contact_info ();
+
+    /* Hack for white display-name label */
+    if (last_selected != null) {
+      var last_data = last_selected.get_data<ContactData> ("data");
+      var label_flags = last_data.label.get_state_flags ();
+      label_flags &= ~(StateFlags.SELECTED);
+      last_data.label.set_state_flags (label_flags, true);
+    }
+    if (data != null) {
+      data.label.set_state_flags (StateFlags.SELECTED, false);
+      last_selected = child;
+    }
  }

  private bool filter (Widget child) {
--- a/vapi/custom.vapi
+++ b/vapi/custom.vapi
@ -99,7 +99,7 @@ namespace Cheese {
 	[CCode (cheader_filename = "cheese-flash.h")]
 	public class Flash : Gtk.Window {
 		[CCode (has_construct_function = false, type = "CheeseFlash*")]
-		public Flash ();
-		public void fire (Gdk.Rectangle rect);
+		public Flash (Gtk.Widget parent);
+		public void fire ();
 	}
 }
Author	SHA1	Message	Date
Cédric Valmary	3f2a0b110c	Added Occitan translation	2015-05-17 08:50:52 +00:00
Erick Pérez Castellanos	48bf9a6ca0	Bump version to 3.8.4 for release	2014-12-18 10:16:38 -05:00
Erick Pérez Castellanos	5b898cd182	Update NEWS for release	2014-12-18 10:02:18 -05:00
David King	baaff92b30	Show address fields when adding the first contact The new contact dialog iterates over the list of address fields, which are declared as static in the Contact class. Static data in Vala is implemented by initializing the data during class_init(), or in other words, the first time that the class is instantiated. When adding the first contact, there are no instances of Contact, and so the address fields have not been initialized. This leads to a blank space in the new contact dialog, where the list of address fields should be. Ensure that class_init() of the Contact class has been called by calling g_type_class_ref() on the Type before iterating over the address fields. https://bugzilla.gnome.org/show_bug.cgi?id=702810	2014-12-18 14:33:13 +00:00
Shankar Prasad	df237dfc5b	updated kn.po	2014-02-04 18:04:34 +05:30
Lasse Liehu	758d265c15	Finnish translation update	2013-11-05 07:50:49 +02:00
victory	8df5a589b0	l10n: Update Japanese translation	2013-11-02 22:23:18 +09:00
Erick Pérez Castellanos	333caf5784	Bump version for 3.8.3 release	2013-07-15 14:29:46 -04:00
Erick Pérez Castellanos	25a7084d38	Update NEWS for release	2013-07-15 14:28:33 -04:00
Jonh Wendell	a9dd4f2b73	Sync cheese-flash.[ch] And properly modify callers to the new API. Old code was creating a window with the size of the screen. Thus, when taking a photo, the gnome-shell panel was then "hidden" by this big window. This has been fixed in "upstream" cheese, so, grab the latest code and make small modifications to fit the new API. https://bugzilla.gnome.org/show_bug.cgi?id=702177	2013-07-11 13:38:32 -03:00
Erick Pérez Castellanos	6bcd0f3060	Reworked in-app notification showing. Fixed some timeout issue with GdNotification widget Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=701535	2013-06-05 09:58:39 -04:00
Sandeep Sheshrao Shedmake	40d25f2278	Updated Marathi Translations	2013-06-05 16:41:49 +05:30
Erick Pérez Castellanos	817f6c6f90	Added ellipsize to "Editing ... " label Fix as well some bugs in the widgets showing the contacts details related to the same behavior. Fixed: https://bugzilla.gnome.org/show_bug.cgi?id=701515	2013-06-03 15:07:54 -04:00
Shankar Prasad	4056faafc8	updated kn translations	2013-05-28 18:33:15 +05:30
Alexander Larsson	e159561088	Bump version to 3.8.2	2013-05-28 08:43:47 +02:00
Alexander Larsson	0d57e2f9d3	Update NEWS for release	2013-05-28 08:43:26 +02:00
Chris Cummins	86a4ba7786	Don't search for "empty" strings The contact list is only filtered if the search query is not "empty", i.e., contains at least one non-space character. This prevents returning a list of all the contacts. https://bugzilla.gnome.org/show_bug.cgi?id=700729	2013-05-27 09:52:11 -04:00
Chris Cummins	e841d8a706	Dispose of cheese widget on avatar dialog destroy This ensures that the cheese widget is destroyed when the avatar dialog is closed. If the widget is not destroyed then the camera device remains in use, causing a blank preview to be shown if the dialog is reopened. https://bugzilla.gnome.org/show_bug.cgi?id=700959	2013-05-27 09:52:05 -04:00
Erick Pérez Castellanos	5375106931	Fix [New] button height. This fix will be there for 3.8.x since I'll migrate Contacts to new GdHeaderBar soon.	2013-05-27 09:49:01 -04:00
Yuri Myasoedov	329b85c142	Updated Russian translation	2013-05-12 11:41:54 +04:00
Ask H. Larsen	24fe173b04	Updated Danish translation	2013-05-10 17:29:20 +02:00
Rajesh Ranjan	15bd3860ab	hindi update	2013-05-02 13:58:53 +05:30
Shantha kumar	c4099c817c	Tamil Translation Updated	2013-04-26 11:54:10 +05:30
Sweta Kothari	3c813d91f5	Updated gujarati file	2013-04-22 15:57:20 +05:30
A S Alam	b17300f622	Update Punjabi Translation - completed	2013-04-17 21:43:36 +05:30
Alexandre Franke	08e7dafd50	Update French translation	2013-04-17 15:22:12 +02:00
Alexander Larsson	31b3db6b87	Update for release	2013-04-15 14:52:27 +02:00
Alexander Larsson	56e0146746	Bump version	2013-04-15 14:52:16 +02:00
Akom Chotiphantawanon	7eaab66b1d	Updated Thai translation	2013-04-13 19:14:42 +07:00
Erick Pérez Castellanos	faa6c32e34	Font color fixed in contact-list. This is fixed through a hack right now. It would be better fix it in EggListBox Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=696269	2013-04-11 11:26:02 -04:00
Erick Pérez Castellanos	45d795c8fd	Set Contact birthday with initial value. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=696674	2013-04-11 11:26:02 -04:00