summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatej Urbančič <mateju@svn.gnome.org>2018-05-15 21:02:25 +0200
committerMatej Urbančič <mateju@svn.gnome.org>2018-05-15 21:02:25 +0200
commit4ad54e5979efcb0a2ccfa5279e5cf44dc55b39a5 (patch)
tree2e99963a21cbc97c143af3dd9405149a2ab9556c
parent89550bbc54f5daed4e96148ccd97178c5d039c0d (diff)
parent826b6f2fcdd8ec6535b7b65aa24501c28b651d4f (diff)
downloadgnome-contacts-4ad54e5979efcb0a2ccfa5279e5cf44dc55b39a5.tar.gz
Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-contacts
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--data/contacts.gresource.xml2
-rw-r--r--data/flatpak/org.gnome.Contacts.json1
-rw-r--r--data/icons/hicolor/16x16/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/16x16/apps/gnome-contacts.png)bin878 -> 878 bytes
-rw-r--r--data/icons/hicolor/22x22/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/22x22/apps/gnome-contacts.png)bin1264 -> 1264 bytes
-rw-r--r--data/icons/hicolor/24x24/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/24x24/apps/gnome-contacts.png)bin1317 -> 1317 bytes
-rw-r--r--data/icons/hicolor/32x32/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/32x32/apps/gnome-contacts.png)bin2119 -> 2119 bytes
-rw-r--r--data/icons/hicolor/48x48/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/48x48/apps/gnome-contacts.png)bin3402 -> 3402 bytes
-rw-r--r--data/icons/hicolor/512x512/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/512x512/apps/gnome-contacts.png)bin84688 -> 84688 bytes
-rw-r--r--data/icons/hicolor/org.gnome.Contacts.svg (renamed from data/icons/hicolor/gnome-contacts.svg)0
-rw-r--r--data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg (renamed from data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg)0
-rw-r--r--data/org.gnome.Contacts.desktop.in2
-rw-r--r--data/ui/contacts-contact-editor.ui26
-rw-r--r--data/ui/contacts-contact-form.ui35
-rw-r--r--data/ui/contacts-contact-pane.ui17
-rw-r--r--data/ui/contacts-contact-sheet.ui34
-rw-r--r--data/ui/style.css4
-rw-r--r--meson.build3
-rw-r--r--po/POTFILES.in3
-rw-r--r--po/POTFILES.skip1
-rw-r--r--po/cs.po194
-rw-r--r--po/es.po203
-rw-r--r--po/fur.po21
-rw-r--r--po/hu.po202
-rw-r--r--po/id.po196
-rw-r--r--po/ro.po1002
-rw-r--r--po/tr.po191
-rw-r--r--src/contacts-accounts-list.vala6
-rw-r--r--src/contacts-app.vala6
-rw-r--r--src/contacts-contact-editor.vala205
-rw-r--r--src/contacts-contact-form.vala90
-rw-r--r--src/contacts-contact-pane.vala77
-rw-r--r--src/contacts-contact-sheet.vala66
-rw-r--r--src/contacts-contact.vala23
-rw-r--r--src/contacts-shell-search-provider.vala15
-rw-r--r--src/contacts-store.vala30
-rw-r--r--src/contacts-utils.vala6
-rw-r--r--src/meson.build1
-rw-r--r--vapi/config.vapi2
39 files changed, 1592 insertions, 1078 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18e95a7..52f4e8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,13 +18,13 @@ flatpak:master:
- flatpak build app meson --prefix=/app _build
- flatpak build app ninja -C _build install
- flatpak-builder --finish-only --repo=repo app data/flatpak/org.gnome.Contacts.json
- # TODO: Make a Flatpak Contacts bundle for people to test
- # - flatpak build-bundle repo contacts-dev.flatpak --runtime-repo=https://sdk.gnome.org/gnome-nightly.flatpakrepo org.gnome.ContactsDevel
+ # Make a Flatpak Contacts bundle for people to test
+ - flatpak build-bundle repo contacts-dev.flatpak --runtime-repo=https://sdk.gnome.org/gnome-nightly.flatpakrepo org.gnome.Contacts
# TODO: Run automatic tests inside the Flatpak env
# - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
artifacts:
paths:
- # - contacts-dev.flatpak
+ - contacts-dev.flatpak
- _build/meson-logs/meson-log.txt
# - _build/meson-logs/testlog.txt
expire_in: 2 days
diff --git a/data/contacts.gresource.xml b/data/contacts.gresource.xml
index 6564cfd..30c7fc3 100644
--- a/data/contacts.gresource.xml
+++ b/data/contacts.gresource.xml
@@ -7,8 +7,8 @@
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-accounts-list.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-avatar-selector.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-editor.ui</file>
+ <file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-form.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-pane.ui</file>
- <file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-sheet.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-crop-cheese-dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-in-app-notification.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-link-suggestion-grid.ui</file>
diff --git a/data/flatpak/org.gnome.Contacts.json b/data/flatpak/org.gnome.Contacts.json
index dd20042..65d6299 100644
--- a/data/flatpak/org.gnome.Contacts.json
+++ b/data/flatpak/org.gnome.Contacts.json
@@ -5,7 +5,6 @@
"sdk": "org.gnome.Sdk",
"command": "gnome-contacts",
"desktop-file-name-prefix": "(Development) ",
- "rename-icon": "gnome-contacts",
"copy-icon": true,
"finish-args": [
/* X11 + XShm access */
diff --git a/data/icons/hicolor/16x16/apps/gnome-contacts.png b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png
index 7b3121f..7b3121f 100644
--- a/data/icons/hicolor/16x16/apps/gnome-contacts.png
+++ b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/22x22/apps/gnome-contacts.png b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png
index d1d1584..d1d1584 100644
--- a/data/icons/hicolor/22x22/apps/gnome-contacts.png
+++ b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/24x24/apps/gnome-contacts.png b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png
index 2f56f41..2f56f41 100644
--- a/data/icons/hicolor/24x24/apps/gnome-contacts.png
+++ b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/32x32/apps/gnome-contacts.png b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png
index cfadd37..cfadd37 100644
--- a/data/icons/hicolor/32x32/apps/gnome-contacts.png
+++ b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/48x48/apps/gnome-contacts.png b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png
index 2fbf4ce..2fbf4ce 100644
--- a/data/icons/hicolor/48x48/apps/gnome-contacts.png
+++ b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/512x512/apps/gnome-contacts.png b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png
index 000f08f..000f08f 100644
--- a/data/icons/hicolor/512x512/apps/gnome-contacts.png
+++ b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/gnome-contacts.svg b/data/icons/hicolor/org.gnome.Contacts.svg
index 031a067..031a067 100644
--- a/data/icons/hicolor/gnome-contacts.svg
+++ b/data/icons/hicolor/org.gnome.Contacts.svg
diff --git a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg
index f58d16d..f58d16d 100644
--- a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg
diff --git a/data/org.gnome.Contacts.desktop.in b/data/org.gnome.Contacts.desktop.in
index 9afe1ef..63945b4 100644
--- a/data/org.gnome.Contacts.desktop.in
+++ b/data/org.gnome.Contacts.desktop.in
@@ -4,7 +4,7 @@ Comment=A contacts manager for GNOME
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=friends;address book;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-contacts
+Icon=org.gnome.Contacts
Exec=gnome-contacts
Terminal=false
Type=Application
diff --git a/data/ui/contacts-contact-editor.ui b/data/ui/contacts-contact-editor.ui
index 57a862f..a601209 100644
--- a/data/ui/contacts-contact-editor.ui
+++ b/data/ui/contacts-contact-editor.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<menu id="edit-contact-menu">
<item>
@@ -49,32 +49,10 @@
</item>
</menu>
- <template class="ContactsContactEditor" parent="GtkGrid">
+ <template class="ContactsContactEditor" parent="ContactsContactForm">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="main_sw">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">none</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkGrid" id="container_grid">
- <property name="visible">True</property>
- <property name="margin">36</property>
- <property name="margin_bottom">24</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <signal name="size-allocate" handler="on_container_grid_size_allocate" after="true" />
- </object>
- </child>
- </object>
- </child>
- <child>
<object class="GtkActionBar">
<property name="visible">True</property>
<child>
diff --git a/data/ui/contacts-contact-form.ui b/data/ui/contacts-contact-form.ui
new file mode 100644
index 0000000..b0c1fd1
--- /dev/null
+++ b/data/ui/contacts-contact-form.ui
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.22 -->
+ <template class="ContactsContactForm" parent="GtkGrid">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="main_sw">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">none</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="ContactsMaxWidthBin">
+ <property name="visible">True</property>
+ <property name="max_width">600</property>
+ <child>
+ <object class="GtkGrid" id="container_grid">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">16</property>
+ <property name="margin">36</property>
+ <property name="margin_bottom">24</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
diff --git a/data/ui/contacts-contact-pane.ui b/data/ui/contacts-contact-pane.ui
index d76e65e..a999b66 100644
--- a/data/ui/contacts-contact-pane.ui
+++ b/data/ui/contacts-contact-pane.ui
@@ -43,23 +43,8 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="contact_sheet_page">
+ <object class="GtkBox" id="contact_sheet_page">
<property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">none</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="ContactsMaxWidthBin" id="contact_sheet_container">
- <property name="visible">True</property>
- <property name="max-width">600</property>
- </object>
- </child>
- <style>
- <class name="contacts-main-view"/>
- <class name="view"/>
- </style>
</object>
<packing>
<property name="name">contact-sheet-page</property>
diff --git a/data/ui/contacts-contact-sheet.ui b/data/ui/contacts-contact-sheet.ui
deleted file mode 100644
index a65ece5..0000000
--- a/data/ui/contacts-contact-sheet.ui
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.22 -->
- <template class="ContactsContactSheet" parent="GtkGrid">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">16</property>
- <property name="margin">36</property>
- <property name="margin_bottom">24</property>
- <child>
- <object class="GtkLabel" id="name_label">
- <property name="visible">True</property>
- <property name="selectable">True</property>
- <property name="hexpand">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="margin_start">6</property>
- <property name="xalign">0</property>
- <property name="ellipsize">end</property>
- <style>
- <class name="contacts-contact-sheet"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="height">3</property>
- </packing>
- </child>
- </template>
-</interface>
diff --git a/data/ui/style.css b/data/ui/style.css
index 455dd65..848f849 100644
--- a/data/ui/style.css
+++ b/data/ui/style.css
@@ -23,8 +23,8 @@ ContactsListPane.frame:dir(rtl) {
row.contact-data-row {
}
-/* Background color in contacts pane, similar to .documents-main-view.view */
-.contacts-main-view.view {
+/* Styles for a ContactsContactForm */
+.contacts-contact-form {
background-color: mix(@theme_bg_color, @theme_base_color, 0.4);
}
diff --git a/meson.build b/meson.build
index ca560f9..9dd2509 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,8 @@ docs_enabled = get_option('docs')
manpage_enabled = get_option('manpage')
# Common variables
+contacts_app_id = 'org.gnome.Contacts'
+
config_h_dir = include_directories('.')
contacts_prefix = get_option('prefix')
datadir = join_paths(contacts_prefix, get_option('datadir'))
@@ -66,6 +68,7 @@ valadoc = find_program('valadoc', required: docs_enabled)
# Configuration
conf = configuration_data()
+conf.set_quoted('APP_ID', contacts_app_id)
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
conf.set_quoted('LOCALEDIR', locale_dir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09289c9..c36d295 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,7 @@ data/ui/contacts-accounts-list.ui
data/ui/contacts-avatar-selector.ui
data/ui/contacts-contact-editor.ui
data/ui/contacts-contact-pane.ui
-data/ui/contacts-contact-sheet.ui
+data/ui/contacts-contact-form.ui
data/ui/contacts-crop-cheese-dialog.ui
data/ui/contacts-link-suggestion-grid.ui
data/ui/contacts-linked-personas-dialog.ui
@@ -20,6 +20,7 @@ src/contacts-app.vala
src/contacts-avatar-selector.vala
src/contacts-avatar.vala
src/contacts-contact-editor.vala
+src/contacts-contact-form.vala
src/contacts-contact-list.vala
src/contacts-contact-pane.vala
src/contacts-contact-sheet.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8fae880..6d83981 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -8,6 +8,7 @@ src/contacts-avatar.c
src/contacts-avatar-selector.c
src/contacts-contact.c
src/contacts-contact-editor.c
+src/contacts-contact-form.c
src/contacts-contact-list.c
src/contacts-contact-pane.c
src/contacts-contact-sheet.c
diff --git a/po/cs.po b/po/cs.po
index 257635d..16e2314 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-02-20 22:39+0000\n"
-"PO-Revision-Date: 2018-02-26 17:05+0100\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-04 00:29+0200\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
"Language: cs\n"
@@ -24,7 +24,7 @@ msgstr ""
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
-#: data/ui/contacts-window.ui:90 src/contacts-window.vala:209
+#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
msgstr "Kontakty"
@@ -60,8 +60,8 @@ msgstr "přátelé;přítelkyně;kamarádi;kamarádky;adresář;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -117,22 +117,13 @@ msgstr "U_končit"
msgid "Online Accounts Settings"
msgstr "Nastavení Účtů on-line"
-#: data/ui/contacts-avatar-selector.ui:6
-msgid "Select Picture"
-msgstr "Vyberte obrázek"
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Pořídit snímek…"
-#: data/ui/contacts-avatar-selector.ui:33 src/contacts-window.vala:301
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: data/ui/contacts-avatar-selector.ui:279
-msgid "Select"
-msgstr "Výběr"
-
-#: data/ui/contacts-avatar-selector.ui:285 data/ui/contacts-window.ui:175
-#: src/contacts-app.vala:117
-msgid "Cancel"
-msgstr "Zrušit"
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Vybrat soubor…"
#: data/ui/contacts-contact-editor.ui:8
msgid "Home email"
@@ -154,18 +145,18 @@ msgstr "Telefon domů"
msgid "Work phone"
msgstr "Telefon do práce"
-#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:572
-#: src/contacts-contact-editor.vala:579 src/contacts-contact-sheet.vala:194
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Webové stránky"
-#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:598
-#: src/contacts-contact-editor.vala:605 src/contacts-contact-sheet.vala:200
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Přezdívka"
-#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:631
-#: src/contacts-contact-editor.vala:638 src/contacts-contact-sheet.vala:207
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Narozeniny"
@@ -198,6 +189,21 @@ msgstr "Odstranit kontakt"
msgid "Select a contact"
msgstr "Vyberte kontakt"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Pořídit další…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Hotovo"
+
#: data/ui/contacts-link-suggestion-grid.ui:56
msgid "Link Contacts"
msgstr "Propojit kontakty"
@@ -231,11 +237,6 @@ msgstr "Ukončit"
msgid "Cancel setup and quit"
msgstr "Zrušit nastavení a skončit"
-#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
-#: src/contacts-window.vala:216
-msgid "Done"
-msgstr "Hotovo"
-
#: data/ui/contacts-setup-window.ui:43
msgid "Setup complete"
msgstr "Nastavení dokončeno"
@@ -286,7 +287,7 @@ msgstr "Upravit údaje"
msgid "Loading"
msgstr "Načítá se"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Místní adresář"
@@ -345,20 +346,32 @@ msgstr "O kontaktech GNOME"
msgid "Contact Management Application"
msgstr "Aplikace pro správu kontaktů"
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011 – 2018 Vývojáři aplikace Kontakty"
+
#: src/contacts-app.vala:202
#, c-format
msgid "No contact with email address %s found"
msgstr "Kontakt s e-mailovou adresou %s nebyl nalezen"
-#: src/contacts-avatar-selector.vala:297
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Selhalo nastavení avatára."
+
+#: src/contacts-avatar-selector.vala:190
msgid "Browse for more pictures"
msgstr "Procházet další obrázky"
-#: src/contacts-avatar-selector.vala:300
+#: src/contacts-avatar-selector.vala:193
msgid "_Cancel"
msgstr "_Zrušit"
-#: src/contacts-avatar-selector.vala:301
+#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "_Otevřít"
@@ -390,71 +403,75 @@ msgstr "PO box"
msgid "Country"
msgstr "Země"
-#: src/contacts-contact-editor.vala:313
+#: src/contacts-contact-editor.vala:314
msgid "Add email"
msgstr "Přidat e-mail"
-#: src/contacts-contact-editor.vala:315
+#: src/contacts-contact-editor.vala:316
msgid "Add number"
msgstr "Přidat číslo"
-#: src/contacts-contact-editor.vala:319 src/contacts-contact-editor.vala:350
-#: src/contacts-contact-editor.vala:384 src/contacts-contact-editor.vala:439
-#: src/contacts-contact-editor.vala:489
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
msgid "Delete field"
msgstr "Smazat pole"
-#: src/contacts-contact-editor.vala:653 src/contacts-contact-editor.vala:660
-#: src/contacts-contact-sheet.vala:214
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Poznámka"
-#: src/contacts-contact-editor.vala:948
+#: src/contacts-contact-editor.vala:950
msgid "Change avatar"
-msgstr "Změnit avatara"
+msgstr "Změnit avatára"
-#: src/contacts-contact-editor.vala:990
+#: src/contacts-contact-editor.vala:992
msgid "Add name"
msgstr "Přidat jméno"
-#: src/contacts-contact-list.vala:174
+#: src/contacts-contact-list.vala:178
msgid "Favorites"
msgstr "Oblíbené"
-#: src/contacts-contact-list.vala:176 src/contacts-contact-list.vala:182
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
msgid "All Contacts"
msgstr "Všechny kontakty"
-#: src/contacts-contact-pane.vala:353
+#: src/contacts-contact-pane.vala:287
msgid "You need to enter some data"
msgstr "Musíte zadat nějaká data"
-#: src/contacts-contact-pane.vala:358
+#: src/contacts-contact-pane.vala:292
msgid "No primary addressbook configured"
msgstr "Není nastaven hlavní adresář"
-#: src/contacts-contact-pane.vala:368
+#: src/contacts-contact-pane.vala:302
#, c-format
msgid "Unable to create new contacts: %s"
msgstr "Nelze vytvořit nový kontakt: %s"
-#: src/contacts-contact-pane.vala:377
+#: src/contacts-contact-pane.vala:311
msgid "Unable to find newly created contact"
msgstr "Nelze najít nově vytvořený kontakt"
-#: src/contacts-contact.vala:353
+#: src/contacts-contact.vala:301
msgid "Unexpected internal error: created contact was not found"
msgstr "Neočekávaná vnitřní chyba: vytvořený kontakt nebyl nalezen"
-#: src/contacts-contact.vala:516
+#: src/contacts-contact.vala:460
msgid "Google Circles"
msgstr "Kruhy Google"
-#: src/contacts-contact.vala:518 src/contacts-esd-setup.vala:152
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
#: src/contacts-esd-setup.vala:167
msgid "Google"
msgstr "Google"
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "Nezdařilo se pořídit snímek."
+
#: src/contacts-esd-setup.vala:164
msgid "Local Contact"
msgstr "Lokálně uložený"
@@ -572,81 +589,81 @@ msgstr "Jedná se o stejnou osobu jako %s?"
#. 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:114 src/contacts-types.vala:126
-#: src/contacts-types.vala:227 src/contacts-types.vala:341
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Jiný"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:282 src/contacts-types.vala:306
-#: src/contacts-types.vala:337
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
msgstr "Domů"
-#: src/contacts-types.vala:283 src/contacts-types.vala:307
-#: src/contacts-types.vala:332
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
msgstr "Pracovní"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:305
+#: src/contacts-types.vala:300
msgid "Personal"
msgstr "Osobní"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:331
+#: src/contacts-types.vala:326
msgid "Assistant"
msgstr "Asistent(ka)"
-#: src/contacts-types.vala:333
+#: src/contacts-types.vala:328
msgid "Work Fax"
msgstr "Fax do práce"
-#: src/contacts-types.vala:334
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Zpětné zavolání"
-#: src/contacts-types.vala:335
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Do auta"
-#: src/contacts-types.vala:336
+#: src/contacts-types.vala:331
msgid "Company"
msgstr "Společnost"
-#: src/contacts-types.vala:338
+#: src/contacts-types.vala:333
msgid "Home Fax"
msgstr "Fax domů"
-#: src/contacts-types.vala:339
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "Telefon ISDN"
-#: src/contacts-types.vala:340
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "Mobil"
-#: src/contacts-types.vala:342
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Fax"
-#: src/contacts-types.vala:343
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Pager"
-#: src/contacts-types.vala:344
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Radiostanice"
-#: src/contacts-types.vala:345
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Dálnopis"
#. To translators: TTY is Teletypewriter
-#: src/contacts-types.vala:347
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "TTY"
-#: src/contacts-window.vala:177
+#: src/contacts-window.vala:174
#, c-format
msgid "%d Selected"
msgid_plural "%d Selected"
@@ -654,24 +671,28 @@ msgstr[0] "%d vybraný"
msgstr[1] "%d vybrané"
msgstr[2] "%d vybraných"
-#: src/contacts-window.vala:216
+#: src/contacts-window.vala:213
msgid "Add"
msgstr "Přidat"
-#: src/contacts-window.vala:236
+#: src/contacts-window.vala:233
#, c-format
msgid "Editing %s"
msgstr "Úprava kontaktu %s"
-#: src/contacts-window.vala:291
+#: src/contacts-window.vala:287
msgid "Unmark as favorite"
msgstr "Odebrat z oblíbených"
-#: src/contacts-window.vala:292
+#: src/contacts-window.vala:288
msgid "Mark as favorite"
msgstr "Označit jako oblíbený"
-#: src/contacts-window.vala:374
+#: src/contacts-window.vala:300
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: src/contacts-window.vala:373
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
@@ -679,17 +700,17 @@ msgstr[0] "%d kontakt propojen"
msgstr[1] "%d kontakty propojeny"
msgstr[2] "%d kontaktů propojeno"
-#: src/contacts-window.vala:378 src/contacts-window.vala:402
-#: src/contacts-window.vala:439
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
msgid "_Undo"
msgstr "_Zpět"
-#: src/contacts-window.vala:397
+#: src/contacts-window.vala:396
#, c-format
msgid "Deleted contact %s"
msgstr "Smazán kontakt %s"
-#: src/contacts-window.vala:399
+#: src/contacts-window.vala:398
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
@@ -697,12 +718,12 @@ msgstr[0] "Smazán %d kontakt"
msgstr[1] "Smazány %d kontakty"
msgstr[2] "Smazáno %d kontaktů"
-#: src/contacts-window.vala:435
+#: src/contacts-window.vala:434
#, c-format
msgid "%s linked to %s"
msgstr "%s a %s propojeni"
-#: src/contacts-window.vala:437
+#: src/contacts-window.vala:436
#, c-format
msgid "%s linked to the contact"
msgstr "%s s kontaktem propojeni"
@@ -760,3 +781,6 @@ msgstr "Je okno maximalizované?"
#: src/org.gnome.Contacts.gschema.xml:33
msgid "Stores if the window is currently maximized."
msgstr "Uchovává informaci, zda je okno momentálně maximalizované."
+
+#~ msgid "Select"
+#~ msgstr "Výběr"
diff --git a/po/es.po b/po/es.po
index 42d2495..b38e464 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,14 +5,14 @@
#
#
# Jorge González <jorgegonz@svn.gnome.org>, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2018.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2018, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-02-20 22:39+0000\n"
-"PO-Revision-Date: 2018-02-21 11:40+0100\n"
+"POT-Creation-Date: 2018-05-06 18:48+0000\n"
+"PO-Revision-Date: 2018-05-08 13:18+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: es <gnome-es-list@gnome.org>\n"
"Language: es\n"
@@ -24,7 +24,7 @@ msgstr ""
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
-#: data/ui/contacts-window.ui:90 src/contacts-window.vala:209
+#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
msgstr "Contactos"
@@ -60,8 +60,9 @@ msgstr "amigos;libreta de direcciones;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+#| msgid "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -117,22 +118,13 @@ msgstr "_Salir"
msgid "Online Accounts Settings"
msgstr "Configuración de cuentas en línea"
-#: data/ui/contacts-avatar-selector.ui:6
-msgid "Select Picture"
-msgstr "Seleccionar una imagen"
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Hacer una foto…"
-#: data/ui/contacts-avatar-selector.ui:33 src/contacts-window.vala:301
-msgid "New Contact"
-msgstr "Contacto nuevo"
-
-#: data/ui/contacts-avatar-selector.ui:279
-msgid "Select"
-msgstr "Seleccionar"
-
-#: data/ui/contacts-avatar-selector.ui:285 data/ui/contacts-window.ui:175
-#: src/contacts-app.vala:117
-msgid "Cancel"
-msgstr "Cancelar"
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Seleccionar archivo…"
#: data/ui/contacts-contact-editor.ui:8
msgid "Home email"
@@ -154,18 +146,18 @@ msgstr "Teléfono personal"
msgid "Work phone"
msgstr "Teléfono del trabajo"
-#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:572
-#: src/contacts-contact-editor.vala:579 src/contacts-contact-sheet.vala:194
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Página web"
-#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:598
-#: src/contacts-contact-editor.vala:605 src/contacts-contact-sheet.vala:200
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Apodo"
-#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:631
-#: src/contacts-contact-editor.vala:638 src/contacts-contact-sheet.vala:207
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Cumpleaños"
@@ -198,6 +190,21 @@ msgstr "Quitar contacto"
msgid "Select a contact"
msgstr "Seleccionar un contacto"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Hacer otra…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Hecho"
+
#: data/ui/contacts-link-suggestion-grid.ui:56
msgid "Link Contacts"
msgstr "Contactos enlazados"
@@ -231,11 +238,6 @@ msgstr "Salir"
msgid "Cancel setup and quit"
msgstr "Cancelar configuración y salir"
-#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
-#: src/contacts-window.vala:216
-msgid "Done"
-msgstr "Hecho"
-
#: data/ui/contacts-setup-window.ui:43
msgid "Setup complete"
msgstr "Configuración completada"
@@ -255,12 +257,10 @@ msgstr ""
"línea puede añadirla usando la configuración de las cuentas en línea."
#: data/ui/contacts-window.ui:15
-#| msgid "Link contacts to %s"
msgid "List contacts by:"
msgstr "Listar contactos por:"
#: data/ui/contacts-window.ui:40
-#| msgid "Enter name"
msgid "First name"
msgstr "Nombre"
@@ -288,7 +288,7 @@ msgstr "Editar los detalles"
msgid "Loading"
msgstr "Cargando"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Libreta de direcciones local"
@@ -345,20 +345,32 @@ msgstr "Acerca de Contactos de GNOME"
msgid "Contact Management Application"
msgstr "Aplicación de gestión de contactos"
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 Los desarrolladores de Contactos"
+
#: src/contacts-app.vala:202
#, c-format
msgid "No contact with email address %s found"
msgstr "No se encontró el contacto con la dirección de correo-e %s"
-#: src/contacts-avatar-selector.vala:297
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Falló al establecer el avatar"
+
+#: src/contacts-avatar-selector.vala:190
msgid "Browse for more pictures"
msgstr "Examinar para buscar más imágenes"
-#: src/contacts-avatar-selector.vala:300
+#: src/contacts-avatar-selector.vala:193
msgid "_Cancel"
msgstr "_Cancelar"
-#: src/contacts-avatar-selector.vala:301
+#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "_Abrir"
@@ -390,72 +402,76 @@ msgstr "Apartado de correos"
msgid "Country"
msgstr "País"
-#: src/contacts-contact-editor.vala:313
+#: src/contacts-contact-editor.vala:314
msgid "Add email"
msgstr "Añadir correo-e"
-#: src/contacts-contact-editor.vala:315
+#: src/contacts-contact-editor.vala:316
msgid "Add number"
msgstr "Añadir número"
-#: src/contacts-contact-editor.vala:319 src/contacts-contact-editor.vala:350
-#: src/contacts-contact-editor.vala:384 src/contacts-contact-editor.vala:439
-#: src/contacts-contact-editor.vala:489
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
msgid "Delete field"
msgstr "Eliminar campo"
-#: src/contacts-contact-editor.vala:653 src/contacts-contact-editor.vala:660
-#: src/contacts-contact-sheet.vala:214
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Nota"
-#: src/contacts-contact-editor.vala:948
+#: src/contacts-contact-editor.vala:950
msgid "Change avatar"
msgstr "Cambiar avatar"
-#: src/contacts-contact-editor.vala:990
+#: src/contacts-contact-editor.vala:992
msgid "Add name"
msgstr "Añadir nombre"
-#: src/contacts-contact-list.vala:174
+#: src/contacts-contact-list.vala:178
msgid "Favorites"
msgstr "Favoritos"
-#: src/contacts-contact-list.vala:176 src/contacts-contact-list.vala:182
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
msgid "All Contacts"
msgstr "Todos los contactos"
-#: src/contacts-contact-pane.vala:353
+#: src/contacts-contact-pane.vala:287
msgid "You need to enter some data"
msgstr "Debe introducir algunos datos"
-#: src/contacts-contact-pane.vala:358
+#: src/contacts-contact-pane.vala:292
msgid "No primary addressbook configured"
msgstr "No se ha configurado una libreta de direcciones primaria"
-#: src/contacts-contact-pane.vala:368
+#: src/contacts-contact-pane.vala:302
#, c-format
msgid "Unable to create new contacts: %s"
msgstr "No se pudieron crear los contactos nuevos: %s"
-#: src/contacts-contact-pane.vala:377
+#: src/contacts-contact-pane.vala:311
msgid "Unable to find newly created contact"
msgstr "No se pudo encontrar el contacto nuevo creado"
-#: src/contacts-contact.vala:353
+#: src/contacts-contact.vala:301
msgid "Unexpected internal error: created contact was not found"
msgstr ""
"Ha ocurrido un error interno inesperado: no se encontró el contacto creado"
-#: src/contacts-contact.vala:516
+#: src/contacts-contact.vala:460
msgid "Google Circles"
msgstr "Círculos de Google"
-#: src/contacts-contact.vala:518 src/contacts-esd-setup.vala:152
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
#: src/contacts-esd-setup.vala:167
msgid "Google"
msgstr "Google"
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "No se puede hacer una foto."
+
#: src/contacts-esd-setup.vala:164
msgid "Local Contact"
msgstr "Contacto local"
@@ -573,134 +589,138 @@ msgstr "¿Esta es la misma persona que %s?"
#. 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:114 src/contacts-types.vala:126
-#: src/contacts-types.vala:227 src/contacts-types.vala:341
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Otro"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:282 src/contacts-types.vala:306
-#: src/contacts-types.vala:337
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
msgstr "Casa"
-#: src/contacts-types.vala:283 src/contacts-types.vala:307
-#: src/contacts-types.vala:332
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
msgstr "Trabajo"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:305
+#: src/contacts-types.vala:300
msgid "Personal"
msgstr "Personal"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:331
+#: src/contacts-types.vala:326
msgid "Assistant"
msgstr "Secretario/a"
-#: src/contacts-types.vala:333
+#: src/contacts-types.vala:328
msgid "Work Fax"
msgstr "Fax del trabajo"
-#: src/contacts-types.vala:334
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Retorno de llamada"
-#: src/contacts-types.vala:335
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Coche"
-#: src/contacts-types.vala:336
+#: src/contacts-types.vala:331
msgid "Company"
msgstr "Empresa"
-#: src/contacts-types.vala:338
+#: src/contacts-types.vala:333
msgid "Home Fax"
msgstr "Fax de casa"
-#: src/contacts-types.vala:339
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "ISDN"
-#: src/contacts-types.vala:340
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "Móvil"
-#: src/contacts-types.vala:342
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Fax"
-#: src/contacts-types.vala:343
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Buscapersonas"
-#: src/contacts-types.vala:344
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Radio"
-#: src/contacts-types.vala:345
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Télex"
#. To translators: TTY is Teletypewriter
-#: src/contacts-types.vala:347
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "Teletipo"
-#: src/contacts-window.vala:177
+#: src/contacts-window.vala:174
#, c-format
msgid "%d Selected"
msgid_plural "%d Selected"
msgstr[0] "%d seleccionado"
msgstr[1] "%d seleccionados"
-#: src/contacts-window.vala:216
+#: src/contacts-window.vala:213
msgid "Add"
msgstr "Añadir"
-#: src/contacts-window.vala:236
+#: src/contacts-window.vala:233
#, c-format
msgid "Editing %s"
msgstr "Editando %s"
-#: src/contacts-window.vala:291
+#: src/contacts-window.vala:287
msgid "Unmark as favorite"
msgstr "Desmarcar como favorita"
-#: src/contacts-window.vala:292
+#: src/contacts-window.vala:288
msgid "Mark as favorite"
msgstr "Marcar como favorito"
-#: src/contacts-window.vala:374
+#: src/contacts-window.vala:300
+msgid "New Contact"
+msgstr "Contacto nuevo"
+
+#: src/contacts-window.vala:373
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
msgstr[0] "%d contacto enlazado"
msgstr[1] "%d contactos enlazados"
-#: src/contacts-window.vala:378 src/contacts-window.vala:402
-#: src/contacts-window.vala:439
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
msgid "_Undo"
msgstr "_Deshacer"
-#: src/contacts-window.vala:397
+#: src/contacts-window.vala:396
#, c-format
msgid "Deleted contact %s"
msgstr "Contacto %s eliminado"
-#: src/contacts-window.vala:399
+#: src/contacts-window.vala:398
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
msgstr[0] "%d contacto eliminado"
msgstr[1] "%d contactos eliminados"
-#: src/contacts-window.vala:435
+#: src/contacts-window.vala:434
#, c-format
msgid "%s linked to %s"
msgstr "%s enlazado a %s"
-#: src/contacts-window.vala:437
+#: src/contacts-window.vala:436
#, c-format
msgid "%s linked to the contact"
msgstr "%s enlazado al contacto"
@@ -759,6 +779,12 @@ msgstr "¿Está la ventana maximizada?"
msgid "Stores if the window is currently maximized."
msgstr "Guarda si la ventana está maximizada actualmente."
+#~ msgid "Select Picture"
+#~ msgstr "Seleccionar una imagen"
+
+#~ msgid "Select"
+#~ msgstr "Seleccionar"
+
#~ msgid "Selection mode"
#~ msgstr "Modo de selección"
@@ -963,9 +989,6 @@ msgstr "Guarda si la ventana está maximizada actualmente."
#~ msgid "Select detail to add to %s"
#~ msgstr "Seleccionar los detalles que añadir a %s"
-#~ msgid "Select email address"
-#~ msgstr "Seleccionar dirección de correo-e"
-
#~ msgid "Select what to call"
#~ msgstr "Seleccionar dónde llamar"
diff --git a/po/fur.po b/po/fur.po
index 151ad5e..3b13dc8 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-04-20 14:11+0000\n"
-"PO-Revision-Date: 2018-04-23 16:34+0200\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-06 17:32+0200\n"
"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
"Language-Team: Friulian <fur@li.org>\n"
"Language: fur\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
@@ -56,8 +56,9 @@ msgstr "amîs;rubriche;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+#| msgid "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -142,17 +143,17 @@ msgid "Work phone"
msgstr "Telefon di vore"
#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
-#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:199
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Sît web"
#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
-#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:205
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Sorenon"
#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
-#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:212
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Complean"
@@ -283,7 +284,7 @@ msgstr "Modifiche detais"
msgid "Loading"
msgstr "Cjariament in vore"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Rubriche locâl"
@@ -412,7 +413,7 @@ msgid "Delete field"
msgstr "Elimine cjamp"
#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
-#: src/contacts-contact-sheet.vala:219
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Note"
diff --git a/po/hu.po b/po/hu.po
index 63bd114..eb7bfc3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,20 +9,20 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-02-20 22:39+0000\n"
-"PO-Revision-Date: 2018-02-24 00:21+0100\n"
-"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-07 14:09+0200\n"
+"Last-Translator: Meskó Balázs <meskobalazs@fedoraproject.org>\n"
"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
-#: data/ui/contacts-window.ui:90 src/contacts-window.vala:209
+#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
msgstr "Névjegyek"
@@ -58,8 +58,9 @@ msgstr "barátok;címjegyzék;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+#| msgid "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -115,22 +116,13 @@ msgstr "_Kilépés"
msgid "Online Accounts Settings"
msgstr "Online fiókok beállításai"
-#: data/ui/contacts-avatar-selector.ui:6
-msgid "Select Picture"
-msgstr "Válasszon egy képet"
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Fénykép készítése…"
-#: data/ui/contacts-avatar-selector.ui:33 src/contacts-window.vala:301
-msgid "New Contact"
-msgstr "Új névjegy"
-
-#: data/ui/contacts-avatar-selector.ui:279
-msgid "Select"
-msgstr "Kiválasztás"
-
-#: data/ui/contacts-avatar-selector.ui:285 data/ui/contacts-window.ui:175
-#: src/contacts-app.vala:117
-msgid "Cancel"
-msgstr "Mégse"
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Válasszon egy fájlt…"
#: data/ui/contacts-contact-editor.ui:8
msgid "Home email"
@@ -152,18 +144,18 @@ msgstr "Otthoni telefon"
msgid "Work phone"
msgstr "Munkahelyi telefon"
-#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:572
-#: src/contacts-contact-editor.vala:579 src/contacts-contact-sheet.vala:194
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Weboldal"
-#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:598
-#: src/contacts-contact-editor.vala:605 src/contacts-contact-sheet.vala:200
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Becenév"
-#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:631
-#: src/contacts-contact-editor.vala:638 src/contacts-contact-sheet.vala:207
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Születésnap"
@@ -196,6 +188,21 @@ msgstr "Névjegy eltávolítása"
msgid "Select a contact"
msgstr "Válasszon névjegyet"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Mégse"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Újabb készítése…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Kész"
+
#: data/ui/contacts-link-suggestion-grid.ui:56
msgid "Link Contacts"
msgstr "Névjegyek hivatkozása"
@@ -230,11 +237,6 @@ msgstr "Kilépés"
msgid "Cancel setup and quit"
msgstr "Beállítás megszakítása és kilépés"
-#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
-#: src/contacts-window.vala:216
-msgid "Done"
-msgstr "Kész"
-
#: data/ui/contacts-setup-window.ui:43
msgid "Setup complete"
msgstr "A beállítás befejeződött"
@@ -285,7 +287,7 @@ msgstr "Részletek szerkesztése"
msgid "Loading"
msgstr "Betöltés"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Helyi címjegyzék"
@@ -344,20 +346,32 @@ msgstr "A GNOME Névjegyek névjegye"
msgid "Contact Management Application"
msgstr "Névjegykezelő alkalmazás"
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 A Névjegyek fejlesztői"
+
#: src/contacts-app.vala:202
#, c-format
msgid "No contact with email address %s found"
msgstr "Nem található %s e-mail című névjegy"
-#: src/contacts-avatar-selector.vala:297
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Az avatar beállítása meghiúsult."
+
+#: src/contacts-avatar-selector.vala:190
msgid "Browse for more pictures"
msgstr "További képek tallózása"
-#: src/contacts-avatar-selector.vala:300
+#: src/contacts-avatar-selector.vala:193
msgid "_Cancel"
msgstr "_Mégse"
-#: src/contacts-avatar-selector.vala:301
+#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "Me_gnyitás"
@@ -389,71 +403,75 @@ msgstr "Postafiók"
msgid "Country"
msgstr "Ország"
-#: src/contacts-contact-editor.vala:313
+#: src/contacts-contact-editor.vala:314
msgid "Add email"
msgstr "E-mail hozzáadása"
-#: src/contacts-contact-editor.vala:315
+#: src/contacts-contact-editor.vala:316
msgid "Add number"
msgstr "Szám hozzáadása"
-#: src/contacts-contact-editor.vala:319 src/contacts-contact-editor.vala:350
-#: src/contacts-contact-editor.vala:384 src/contacts-contact-editor.vala:439
-#: src/contacts-contact-editor.vala:489
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
msgid "Delete field"
msgstr "Mező törlése"
-#: src/contacts-contact-editor.vala:653 src/contacts-contact-editor.vala:660
-#: src/contacts-contact-sheet.vala:214
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Jegyzet"
-#: src/contacts-contact-editor.vala:948
+#: src/contacts-contact-editor.vala:950
msgid "Change avatar"
msgstr "Avatar megváltoztatása"
-#: src/contacts-contact-editor.vala:990
+#: src/contacts-contact-editor.vala:992
msgid "Add name"
msgstr "Név hozzáadása"
-#: src/contacts-contact-list.vala:174
+#: src/contacts-contact-list.vala:178
msgid "Favorites"
msgstr "Kedvencek"
-#: src/contacts-contact-list.vala:176 src/contacts-contact-list.vala:182
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
msgid "All Contacts"
msgstr "Összes névjegy"
-#: src/contacts-contact-pane.vala:353
+#: src/contacts-contact-pane.vala:287
msgid "You need to enter some data"
msgstr "Meg kell adnia néhány adatot"
-#: src/contacts-contact-pane.vala:358
+#: src/contacts-contact-pane.vala:292
msgid "No primary addressbook configured"
msgstr "Nincs beállítva elsődleges címjegyzék"
-#: src/contacts-contact-pane.vala:368
+#: src/contacts-contact-pane.vala:302
#, c-format
msgid "Unable to create new contacts: %s"
msgstr "Nem hozhatók létre új névjegyek: %s"
-#: src/contacts-contact-pane.vala:377
+#: src/contacts-contact-pane.vala:311
msgid "Unable to find newly created contact"
msgstr "Nem található az újonnan létrejött névjegy"
-#: src/contacts-contact.vala:353
+#: src/contacts-contact.vala:301
msgid "Unexpected internal error: created contact was not found"
msgstr "Váratlan belső hiba: a létrehozott névjegy nem található"
-#: src/contacts-contact.vala:516
+#: src/contacts-contact.vala:460
msgid "Google Circles"
msgstr "Google körök"
-#: src/contacts-contact.vala:518 src/contacts-esd-setup.vala:152
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
#: src/contacts-esd-setup.vala:167
msgid "Google"
msgstr "Google"
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "A fénykép készítése meghiúsult."
+
#: src/contacts-esd-setup.vala:164
msgid "Local Contact"
msgstr "Helyi névjegy"
@@ -571,134 +589,138 @@ msgstr "Ez a személy ugyanaz mint %s?"
#. 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:114 src/contacts-types.vala:126
-#: src/contacts-types.vala:227 src/contacts-types.vala:341
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Egyéb"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:282 src/contacts-types.vala:306
-#: src/contacts-types.vala:337
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
msgstr "Otthoni"
-#: src/contacts-types.vala:283 src/contacts-types.vala:307
-#: src/contacts-types.vala:332
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
msgstr "Munkahelyi"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:305
+#: src/contacts-types.vala:300
msgid "Personal"
msgstr "Személyes"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:331
+#: src/contacts-types.vala:326
msgid "Assistant"
msgstr "Asszisztens"
-#: src/contacts-types.vala:333
+#: src/contacts-types.vala:328
msgid "Work Fax"
msgstr "Munkahelyi fax"
-#: src/contacts-types.vala:334
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Visszahívás"
-#: src/contacts-types.vala:335
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Autó"
-#: src/contacts-types.vala:336
+#: src/contacts-types.vala:331
msgid "Company"
msgstr "Cég"
-#: src/contacts-types.vala:338
+#: src/contacts-types.vala:333
msgid "Home Fax"
msgstr "Otthoni fax"
-#: src/contacts-types.vala:339
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "ISDN"
-#: src/contacts-types.vala:340
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "Mobil"
-#: src/contacts-types.vala:342
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Fax"
-#: src/contacts-types.vala:343
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Személyhívó"
-#: src/contacts-types.vala:344
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Rádió"
-#: src/contacts-types.vala:345
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: src/contacts-types.vala:347
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "TTY"
-#: src/contacts-window.vala:177
+#: src/contacts-window.vala:174
#, c-format
msgid "%d Selected"
msgid_plural "%d Selected"
msgstr[0] "%d kiválasztva"
msgstr[1] "%d kiválasztva"
-#: src/contacts-window.vala:216
+#: src/contacts-window.vala:213
msgid "Add"
msgstr "Hozzáadás"
-#: src/contacts-window.vala:236
+#: src/contacts-window.vala:233
#, c-format
msgid "Editing %s"
msgstr "%s szerkesztése"
-#: src/contacts-window.vala:291
+#: src/contacts-window.vala:287
msgid "Unmark as favorite"
msgstr "Eltávolítás a kedvencekből"
-#: src/contacts-window.vala:292
+#: src/contacts-window.vala:288
msgid "Mark as favorite"
msgstr "Megjelölés kedvencként"
-#: src/contacts-window.vala:374
+#: src/contacts-window.vala:300
+msgid "New Contact"
+msgstr "Új névjegy"
+
+#: src/contacts-window.vala:373
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
msgstr[0] "%d névjegy összekapcsolva"
msgstr[1] "%d névjegy összekapcsolva"
-#: src/contacts-window.vala:378 src/contacts-window.vala:402
-#: src/contacts-window.vala:439
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
msgid "_Undo"
msgstr "_Visszavonás"
-#: src/contacts-window.vala:397
+#: src/contacts-window.vala:396
#, c-format
msgid "Deleted contact %s"
msgstr "Törölt névjegy: %s"
-#: src/contacts-window.vala:399
+#: src/contacts-window.vala:398
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
msgstr[0] "%d névjegy törölve"
msgstr[1] "%d névjegy törölve"
-#: src/contacts-window.vala:435
+#: src/contacts-window.vala:434
#, c-format
msgid "%s linked to %s"
msgstr "%s a következőhöz kapcsolva: %s"
-#: src/contacts-window.vala:437
+#: src/contacts-window.vala:436
#, c-format
msgid "%s linked to the contact"
msgstr "%s a névjegyhez kapcsolva"
@@ -721,8 +743,8 @@ msgid ""
"If this is set to true, the list of contacts will be sorted on their "
"surnames. Otherwise, it will be sorted on the first names of the contacts."
msgstr ""
-"Ha ez igazra van állítva, akkor a névjegyek listája a vezetéknév szerint lesz "
-"rendezve. Egyébként a névjegyek utónevei szerint történik a rendezés."
+"Ha ez igazra van állítva, akkor a névjegyek listája a vezetéknév szerint "
+"lesz rendezve. Egyébként a névjegyek utónevei szerint történik a rendezés."
#: src/org.gnome.Contacts.gschema.xml:19
msgid "The default height of the contacts window."
@@ -756,3 +778,5 @@ msgstr "Az ablak teljes méretű?"
msgid "Stores if the window is currently maximized."
msgstr "Azt tárolja, hogy az ablak jelenleg teljes méretű-e."
+#~ msgid "Select"
+#~ msgstr "Kiválasztás"
diff --git a/po/id.po b/po/id.po
index d3bf414..3928ee0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-02-19 18:01+0000\n"
-"PO-Revision-Date: 2018-02-20 11:19+0700\n"
-"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-05 16:11+0700\n"
+"Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
"Language-Team: Indonesian <gnome@i15n.org>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
-#: data/ui/contacts-window.ui:90 src/contacts-window.vala:209
+#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
msgstr "Kontak"
@@ -57,8 +57,8 @@ msgstr "teman;buku alamat;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -114,22 +114,13 @@ msgstr "_Keluar"
msgid "Online Accounts Settings"
msgstr "Pengaturan Akun Daring"
-#: data/ui/contacts-avatar-selector.ui:6
-msgid "Select Picture"
-msgstr "Pilih Gambar"
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Ambil Gambar…"
-#: data/ui/contacts-avatar-selector.ui:33 src/contacts-window.vala:301
-msgid "New Contact"
-msgstr "Kontak Baru"
-
-#: data/ui/contacts-avatar-selector.ui:279
-msgid "Select"
-msgstr "Pilih"
-
-#: data/ui/contacts-avatar-selector.ui:285 data/ui/contacts-window.ui:175
-#: src/contacts-app.vala:117
-msgid "Cancel"
-msgstr "Batal"
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Pilih Berkas…"
#: data/ui/contacts-contact-editor.ui:8
msgid "Home email"
@@ -151,18 +142,18 @@ msgstr "Telepon rumah"
msgid "Work phone"
msgstr "Telepon kantor"
-#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:572
-#: src/contacts-contact-editor.vala:579 src/contacts-contact-sheet.vala:194
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Situs web"
-#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:598
-#: src/contacts-contact-editor.vala:605 src/contacts-contact-sheet.vala:200
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Nama panggilan"
-#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:631
-#: src/contacts-contact-editor.vala:638 src/contacts-contact-sheet.vala:207
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Tanggal lahir"
@@ -195,6 +186,21 @@ msgstr "Buang Kontak"
msgid "Select a contact"
msgstr "Pilih suatu kontak"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Batal"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Ambil yang Lain…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Selesai"
+
#: data/ui/contacts-link-suggestion-grid.ui:56
msgid "Link Contacts"
msgstr "Tautkan Kontak"
@@ -228,11 +234,6 @@ msgstr "Keluar"
msgid "Cancel setup and quit"
msgstr "Batalkan penyiapan dan keluar"
-#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
-#: src/contacts-window.vala:216
-msgid "Done"
-msgstr "Selesai"
-
#: data/ui/contacts-setup-window.ui:43
msgid "Setup complete"
msgstr "Penyiapan selesai"
@@ -283,7 +284,7 @@ msgstr "Sunting rincian"
msgid "Loading"
msgstr "Sedang memuat"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Buku Alamat Lokal"
@@ -329,7 +330,7 @@ msgid "translator-credits"
msgstr ""
"Andika Triwidada <andika@gmail.com>, 2011-2015.\n"
"Dirgita <dirgitadevina@yahoo.co.id>, 2012.\n"
-"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017, 2018."
+"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018."
#: src/contacts-app.vala:183
msgid "GNOME Contacts"
@@ -343,20 +344,32 @@ msgstr "Tentang Kontak GNOME"
msgid "Contact Management Application"
msgstr "Aplikasi Manajemen Kontak"
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 Pengembang Kontak"
+
#: src/contacts-app.vala:202
#, c-format
msgid "No contact with email address %s found"
msgstr "Tak ditemukan kontak dengan alamat surel %s"
-#: src/contacts-avatar-selector.vala:297
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Gagal mengatur avatar."
+
+#: src/contacts-avatar-selector.vala:190
msgid "Browse for more pictures"
msgstr "Ramban lebih banyak gambar"
-#: src/contacts-avatar-selector.vala:300
+#: src/contacts-avatar-selector.vala:193
msgid "_Cancel"
msgstr "_Batal"
-#: src/contacts-avatar-selector.vala:301
+#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "_Buka"
@@ -388,71 +401,75 @@ msgstr "Kotak pos"
msgid "Country"
msgstr "Negara"
-#: src/contacts-contact-editor.vala:313
+#: src/contacts-contact-editor.vala:314
msgid "Add email"
msgstr "Tambah surel"
-#: src/contacts-contact-editor.vala:315
+#: src/contacts-contact-editor.vala:316
msgid "Add number"
msgstr "Tambah nomor"
-#: src/contacts-contact-editor.vala:319 src/contacts-contact-editor.vala:350
-#: src/contacts-contact-editor.vala:384 src/contacts-contact-editor.vala:439
-#: src/contacts-contact-editor.vala:489
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
msgid "Delete field"
msgstr "Hapus ruas"
-#: src/contacts-contact-editor.vala:653 src/contacts-contact-editor.vala:660
-#: src/contacts-contact-sheet.vala:214
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Catatan"
-#: src/contacts-contact-editor.vala:948
+#: src/contacts-contact-editor.vala:950
msgid "Change avatar"
msgstr "Ubah avatar"
-#: src/contacts-contact-editor.vala:990
+#: src/contacts-contact-editor.vala:992
msgid "Add name"
msgstr "Tambah nama"
-#: src/contacts-contact-list.vala:174
+#: src/contacts-contact-list.vala:178
msgid "Favorites"
msgstr "Favorit"
-#: src/contacts-contact-list.vala:176 src/contacts-contact-list.vala:182
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
msgid "All Contacts"
msgstr "Semua Kontak"
-#: src/contacts-contact-pane.vala:353
+#: src/contacts-contact-pane.vala:287
msgid "You need to enter some data"
msgstr "Anda perlu memasukkan beberapa data"
-#: src/contacts-contact-pane.vala:358
+#: src/contacts-contact-pane.vala:292
msgid "No primary addressbook configured"
msgstr "Tak ada buku alamat primer yang ditata"
-#: src/contacts-contact-pane.vala:368
+#: src/contacts-contact-pane.vala:302
#, c-format
msgid "Unable to create new contacts: %s"
msgstr "Tak bisa membuat kontak baru: %s"
-#: src/contacts-contact-pane.vala:377
+#: src/contacts-contact-pane.vala:311
msgid "Unable to find newly created contact"
msgstr "Tak bisa temukan kontak yang baru dibuat"
-#: src/contacts-contact.vala:353
+#: src/contacts-contact.vala:301
msgid "Unexpected internal error: created contact was not found"
msgstr "Galat internal yang tak disangka: kontak yang dibuat tak ditemukan"
-#: src/contacts-contact.vala:516
+#: src/contacts-contact.vala:460
msgid "Google Circles"
msgstr "Lingkaran Google"
-#: src/contacts-contact.vala:518 src/contacts-esd-setup.vala:152
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
#: src/contacts-esd-setup.vala:167
msgid "Google"
msgstr "Google"
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "Tidak dapat mengambil foto."
+
#: src/contacts-esd-setup.vala:164
msgid "Local Contact"
msgstr "Kontak Lokal"
@@ -570,131 +587,135 @@ msgstr "Apakah ini orang yang sama dengan %s?"
#. 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:114 src/contacts-types.vala:126
-#: src/contacts-types.vala:227 src/contacts-types.vala:341
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Lainnya"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:282 src/contacts-types.vala:306
-#: src/contacts-types.vala:337
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
msgstr "Rumah"
-#: src/contacts-types.vala:283 src/contacts-types.vala:307
-#: src/contacts-types.vala:332
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
msgstr "Kantor"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:305
+#: src/contacts-types.vala:300
msgid "Personal"
msgstr "Pribadi"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:331
+#: src/contacts-types.vala:326
msgid "Assistant"
msgstr "Asisten"
-#: src/contacts-types.vala:333
+#: src/contacts-types.vala:328
msgid "Work Fax"
msgstr "Faks Kantor"
-#: src/contacts-types.vala:334
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Callback"
-#: src/contacts-types.vala:335
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Mobil"
-#: src/contacts-types.vala:336
+#: src/contacts-types.vala:331
msgid "Company"
msgstr "Perusahaan"
-#: src/contacts-types.vala:338
+#: src/contacts-types.vala:333
msgid "Home Fax"
msgstr "Faks Rumah"
-#: src/contacts-types.vala:339
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "ISDN"
-#: src/contacts-types.vala:340
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "HP"
-#: src/contacts-types.vala:342
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Faks"
-#: src/contacts-types.vala:343
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Pager"
-#: src/contacts-types.vala:344
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Radio"
-#: src/contacts-types.vala:345
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: src/contacts-types.vala:347
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "TTY"
-#: src/contacts-window.vala:177
+#: src/contacts-window.vala:174
#, c-format
msgid "%d Selected"
msgid_plural "%d Selected"
msgstr[0] "%d Dipilih"
-#: src/contacts-window.vala:216
+#: src/contacts-window.vala:213
msgid "Add"
msgstr "Tambah"
-#: src/contacts-window.vala:236
+#: src/contacts-window.vala:233
#, c-format
msgid "Editing %s"
msgstr "Menyunting %s"
-#: src/contacts-window.vala:291
+#: src/contacts-window.vala:287
msgid "Unmark as favorite"
msgstr "Cabut tandai sebagai favorit"
-#: src/contacts-window.vala:292
+#: src/contacts-window.vala:288
msgid "Mark as favorite"
msgstr "Tandai sebagai favorit"
-#: src/contacts-window.vala:374
+#: src/contacts-window.vala:300
+msgid "New Contact"
+msgstr "Kontak Baru"
+
+#: src/contacts-window.vala:373
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
msgstr[0] "%d kontak dikaitkan"
-#: src/contacts-window.vala:378 src/contacts-window.vala:402
-#: src/contacts-window.vala:439
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
msgid "_Undo"
msgstr "_Tak Jadi"
-#: src/contacts-window.vala:397
+#: src/contacts-window.vala:396
#, c-format
msgid "Deleted contact %s"
msgstr "Kontak yang dihapus %s"
-#: src/contacts-window.vala:399
+#: src/contacts-window.vala:398
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
msgstr[0] "%d kontak dihapus"
-#: src/contacts-window.vala:435
+#: src/contacts-window.vala:434
#, c-format
msgid "%s linked to %s"
msgstr "%s terkait ke %s"
-#: src/contacts-window.vala:437
+#: src/contacts-window.vala:436
#, c-format
msgid "%s linked to the contact"
msgstr "%s terkait ke kontak"
@@ -752,3 +773,6 @@ msgstr "Apakah jendela dimaksimalkan?"
#: src/org.gnome.Contacts.gschema.xml:33
msgid "Stores if the window is currently maximized."
msgstr "Simpan jika jendela saat ini dimaksimalkan."
+
+#~ msgid "Select"
+#~ msgstr "Pilih"
diff --git a/po/ro.po b/po/ro.po
index 1d1fa18..7a8c6fc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,477 +3,893 @@
# Cristian Buzdugă <cristianbzdg@gmail.com>, 2011.
# Cristian Buzduga <cristianbzdg@gmail.com>, 2011.
# Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2011.
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-12 07:55+0000\n"
-"PO-Revision-Date: 2011-11-24 15:47+0300\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-04 00:44+0300\n"
+"Last-Translator: Florentina Mușat <florentina.musat.28 [at] gmail [dot] "
+"com>\n"
+"Language-Team: Gnome Romanian Translation Team\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.7.0\n"
+"20)) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.7\n"
"X-Project-Style: gnome\n"
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:108
-#: ../src/main.vala:24
+#: data/org.gnome.Contacts.appdata.xml.in:6
+#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
+#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
msgstr "Contacte"
-#: ../src/contacts-app.vala:68
-#, c-format
-msgid "No contact with id %s found"
-msgstr "Nu s-a găsit niciun contact cu id-ul %s"
+#: data/org.gnome.Contacts.appdata.xml.in:7
+#: data/org.gnome.Contacts.desktop.in:4
+msgid "A contacts manager for GNOME"
+msgstr "Un manager de contacte pentru GNOME"
-#: ../src/contacts-app.vala:69 ../src/contacts-app.vala:87
-msgid "Contact not found"
-msgstr "Contactul nu a fost găsit"
+#: data/org.gnome.Contacts.appdata.xml.in:9
+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 ""
+"Contacte păstrează și organizează informațiile de contact. Puteți crea, "
+"edita, șterge și conecta împreună fragmente de informații despre contacte. "
+"Contacte agregă detaliile de la toate sursele furnizând o locație "
+"centralizată pentru gestionarea contactelor."
-#: ../src/contacts-app.vala:86
-#, c-format
-msgid "No contact with email address %s found"
-msgstr "Nu s-a găsit niciun contact cu adresa de email %s"
+#: data/org.gnome.Contacts.appdata.xml.in:15
+msgid ""
+"Contacts will also integrate with online address books and automatically "
+"link contacts from different online sources."
+msgstr ""
+"Contacte va integra și agendele de contacte online și va conecta automat "
+"contacte de la surse online diferite."
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Contacts.desktop.in:6
+msgid "friends;address book;"
+msgstr "friends;address book;prieteni;agendă;agendă de contacte;contacte;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Contacts.desktop.in:8
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
+
+#: data/gtk/help-overlay.ui:9
+msgctxt "shortcut window"
+msgid "Overview"
+msgstr "Prezentare generală"
+
+#: data/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "Help"
+msgstr "Ajutor"
+
+#: data/gtk/help-overlay.ui:21
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "Creează un contact nou"
+
+#: data/gtk/help-overlay.ui:28
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Caută"
+
+#: data/gtk/help-overlay.ui:35
+msgctxt "shortcut window"
+msgid "Shortcut list"
+msgstr "Listă de scurtături"
+
+#: data/gtk/help-overlay.ui:42
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Ieșire"
+
+#: data/gtk/menus.ui:6
+msgid "_Change Address Book…"
+msgstr "Modifică agenda de _contacte…"
+
+#: data/gtk/menus.ui:12
+msgid "Keyboard Shortcuts"
+msgstr "Scurtături de tastatură"
+
+#: data/gtk/menus.ui:16
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: data/gtk/menus.ui:20
+msgid "_About"
+msgstr "_Despre"
+
+#: data/gtk/menus.ui:24
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#: data/ui/contacts-accounts-list.ui:35
+msgid "Online Accounts Settings"
+msgstr "Configurări conturi online"
+
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Fă o fotografie…"
+
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Selectează un fișier…"
+
+#: data/ui/contacts-contact-editor.ui:8
+msgid "Home email"
+msgstr "Email personal"
+
+#: data/ui/contacts-contact-editor.ui:12
+msgid "Work email"
+msgstr "Email de serviciu"
+
+#: data/ui/contacts-contact-editor.ui:16
+msgid "Mobile phone"
+msgstr "Telefon mobil"
+
+#: data/ui/contacts-contact-editor.ui:20
+msgid "Home phone"
+msgstr "Telefon personal"
+
+#: data/ui/contacts-contact-editor.ui:24
+msgid "Work phone"
+msgstr "Telefon de serviciu"
+
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
+msgid "Website"
+msgstr "Pagină web"
+
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
+msgid "Nickname"
+msgstr "Pseudonim"
-#: ../src/contacts-app.vala:159
-msgid "Show contact with this individual id"
-msgstr "Afișează contactul cu acest identificator individual"
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
+msgid "Birthday"
+msgstr "Zi de naștere"
-#: ../src/contacts-app.vala:161
-msgid "Show contact with this email address"
-msgstr "Afișează contactul cu această adresă de email"
+#: data/ui/contacts-contact-editor.ui:40
+msgid "Home address"
+msgstr "Adresă personală"
-#: ../src/contacts-app.vala:168
-msgid "— contact management"
-msgstr "— management de contacte"
+#: data/ui/contacts-contact-editor.ui:44
+msgid "Work address"
+msgstr "Adresă de serviciu"
-#: ../src/contacts-contact-pane.vala:609 ../src/contacts-contact-pane.vala:853
-#: ../src/contacts-contact-pane.vala:1365
-msgid "Nickname"
-msgstr "Pseudonim"
+#: data/ui/contacts-contact-editor.ui:48
+msgid "Notes"
+msgstr "Notițe"
-#: ../src/contacts-contact-pane.vala:612
-msgid "Enter nickname"
-msgstr "Introduceți pseudonimul"
+#: data/ui/contacts-contact-editor.ui:94
+msgid "New Detail"
+msgstr "Detaliu nou"
-#: ../src/contacts-contact-pane.vala:618
-msgid "Alias"
-msgstr "Alias"
+#: data/ui/contacts-contact-editor.ui:112
+#: data/ui/contacts-linked-personas-dialog.ui:12
+msgid "Linked Accounts"
+msgstr "Conturi conectate"
-#: ../src/contacts-contact-pane.vala:621
-msgid "Enter alias"
-msgstr "Introduceți aliasul"
+#: data/ui/contacts-contact-editor.ui:118
+msgid "Remove Contact"
+msgstr "Elimină contactul"
-#: ../src/contacts-contact-pane.vala:633
-msgid "Enter email address"
-msgstr "Introduceți adresa de email"
+#: data/ui/contacts-contact-pane.ui:30
+msgid "Select a contact"
+msgstr "Selectați un contact"
-#: ../src/contacts-contact-pane.vala:644
-msgid "Enter phone number"
-msgstr "Introduceți numărul de telefon"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Anulează"
-#: ../src/contacts-contact-pane.vala:650 ../src/contacts-contact-pane.vala:842
-msgctxt "url-link"
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Fă încă una…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Gata"
+
+#: data/ui/contacts-link-suggestion-grid.ui:56
+msgid "Link Contacts"
+msgstr "Conectează contacte"
+
+#: data/ui/contacts-linked-personas-dialog.ui:45
+msgid "You can link contacts by selecting them from the contacts list"
+msgstr "Puteți conecta contacte prin selectarea acestora din lista de contacte"
+
+#: data/ui/contacts-list-pane.ui:22
+msgid "Type to search"
+msgstr "Tastați pentru a căuta"
+
+#. Link refers to the verb, from linking contacts together
+#: data/ui/contacts-list-pane.ui:54
msgid "Link"
-msgstr "Linkul"
+msgstr "Conectează"
-#: ../src/contacts-contact-pane.vala:655
-msgid "Enter link"
-msgstr "Introduceți linkul"
+#: data/ui/contacts-list-pane.ui:68
+msgid "Remove"
+msgstr "Elimină"
-#: ../src/contacts-contact-pane.vala:662
-msgid "Street"
-msgstr "Stradă"
+#: data/ui/contacts-setup-window.ui:13
+msgid "Contacts Setup"
+msgstr "Configurare Contacte"
-#: ../src/contacts-contact-pane.vala:662
-msgid "Extension"
-msgstr "Extensie"
+#: data/ui/contacts-setup-window.ui:22
+msgid "Quit"
+msgstr "Ieșire"
-#: ../src/contacts-contact-pane.vala:662
-msgid "City"
-msgstr "Oraș"
+#: data/ui/contacts-setup-window.ui:26
+msgid "Cancel setup and quit"
+msgstr "Anulează configurarea și ieși"
-#: ../src/contacts-contact-pane.vala:662
-msgid "State/Province"
-msgstr "Stat/provincie"
+#: data/ui/contacts-setup-window.ui:43
+msgid "Setup complete"
+msgstr "Configurare completă"
-#: ../src/contacts-contact-pane.vala:662
-msgid "Zip/Postal Code"
-msgstr "Zip/cod poștal"
+#: data/ui/contacts-setup-window.ui:69
+msgid "Welcome"
+msgstr "Bine ați venit"
-#: ../src/contacts-contact-pane.vala:662
-msgid "PO box"
-msgstr "Căsuță poștală"
+#: data/ui/contacts-setup-window.ui:81
+msgid ""
+"Please select your main address book: this is where new contacts will be "
+"added. If you keep your contacts in an online account, you can add them "
+"using the online accounts settings."
+msgstr ""
+"Selectați agenda de contacte principală: aici se vor adăuga contactele noi. "
+"Dacă păstrați contactele într-un cont online, puteți să le adăugați "
+"utilizând configurările de conturi online."
-#: ../src/contacts-contact-pane.vala:662
-msgid "Country"
-msgstr "Țară"
+#: data/ui/contacts-window.ui:15
+msgid "List contacts by:"
+msgstr "Listează contactele după:"
-#: ../src/contacts-contact-pane.vala:749
-#: ../src/contacts-contact-pane.vala:1382
-msgid "Chat"
-msgstr "Discută"
+#: data/ui/contacts-window.ui:40
+msgid "First name"
+msgstr "Prenume"
-#: ../src/contacts-contact-pane.vala:810
-msgid "Add detail"
-msgstr "Adăugă detalii"
+#: data/ui/contacts-window.ui:63
+msgid "Surname"
+msgstr "Nume"
-#: ../src/contacts-contact-pane.vala:816
-msgid "Email"
-msgstr "Email"
+#: data/ui/contacts-window.ui:102
+msgid "Create new contact"
+msgstr "Creează un contact nou"
-#: ../src/contacts-contact-pane.vala:824
-msgid "Phone number"
-msgstr "Număr de telefon"
+#: data/ui/contacts-window.ui:106
+msgid "Add contact"
+msgstr "Adaugă contact"
-#: ../src/contacts-contact-pane.vala:832
-msgid "Postal Address"
-msgstr "Adresă poștală"
+#: data/ui/contacts-window.ui:145
+msgid "Cancel selection"
+msgstr "Anulează selecția"
-#: ../src/contacts-contact-pane.vala:965
-msgid "Browse for more pictures"
-msgstr "Răsfoiește pentru mai multe poze"
+#: data/ui/contacts-window.ui:192
+msgid "Edit details"
+msgstr "Editează detaliile"
-#: ../src/contacts-contact-pane.vala:1047
-msgid "Browse for more pictures..."
-msgstr "Răsfoiește pentru mai multe poze..."
+#: data/ui/contacts-window.ui:300
+msgid "Loading"
+msgstr "Se încarcă"
-#: ../src/contacts-contact-pane.vala:1281
-msgid "Enter name"
-msgstr "Introduceți numele"
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
+msgid "Local Address Book"
+msgstr "Agendă de contacte locală"
-#: ../src/contacts-contact-pane.vala:1293
-#: ../src/contacts-contact-pane.vala:1582
-msgid "Contact Name"
-msgstr "Nume contact"
+#: src/contacts-app.vala:40
+msgid "Show contact with this individual id"
+msgstr "Arată contactul cu acest id individual"
-#: ../src/contacts-contact-pane.vala:1447
-msgid "Address copied to clipboard"
-msgstr "Adresa a fost copiată în clipboard"
+#: src/contacts-app.vala:41
+msgid "Show contact with this email address"
+msgstr "Arată contactul cu această adresă de email"
-#: ../src/contacts-contact-pane.vala:1469
-msgid "Birthday"
-msgstr "Zi de naștere"
+#: src/contacts-app.vala:43
+msgid "Show the current version of Contacts"
+msgstr "Arată versiunea curentă a aplicației Contacte"
-#: ../src/contacts-contact-pane.vala:1478 ../src/contacts-types.vala:296
-msgid "Company"
-msgstr "Companie"
+#: src/contacts-app.vala:101
+#, c-format
+msgid "No contact with id %s found"
+msgstr "Nu s-a găsit niciun contact cu id-ul %s"
+
+#: src/contacts-app.vala:102 src/contacts-app.vala:203
+msgid "Contact not found"
+msgstr "Nu s-a găsit contactul"
-#: ../src/contacts-contact-pane.vala:1485
-msgid "Department"
-msgstr "Departament"
+#: src/contacts-app.vala:111
+msgid "Change Address Book"
+msgstr "Modifică agenda de contacte"
-#: ../src/contacts-contact-pane.vala:1492
-msgid "Profession"
-msgstr "Profesie"
+#: src/contacts-app.vala:116
+msgid "Change"
+msgstr "Modifică"
-#: ../src/contacts-contact-pane.vala:1497
-msgid "Title"
-msgstr "Titlu"
+#: src/contacts-app.vala:126
+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 ""
+"Contactele noi vor fi adăugate la agenda de contacte selectată.\n"
+"Puteți vizualiza și edita contacte din alte agende."
-#: ../src/contacts-contact-pane.vala:1504
-msgid "Manager"
-msgstr "Manager"
+#: src/contacts-app.vala:182
+msgid "translator-credits"
+msgstr "Florentina Mușat <florentina.musat.28 [at] gmail [dot] com>, 2018"
-#. List most specific first, always in upper case
-#: ../src/contacts-contact-pane.vala:1513 ../src/contacts-types.vala:291
-msgid "Assistant"
-msgstr "Asistent"
+#: src/contacts-app.vala:183
+msgid "GNOME Contacts"
+msgstr "Contacte GNOME"
+
+#: src/contacts-app.vala:184
+msgid "About GNOME Contacts"
+msgstr "Despre Contacte GNOME"
-#: ../src/contacts-contact-pane.vala:1522
-msgid "Links"
-msgstr "Linkuri"
+#: src/contacts-app.vala:185
+msgid "Contact Management Application"
+msgstr "Aplicație de gestionare a contactelor"
-#: ../src/contacts-contact-pane.vala:1597
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 Dezvoltatorii Contacte"
+
+#: src/contacts-app.vala:202
#, c-format
-msgid "Unable to create new contacts: %s\n"
-msgstr "Nu s-au putut crea noile contacte: %s\n"
+msgid "No contact with email address %s found"
+msgstr "Nu s-a găsit niciun contact cu adresa de email %s"
-#: ../src/contacts-contact-pane.vala:1608
-msgid "Unable to find newly created contact\n"
-msgstr "Nu s-a putut găsi contactul nou creat\n"
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Stabilirea unui avatar a eșuat."
-#: ../src/contacts-contact-pane.vala:1721
-msgid "Notes"
-msgstr "Notițe"
+#: src/contacts-avatar-selector.vala:190
+msgid "Browse for more pictures"
+msgstr "Răsfoiește pentru mai multe fotografii"
-#: ../src/contacts-contact-pane.vala:1752
-msgid "Edit"
-msgstr "Editare"
+#: src/contacts-avatar-selector.vala:193
+msgid "_Cancel"
+msgstr "_Anulează"
-#: ../src/contacts-contact-pane.vala:1759
-msgid "More"
-msgstr "Mai mult"
+#: src/contacts-avatar-selector.vala:194
+msgid "_Open"
+msgstr "_Deschide"
-#: ../src/contacts-contact-pane.vala:1773
-msgid "Back to Contact"
-msgstr "Înapoi la Contact"
+#: src/contacts-contact-editor.vala:28
+msgid "Street"
+msgstr "Stradă"
-#: ../src/contacts-contact-pane.vala:1782
-msgid "Add/Remove Linked Contacts..."
-msgstr "Adaugă/Elimină contactele îmbinate..."
+#: src/contacts-contact-editor.vala:28
+msgid "Extension"
+msgstr "Extensie"
-#. Utils.add_menu_item (menu,_("Send..."));
-#: ../src/contacts-contact-pane.vala:1784
-msgid "Delete"
-msgstr "Șterge"
+#: src/contacts-contact-editor.vala:28
+msgid "City"
+msgstr "Oraș"
-#: ../src/contacts-contact.vala:405
-msgid "Unknown status"
-msgstr "Stare necunoscută"
+#: src/contacts-contact-editor.vala:28
+msgid "State/Province"
+msgstr "Stat/provincie"
-#: ../src/contacts-contact.vala:407
-msgid "Offline"
-msgstr "Deconectat"
+#: src/contacts-contact-editor.vala:28
+msgid "Zip/Postal Code"
+msgstr "Zip/cod poștal"
-#: ../src/contacts-contact.vala:411
-msgid "Error"
-msgstr "Eroare"
+#: src/contacts-contact-editor.vala:28
+msgid "PO box"
+msgstr "Căsuță poștală"
-#: ../src/contacts-contact.vala:413
-msgid "Available"
-msgstr "Disponibil"
+#: src/contacts-contact-editor.vala:28
+msgid "Country"
+msgstr "Țară"
-#: ../src/contacts-contact.vala:415
-msgid "Away"
-msgstr "Plecat"
+#: src/contacts-contact-editor.vala:314
+msgid "Add email"
+msgstr "Adaugă email"
-#: ../src/contacts-contact.vala:417
-msgid "Extended away"
-msgstr "Plecat pentru mai mult timp"
+#: src/contacts-contact-editor.vala:316
+msgid "Add number"
+msgstr "Adaugă număr"
-#: ../src/contacts-contact.vala:419
-msgid "Busy"
-msgstr "Ocupat"
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
+msgid "Delete field"
+msgstr "Șterge câmpul"
-#: ../src/contacts-contact.vala:421
-msgid "Hidden"
-msgstr "Ascuns"
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
+msgid "Note"
+msgstr "Notițe"
-#: ../src/contacts-contact.vala:614
-msgid "Google Talk"
-msgstr "Google Talk"
+#: src/contacts-contact-editor.vala:950
+msgid "Change avatar"
+msgstr "Modifică avatarul"
-#: ../src/contacts-contact.vala:615
-msgid "Ovi Chat"
-msgstr "Ovi Chat"
+#: src/contacts-contact-editor.vala:992
+msgid "Add name"
+msgstr "Adaugă nume"
-#: ../src/contacts-contact.vala:616 ../src/contacts-contact.vala:888
-msgid "Facebook"
-msgstr "Facebook"
+#: src/contacts-contact-list.vala:178
+msgid "Favorites"
+msgstr "Preferate"
-#: ../src/contacts-contact.vala:617
-msgid "Livejournal"
-msgstr "Livejournal"
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
+msgid "All Contacts"
+msgstr "Toate contactele"
+
+#: src/contacts-contact-pane.vala:287
+msgid "You need to enter some data"
+msgstr "Trebuie să introduceți niște date"
+
+#: src/contacts-contact-pane.vala:292
+msgid "No primary addressbook configured"
+msgstr "Nu este configurată nicio agendă de contacte principală"
+
+#: src/contacts-contact-pane.vala:302
+#, c-format
+msgid "Unable to create new contacts: %s"
+msgstr "Nu s-au putut crea contactele noi: %s"
+
+#: src/contacts-contact-pane.vala:311
+msgid "Unable to find newly created contact"
+msgstr "Nu s-a putut găsi contactul nou creat"
+
+#: src/contacts-contact.vala:301
+msgid "Unexpected internal error: created contact was not found"
+msgstr "Eroare internă neașteptată: nu s-a găsit contactul creat"
+
+#: src/contacts-contact.vala:460
+msgid "Google Circles"
+msgstr "Cercuri Google"
+
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
+#: src/contacts-esd-setup.vala:167
+msgid "Google"
+msgstr "Google"
+
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "Nu s-a putut face fotografia."
+
+#: src/contacts-esd-setup.vala:164
+msgid "Local Contact"
+msgstr "Contact local"
-#: ../src/contacts-contact.vala:618
+#: src/contacts-im-service.vala:32
msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
-#: ../src/contacts-contact.vala:619
+#: src/contacts-im-service.vala:33
+msgid "Facebook"
+msgstr "Facebook"
+
+#: src/contacts-im-service.vala:34
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../src/contacts-contact.vala:620
+#: src/contacts-im-service.vala:35
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: src/contacts-im-service.vala:36
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../src/contacts-contact.vala:621
+#: src/contacts-im-service.vala:37
msgid "ICQ"
msgstr "ICQ"
-#: ../src/contacts-contact.vala:622
+#: src/contacts-im-service.vala:38
msgid "IRC"
msgstr "IRC"
-#: ../src/contacts-contact.vala:623
+#: src/contacts-im-service.vala:39
msgid "Jabber"
msgstr "Jabber"
-#: ../src/contacts-contact.vala:624
+#: src/contacts-im-service.vala:40
+msgid "Livejournal"
+msgstr "Livejournal"
+
+#: src/contacts-im-service.vala:41
msgid "Local network"
msgstr "Rețea locală"
-#: ../src/contacts-contact.vala:625
+#: src/contacts-im-service.vala:42
msgid "Windows Live Messenger"
msgstr "Windows Live Messenger"
-#: ../src/contacts-contact.vala:626
+#: src/contacts-im-service.vala:43
msgid "MySpace"
msgstr "MySpace"
-#: ../src/contacts-contact.vala:627
+#: src/contacts-im-service.vala:44
msgid "MXit"
msgstr "MXit"
-#: ../src/contacts-contact.vala:628
+#: src/contacts-im-service.vala:45
msgid "Napster"
msgstr "Napster"
-#: ../src/contacts-contact.vala:629
+#: src/contacts-im-service.vala:46
+msgid "Ovi Chat"
+msgstr "Ovi Chat"
+
+#: src/contacts-im-service.vala:47
msgid "Tencent QQ"
msgstr "Tencent QQ"
-#: ../src/contacts-contact.vala:630
+#: src/contacts-im-service.vala:48
msgid "IBM Lotus Sametime"
msgstr "IBM Lotus Sametime"
-#: ../src/contacts-contact.vala:631
+#: src/contacts-im-service.vala:49
msgid "SILC"
msgstr "SILC"
-#: ../src/contacts-contact.vala:632
+#: src/contacts-im-service.vala:50
msgid "sip"
msgstr "sip"
-#: ../src/contacts-contact.vala:633
+#: src/contacts-im-service.vala:51
msgid "Skype"
msgstr "Skype"
-#: ../src/contacts-contact.vala:634
+#: src/contacts-im-service.vala:52
msgid "Telephony"
msgstr "Telefonie"
-#: ../src/contacts-contact.vala:635
+#: src/contacts-im-service.vala:53
msgid "Trepia"
msgstr "Trepia"
-#: ../src/contacts-contact.vala:636 ../src/contacts-contact.vala:637
+#: src/contacts-im-service.vala:54 src/contacts-im-service.vala:55
msgid "Yahoo! Messenger"
-msgstr "Mesager Yahoo!"
+msgstr "Yahoo! Messenger"
-#: ../src/contacts-contact.vala:638
+#: src/contacts-im-service.vala:56
msgid "Zephyr"
msgstr "Zephyr"
-#: ../src/contacts-contact.vala:891
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../src/contacts-contact.vala:917
-msgid "Unexpected internal error: created contact was not found"
-msgstr "Eroare internă neașteptată: contactul creat nu a fost găsit"
+#: src/contacts-linked-personas-dialog.vala:74
+msgid "Unlink"
+msgstr "Deconectează"
-#: ../src/contacts-esd-setup.c:579
-msgid "Local Contact"
-msgstr "Contact local"
-
-#: ../src/contacts-esd-setup.c:586
-msgid "Google"
-msgstr "Google"
-
-#: ../src/contacts-link-dialog.vala:88
-#| msgid "Contacts"
-msgid "Link Contact"
-msgstr "Îmbină contactul"
-
-#: ../src/contacts-link-dialog.vala:113
+#: src/contacts-link-suggestion-grid.vala:54
#, c-format
-msgid "Select contacts to link to %s"
-msgstr "Selectați contactele de îmbinat cu %s"
-
-#: ../src/contacts-link-dialog.vala:162
-#| msgid "Link"
-msgctxt "link-contacts-button"
-msgid "Link"
-msgstr "Îmbină"
-
-#: ../src/contacts-link-dialog.vala:181
-msgid "Currently linked:"
-msgstr "Îmbinate acum:"
-
-#: ../src/contacts-list-pane.vala:148
-msgid ""
-"Connect to an account,\n"
-"import or add contacts"
-msgstr ""
-"Conectează la un cont, \n"
-"importă sau să adaugă contacte"
+msgid "Is this the same person as %s from %s?"
+msgstr "Este aceasta aceeași persoană ca %s de la %s?"
-#: ../src/contacts-list-pane.vala:154
-msgid "Online Accounts"
-msgstr "Conturi online"
+#: src/contacts-link-suggestion-grid.vala:55
+#, c-format
+msgid "Is this the same person as %s?"
+msgstr "Este aceasta aceeași persoană ca %s?"
-#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:133
-#: ../src/contacts-types.vala:211 ../src/contacts-types.vala:301
+#. 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:114 src/contacts-types.vala:126
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Altul"
-#: ../src/contacts-types.vala:121
-msgid "Custom..."
-msgstr "Personalizat..."
-
#. List most specific first, always in upper case
-#: ../src/contacts-types.vala:266 ../src/contacts-types.vala:297
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
-msgstr "Acasă"
+msgstr "Personal"
-#: ../src/contacts-types.vala:267 ../src/contacts-types.vala:292
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
-msgstr "Servici"
+msgstr "Serviciu"
+
+#. List most specific first, always in upper case
+#: src/contacts-types.vala:300
+msgid "Personal"
+msgstr "Personal"
-#: ../src/contacts-types.vala:293
+#. List most specific first, always in upper case
+#: src/contacts-types.vala:326
+msgid "Assistant"
+msgstr "Asistent"
+
+#: src/contacts-types.vala:328
msgid "Work Fax"
-msgstr "Fax de servici"
+msgstr "Fax de serviciu"
-#: ../src/contacts-types.vala:294
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Apelare inversă"
-#: ../src/contacts-types.vala:295
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Mașină"
-#: ../src/contacts-types.vala:298
+#: src/contacts-types.vala:331
+msgid "Company"
+msgstr "Companie"
+
+#: src/contacts-types.vala:333
msgid "Home Fax"
-msgstr "Fax de acasă"
+msgstr "Fax personal"
-#: ../src/contacts-types.vala:299
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "ISDN"
-#: ../src/contacts-types.vala:300
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "Mobil"
-#: ../src/contacts-types.vala:302
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Fax"
-#: ../src/contacts-types.vala:303
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Pager"
-#: ../src/contacts-types.vala:304
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Radio"
-#: ../src/contacts-types.vala:305
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: ../src/contacts-types.vala:307
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "TTY"
-#. Translators: This is the header for the list of suggested contacts to
-#. link to the current contact
-#: ../src/contacts-view.vala:89
-msgid "Suggestion"
-msgid_plural "Suggestions"
-msgstr[0] "Sugestie"
-msgstr[1] "Sugestii"
-msgstr[2] "Sugestii"
-
-#: ../src/contacts-view.vala:413
-msgid "New contact"
+#: src/contacts-window.vala:174
+#, c-format
+msgid "%d Selected"
+msgid_plural "%d Selected"
+msgstr[0] "%d selectat"
+msgstr[1] "%d selectate"
+msgstr[2] "%d selectate"
+
+#: src/contacts-window.vala:213
+msgid "Add"
+msgstr "Adaugă"
+
+#: src/contacts-window.vala:233
+#, c-format
+msgid "Editing %s"
+msgstr "Se editează %s"
+
+#: src/contacts-window.vala:287
+msgid "Unmark as favorite"
+msgstr "Demarchează ca preferat"
+
+#: src/contacts-window.vala:288
+msgid "Mark as favorite"
+msgstr "Marchează ca preferat"
+
+#: src/contacts-window.vala:300
+msgid "New Contact"
msgstr "Contact nou"
+#: src/contacts-window.vala:373
+#, c-format
+msgid "%d contacts linked"
+msgid_plural "%d contacts linked"
+msgstr[0] "%d contact conectat"
+msgstr[1] "%d contacte conectate"
+msgstr[2] "%d de contacte conectate"
+
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
+msgid "_Undo"
+msgstr "An_ulează"
+
+#: src/contacts-window.vala:396
+#, c-format
+msgid "Deleted contact %s"
+msgstr "S-a șters contactul %s"
+
+#: src/contacts-window.vala:398
+#, c-format
+msgid "%d contact deleted"
+msgid_plural "%d contacts deleted"
+msgstr[0] "%d contact șters"
+msgstr[1] "%d contacte șterse"
+msgstr[2] "%d de contacte șterse"
+
+#: src/contacts-window.vala:434
+#, c-format
+msgid "%s linked to %s"
+msgstr "%s conectat la %s"
+
+#: src/contacts-window.vala:436
+#, c-format
+msgid "%s linked to the contact"
+msgstr "%s conectat la contact"
+
+#: src/org.gnome.Contacts.gschema.xml:6
+msgid "First-time setup done."
+msgstr "Configurarea pentru prima dată este terminată."
+
+#: src/org.gnome.Contacts.gschema.xml:7
+msgid "Set to true after the user has run the first-time setup wizard."
+msgstr ""
+"Stabilit la adevărat după ce utilizatorul a rulat asistentul de configurare "
+"pentru prima dată."
+
+#: src/org.gnome.Contacts.gschema.xml:11
+msgid "Sort contacts on surname."
+msgstr "Sortează contactele după nume."
+
+#: src/org.gnome.Contacts.gschema.xml:12
+msgid ""
+"If this is set to true, the list of contacts will be sorted on their "
+"surnames. Otherwise, it will be sorted on the first names of the contacts."
+msgstr ""
+"Dacă este stabilit la adevărat, lista de contacte va fi sortată după numele "
+"acestora. În caz contrar, va fi sortată după prenumele contactelor."
+
+#: src/org.gnome.Contacts.gschema.xml:19
+msgid "The default height of the contacts window."
+msgstr "Înălțimea implicită a ferestrei contactelor."
+
+#: src/org.gnome.Contacts.gschema.xml:20
+msgid ""
+"If the window size has not been changed by the user yet this will be used as "
+"the initial value for the height of the window."
+msgstr ""
+"Dacă dimensiunea ferestrei încă nu a fost modificată de către utilizator "
+"aceasta va fi utilizată ca valoare inițială pentru înălțimea ferestrei."
+
+#: src/org.gnome.Contacts.gschema.xml:26
+msgid "The default width of the contacts window."
+msgstr "Lățimea implicită a ferestrei contactelor."
+
+#: src/org.gnome.Contacts.gschema.xml:27
+msgid ""
+"If the window size has not been changed by the user yet this will be used as "
+"the initial value for the width of the window."
+msgstr ""
+"Dacă dimensiunea ferestrei încă nu a fost modificată de către utilizator "
+"aceasta va fi utilizată ca valoare inițială pentru lățimea ferestrei."
+
+#: src/org.gnome.Contacts.gschema.xml:32
+msgid "Is the window maximized?"
+msgstr "Este fereastra maximizată?"
+
+#: src/org.gnome.Contacts.gschema.xml:33
+msgid "Stores if the window is currently maximized."
+msgstr "Stochează dacă fereastra este maximizată în prezent."
+
+#~ msgid "Select"
+#~ msgstr "Selectați"
+
+#~ msgid "Enter nickname"
+#~ msgstr "Introduceți pseudonimul"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Enter alias"
+#~ msgstr "Introduceți aliasul"
+
+#~ msgid "Enter email address"
+#~ msgstr "Introduceți adresa de email"
+
+#~ msgid "Enter phone number"
+#~ msgstr "Introduceți numărul de telefon"
+
+#~ msgid "Chat"
+#~ msgstr "Discută"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "Răsfoiește pentru mai multe poze..."
+
+#~ msgid "Contact Name"
+#~ msgstr "Nume contact"
+
+#~ msgid "Address copied to clipboard"
+#~ msgstr "Adresa a fost copiată în clipboard"
+
+#~ msgid "Department"
+#~ msgstr "Departament"
+
+#~ msgid "Profession"
+#~ msgstr "Profesie"
+
+#~ msgid "Title"
+#~ msgstr "Titlu"
+
+#~ msgid "Manager"
+#~ msgstr "Manager"
+
+#~ msgid "Links"
+#~ msgstr "Linkuri"
+
+#~ msgid "Edit"
+#~ msgstr "Editare"
+
+#~ msgid "More"
+#~ msgstr "Mai mult"
+
+#~ msgid "Back to Contact"
+#~ msgstr "Înapoi la Contact"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "Adaugă/Elimină contactele îmbinate..."
+
+#~ msgid "Unknown status"
+#~ msgstr "Stare necunoscută"
+
+#~ msgid "Offline"
+#~ msgstr "Deconectat"
+
+#~ msgid "Error"
+#~ msgstr "Eroare"
+
+#~ msgid "Available"
+#~ msgstr "Disponibil"
+
+#~ msgid "Away"
+#~ msgstr "Plecat"
+
+#~ msgid "Extended away"
+#~ msgstr "Plecat pentru mai mult timp"
+
+#~ msgid "Busy"
+#~ msgstr "Ocupat"
+
+#~ msgid "Hidden"
+#~ msgstr "Ascuns"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~| msgid "Link"
+#~ msgctxt "link-contacts-button"
+#~ msgid "Link"
+#~ msgstr "Îmbină"
+
+#~ msgid "Currently linked:"
+#~ msgstr "Îmbinate acum:"
+
+#~ msgid ""
+#~ "Connect to an account,\n"
+#~ "import or add contacts"
+#~ msgstr ""
+#~ "Conectează la un cont, \n"
+#~ "importă sau să adaugă contacte"
+
+#~ msgid "Custom..."
+#~ msgstr "Personalizat..."
+
+#~ msgid "Suggestion"
+#~ msgid_plural "Suggestions"
+#~ msgstr[0] "Sugestie"
+#~ msgstr[1] "Sugestii"
+#~ msgstr[2] "Sugestii"
+
#~ msgid "Send..."
#~ msgstr "Trimite..."
diff --git a/po/tr.po b/po/tr.po
index 70a08c6..3d92648 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,13 +9,14 @@
# Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2014, 2015, 2016, 2017.
# Doğa Deniz Arıcı <bluegreenbrain@gmail.com>, 2018.
# Emin Tufan Çetin <etcetin@gmail.com>, 2017, 2018.
+# Çağatay Yiğit Şahin <cyigitsahin@outlook.com>, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-contacts master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-contacts/issues\n"
-"POT-Creation-Date: 2018-02-24 16:22+0000\n"
-"PO-Revision-Date: 2018-03-10 12:18+0300\n"
+"POT-Creation-Date: 2018-04-30 09:14+0000\n"
+"PO-Revision-Date: 2018-05-06 14:47+0300\n"
"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
"Language: tr\n"
@@ -23,14 +24,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.7\n"
"X-POOTLE-MTIME: 1433229058.000000\n"
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:79
#: data/ui/contacts-window.ui:90 src/contacts-window.vala:206
msgid "Contacts"
-msgstr "Kişiler "
+msgstr "Kişiler"
#: data/org.gnome.Contacts.appdata.xml.in:7
#: data/org.gnome.Contacts.desktop.in:4
@@ -64,8 +65,8 @@ msgstr "arkadaşlar;adres defteri;"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Contacts.desktop.in:8
-msgid "gnome-contacts"
-msgstr "gnome-contacts"
+msgid "org.gnome.Contacts"
+msgstr "org.gnome.Contacts"
#: data/gtk/help-overlay.ui:9
msgctxt "shortcut window"
@@ -121,22 +122,13 @@ msgstr "_Çık"
msgid "Online Accounts Settings"
msgstr "Çevrim İçi Hesaplar Ayarları"
-#: data/ui/contacts-avatar-selector.ui:6
-msgid "Select Picture"
-msgstr "Resim Seç"
+#: data/ui/contacts-avatar-selector.ui:54
+msgid "Take a Picture…"
+msgstr "Fotoğraf Çek…"
-#: data/ui/contacts-avatar-selector.ui:33 src/contacts-window.vala:298
-msgid "New Contact"
-msgstr "Yeni Kişi"
-
-#: data/ui/contacts-avatar-selector.ui:279
-msgid "Select"
-msgstr "Seç"
-
-#: data/ui/contacts-avatar-selector.ui:285 data/ui/contacts-window.ui:175
-#: src/contacts-app.vala:117
-msgid "Cancel"
-msgstr "Vazgeç"
+#: data/ui/contacts-avatar-selector.ui:68
+msgid "Select a File…"
+msgstr "Dosya Seç…"
#: data/ui/contacts-contact-editor.ui:8
msgid "Home email"
@@ -158,18 +150,18 @@ msgstr "Ev telefonu"
msgid "Work phone"
msgstr "İş telefonu"
-#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:572
-#: src/contacts-contact-editor.vala:579 src/contacts-contact-sheet.vala:194
+#: data/ui/contacts-contact-editor.ui:28 src/contacts-contact-editor.vala:573
+#: src/contacts-contact-editor.vala:580 src/contacts-contact-sheet.vala:253
msgid "Website"
msgstr "Web Sitesi"
-#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:598
-#: src/contacts-contact-editor.vala:605 src/contacts-contact-sheet.vala:200
+#: data/ui/contacts-contact-editor.ui:32 src/contacts-contact-editor.vala:599
+#: src/contacts-contact-editor.vala:606 src/contacts-contact-sheet.vala:260
msgid "Nickname"
msgstr "Takma ad"
-#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:631
-#: src/contacts-contact-editor.vala:638 src/contacts-contact-sheet.vala:207
+#: data/ui/contacts-contact-editor.ui:36 src/contacts-contact-editor.vala:632
+#: src/contacts-contact-editor.vala:639 src/contacts-contact-sheet.vala:266
msgid "Birthday"
msgstr "Doğum Günü"
@@ -202,6 +194,21 @@ msgstr "Kişiyi Sil"
msgid "Select a contact"
msgstr "Bir kişi seçin"
+#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:175
+#: src/contacts-app.vala:117
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:49
+msgid "Take Another…"
+msgstr "Başka Bir Tane Çek…"
+
+#: data/ui/contacts-crop-cheese-dialog.ui:64
+#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
+#: src/contacts-window.vala:213
+msgid "Done"
+msgstr "Tamam"
+
#: data/ui/contacts-link-suggestion-grid.ui:56
msgid "Link Contacts"
msgstr "Kişileri Bağla"
@@ -235,11 +242,6 @@ msgstr "Çık"
msgid "Cancel setup and quit"
msgstr "Kurulumu iptal et ve çık"
-#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:232
-#: src/contacts-window.vala:213
-msgid "Done"
-msgstr "Tamam"
-
#: data/ui/contacts-setup-window.ui:43
msgid "Setup complete"
msgstr "Kurulum tamamlandı"
@@ -271,8 +273,6 @@ msgid "Surname"
msgstr "Soyad"
#: data/ui/contacts-window.ui:102
-#| msgctxt "shortcut window"
-#| msgid "Create a new contact"
msgid "Create new contact"
msgstr "Yeni kişi oluştur"
@@ -292,7 +292,7 @@ msgstr "Detayları ayarla"
msgid "Loading"
msgstr "Yükleniyor"
-#: src/contacts-accounts-list.vala:144 src/contacts-esd-setup.vala:149
+#: src/contacts-accounts-list.vala:142 src/contacts-esd-setup.vala:149
msgid "Local Address Book"
msgstr "Yerel Adres Defteri"
@@ -351,20 +351,32 @@ msgstr "GNOME Kişiler Hakkında"
msgid "Contact Management Application"
msgstr "Kişi Yönetimi Uygulaması"
+#: src/contacts-app.vala:186
+msgid ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 The Contacts Developers"
+msgstr ""
+"© 2011 Red Hat, Inc.\n"
+"© 2011-2018 Kişiler Geliştiricileri"
+
#: src/contacts-app.vala:202
#, c-format
msgid "No contact with email address %s found"
msgstr "E-posta adresi %s olan kişi bulunamadı"
-#: src/contacts-avatar-selector.vala:297
+#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:231
+msgid "Failed to set avatar."
+msgstr "Avatar ayarlanamadı."
+
+#: src/contacts-avatar-selector.vala:190
msgid "Browse for more pictures"
msgstr "Daha çok resim için göz at"
-#: src/contacts-avatar-selector.vala:300
+#: src/contacts-avatar-selector.vala:193
msgid "_Cancel"
msgstr "_İptal"
-#: src/contacts-avatar-selector.vala:301
+#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "_Aç"
@@ -396,71 +408,75 @@ msgstr "Posta kutusu"
msgid "Country"
msgstr "Ülke"
-#: src/contacts-contact-editor.vala:313
+#: src/contacts-contact-editor.vala:314
msgid "Add email"
msgstr "E-posta ekle"
-#: src/contacts-contact-editor.vala:315
+#: src/contacts-contact-editor.vala:316
msgid "Add number"
msgstr "Numara ekle"
-#: src/contacts-contact-editor.vala:319 src/contacts-contact-editor.vala:350
-#: src/contacts-contact-editor.vala:384 src/contacts-contact-editor.vala:439
-#: src/contacts-contact-editor.vala:489
+#: src/contacts-contact-editor.vala:320 src/contacts-contact-editor.vala:351
+#: src/contacts-contact-editor.vala:385 src/contacts-contact-editor.vala:440
+#: src/contacts-contact-editor.vala:490
msgid "Delete field"
msgstr "Alanı sil"
-#: src/contacts-contact-editor.vala:653 src/contacts-contact-editor.vala:660
-#: src/contacts-contact-sheet.vala:214
+#: src/contacts-contact-editor.vala:654 src/contacts-contact-editor.vala:661
+#: src/contacts-contact-sheet.vala:273
msgid "Note"
msgstr "Not"
-#: src/contacts-contact-editor.vala:948
+#: src/contacts-contact-editor.vala:950
msgid "Change avatar"
msgstr "Avatar değiştir"
-#: src/contacts-contact-editor.vala:990
+#: src/contacts-contact-editor.vala:992
msgid "Add name"
msgstr "Ad ekle"
-#: src/contacts-contact-list.vala:174
+#: src/contacts-contact-list.vala:178
msgid "Favorites"
msgstr "Gözdeler"
-#: src/contacts-contact-list.vala:176 src/contacts-contact-list.vala:182
+#: src/contacts-contact-list.vala:180 src/contacts-contact-list.vala:186
msgid "All Contacts"
msgstr "Tüm Kişiler"
-#: src/contacts-contact-pane.vala:353
+#: src/contacts-contact-pane.vala:287
msgid "You need to enter some data"
msgstr "Birkaç veri girmeniz gerekir"
-#: src/contacts-contact-pane.vala:358
+#: src/contacts-contact-pane.vala:292
msgid "No primary addressbook configured"
msgstr "Yapılandırılmış birincil adres defteri yok"
-#: src/contacts-contact-pane.vala:368
+#: src/contacts-contact-pane.vala:302
#, c-format
msgid "Unable to create new contacts: %s"
msgstr "Yeni kişiler oluşturulamadı: %s"
-#: src/contacts-contact-pane.vala:377
+#: src/contacts-contact-pane.vala:311
msgid "Unable to find newly created contact"
msgstr "Yeni oluşturulan kişi bulunamadı"
-#: src/contacts-contact.vala:353
+#: src/contacts-contact.vala:301
msgid "Unexpected internal error: created contact was not found"
msgstr "Beklenmeyen iç hata: oluşturulan kişi bulunamadı"
-#: src/contacts-contact.vala:516
+#: src/contacts-contact.vala:460
msgid "Google Circles"
msgstr "Google Çevreler"
-#: src/contacts-contact.vala:518 src/contacts-esd-setup.vala:152
+#: src/contacts-contact.vala:462 src/contacts-esd-setup.vala:152
#: src/contacts-esd-setup.vala:167
msgid "Google"
msgstr "Google"
+#: src/contacts-crop-cheese-dialog.vala:91
+msgid "Unable to take photo."
+msgstr "Fotoğraf çekilemedi."
+
#: src/contacts-esd-setup.vala:164
msgid "Local Contact"
msgstr "Yerel Kişi"
@@ -578,77 +594,77 @@ msgstr "%s ile bu aynı kişi mi?"
#. 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:114 src/contacts-types.vala:126
-#: src/contacts-types.vala:227 src/contacts-types.vala:341
+#: src/contacts-types.vala:222 src/contacts-types.vala:336
msgid "Other"
msgstr "Diğer"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:282 src/contacts-types.vala:306
-#: src/contacts-types.vala:337
+#: src/contacts-types.vala:277 src/contacts-types.vala:301
+#: src/contacts-types.vala:332
msgid "Home"
msgstr "Ev"
-#: src/contacts-types.vala:283 src/contacts-types.vala:307
-#: src/contacts-types.vala:332
+#: src/contacts-types.vala:278 src/contacts-types.vala:302
+#: src/contacts-types.vala:327
msgid "Work"
msgstr "İş"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:305
+#: src/contacts-types.vala:300
msgid "Personal"
msgstr "Kişisel"
#. List most specific first, always in upper case
-#: src/contacts-types.vala:331
+#: src/contacts-types.vala:326
msgid "Assistant"
msgstr "Asistan"
-#: src/contacts-types.vala:333
+#: src/contacts-types.vala:328
msgid "Work Fax"
msgstr "İş Belgegeçeri"
-#: src/contacts-types.vala:334
+#: src/contacts-types.vala:329
msgid "Callback"
msgstr "Geriçağrı"
-#: src/contacts-types.vala:335
+#: src/contacts-types.vala:330
msgid "Car"
msgstr "Araç"
-#: src/contacts-types.vala:336
+#: src/contacts-types.vala:331
msgid "Company"
msgstr "Şirket"
-#: src/contacts-types.vala:338
+#: src/contacts-types.vala:333
msgid "Home Fax"
msgstr "Ev Belgegeçeri"
-#: src/contacts-types.vala:339
+#: src/contacts-types.vala:334
msgid "ISDN"
msgstr "ISDN"
-#: src/contacts-types.vala:340
+#: src/contacts-types.vala:335
msgid "Mobile"
msgstr "Cep Telefonu"
-#: src/contacts-types.vala:342
+#: src/contacts-types.vala:337
msgid "Fax"
msgstr "Belgegeçer"
-#: src/contacts-types.vala:343
+#: src/contacts-types.vala:338
msgid "Pager"
msgstr "Çağrı Aygıtı"
-#: src/contacts-types.vala:344
+#: src/contacts-types.vala:339
msgid "Radio"
msgstr "Telsiz"
-#: src/contacts-types.vala:345
+#: src/contacts-types.vala:340
msgid "Telex"
msgstr "Teleks"
#. To translators: TTY is Teletypewriter
-#: src/contacts-types.vala:347
+#: src/contacts-types.vala:342
msgid "TTY"
msgstr "TTY"
@@ -667,42 +683,46 @@ msgstr "Ekle"
msgid "Editing %s"
msgstr "%s Düzenleniyor"
-#: src/contacts-window.vala:288
+#: src/contacts-window.vala:287
msgid "Unmark as favorite"
msgstr "Gözdelerden çıkar"
-#: src/contacts-window.vala:289
+#: src/contacts-window.vala:288
msgid "Mark as favorite"
msgstr "Gözdelere ekle"
-#: src/contacts-window.vala:371
+#: src/contacts-window.vala:300
+msgid "New Contact"
+msgstr "Yeni Kişi"
+
+#: src/contacts-window.vala:373
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
msgstr[0] "%d kişi birbiriyle bağlantılandırıldı"
-#: src/contacts-window.vala:375 src/contacts-window.vala:399
-#: src/contacts-window.vala:436
+#: src/contacts-window.vala:377 src/contacts-window.vala:401
+#: src/contacts-window.vala:438
msgid "_Undo"
msgstr "_Geri Al"
-#: src/contacts-window.vala:394
+#: src/contacts-window.vala:396
#, c-format
msgid "Deleted contact %s"
msgstr "%s kişisi silindi"
-#: src/contacts-window.vala:396
+#: src/contacts-window.vala:398
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
msgstr[0] "%d kişi silindi"
-#: src/contacts-window.vala:432
+#: src/contacts-window.vala:434
#, c-format
msgid "%s linked to %s"
msgstr "%s ile %s bağlandı"
-#: src/contacts-window.vala:434
+#: src/contacts-window.vala:436
#, c-format
msgid "%s linked to the contact"
msgstr "%s kişi ile bağlandı"
@@ -761,6 +781,9 @@ msgstr "Pencere büyütülmüş mü?"
msgid "Stores if the window is currently maximized."
msgstr "Eğer pencere büyütülmüşse saklar."
+#~ msgid "Select"
+#~ msgstr "Seç"
+
#~ msgid "Selection mode"
#~ msgstr "Seçim kipi"
diff --git a/src/contacts-accounts-list.vala b/src/contacts-accounts-list.vala
index 0682a86..8ce7e4d 100644
--- a/src/contacts-accounts-list.vala
+++ b/src/contacts-accounts-list.vala
@@ -104,8 +104,7 @@ public class Contacts.AccountsList : Box {
var provider_image = Contacts.get_icon_for_goa_account (source_account_id);
row_data.attach (provider_image, 0, 0, 1, 2);
} else {
- var provider_image = new Image.from_icon_name ("gnome-contacts",
- IconSize.DIALOG);
+ var provider_image = new Image.from_icon_name (Config.APP_ID, IconSize.DIALOG);
row_data.attach (provider_image, 0, 0, 1, 2);
}
@@ -138,8 +137,7 @@ public class Contacts.AccountsList : Box {
local_data.margin_start = 5;
local_data.set_column_spacing (10);
local_data.set_data ("store", local_store);
- var provider_image = new Image.from_icon_name ("gnome-contacts",
- IconSize.DIALOG);
+ var provider_image = new Image.from_icon_name (Config.APP_ID, IconSize.DIALOG);
local_data.add (provider_image);
var local_label = new Label (_("Local Address Book"));
local_data.add (local_label);
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 3e3043f..079b144 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -46,7 +46,7 @@ public class Contacts.App : Gtk.Application {
public App () {
Object (
- application_id: "org.gnome.Contacts",
+ application_id: Config.APP_ID,
flags: ApplicationFlags.HANDLES_COMMAND_LINE
);
@@ -79,7 +79,7 @@ public class Contacts.App : Gtk.Application {
public override int handle_local_options (VariantDict options) {
if ("version" in options) {
- stdout.printf ("gnome-contacts %s\n", Config.PACKAGE_VERSION);
+ stdout.printf ("%s %s\n", Config.PACKAGE_NAME, Config.PACKAGE_VERSION);
return 0;
}
@@ -185,7 +185,7 @@ public class Contacts.App : Gtk.Application {
"comments", _("Contact Management Application"),
"copyright", _("© 2011 Red Hat, Inc.\n© 2011-2018 The Contacts Developers"),
"license-type", Gtk.License.GPL_2_0,
- "logo-icon-name", "gnome-contacts",
+ "logo-icon-name", Config.APP_ID,
"version", Config.PACKAGE_VERSION,
"website", "https://wiki.gnome.org/Apps/Contacts",
"wrap-license", true);
diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
index a311525..c641877 100644
--- a/src/contacts-contact-editor.vala
+++ b/src/contacts-contact-editor.vala
@@ -1,4 +1,3 @@
-/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */
/*
* Copyright (C) 2011 Alexander Larsson <alexl@redhat.com>
*
@@ -60,8 +59,11 @@ public class Contacts.AddressEditor : Box {
}
}
+/**
+ * A widget that allows the user to edit a given {@link Contact}.
+ */
[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-contact-editor.ui")]
-public class Contacts.ContactEditor : Grid {
+public class Contacts.ContactEditor : ContactForm {
private const string[] DEFAULT_PROPS_NEW_CONTACT = {
"email-addresses.personal",
@@ -69,11 +71,6 @@ public class Contacts.ContactEditor : Grid {
"postal-addresses.home"
};
- private Contact contact;
- private Store store;
-
- [GtkChild]
- private Grid container_grid;
private weak Widget focus_widget;
private Entry name_entry;
@@ -81,9 +78,6 @@ public class Contacts.ContactEditor : Grid {
private Avatar avatar;
[GtkChild]
- private ScrolledWindow main_sw;
-
- [GtkChild]
private MenuButton add_detail_button;
[GtkChild]
@@ -106,9 +100,8 @@ public class Contacts.ContactEditor : Grid {
HashMap<int, RowData?> rows;
}
- private int last_row;
/* the key of the hash_map is the uid of the persona */
- private HashMap<string, HashMap<string, Field?> > writable_personas;
+ private HashMap<string, HashMap<string, Field?>> writable_personas;
public bool has_birthday_row {
get; private set; default = false;
@@ -122,6 +115,80 @@ public class Contacts.ContactEditor : Grid {
get; private set; default = false;
}
+ construct {
+ this.writable_personas = new HashMap<string, HashMap<string, Field?>> ();
+ this.container_grid.size_allocate.connect(on_container_grid_size_allocate);
+ }
+
+ public ContactEditor (Contact? contact, Store store, GLib.ActionGroup editor_actions) {
+ this.store = store;
+ this.contact = contact;
+
+ this.add_detail_button.get_popover ().insert_action_group ("edit", editor_actions);
+
+ if (contact != null) {
+ this.remove_button.sensitive = contact.can_remove_personas ();
+ this.linked_button.sensitive = contact.individual.personas.size > 1;
+ } else {
+ this.remove_button.hide ();
+ this.linked_button.hide ();
+ }
+
+ create_avatar_button ();
+ create_name_entry ();
+
+ if (contact != null)
+ fill_in_contact ();
+ else
+ fill_in_empty ();
+
+ show_all ();
+ }
+
+ private void fill_in_contact () {
+ int i = 3;
+ int last_store_position = 0;
+ bool is_first_persona = true;
+
+ var personas = this.contact.get_personas_for_display ();
+ foreach (var p in personas) {
+ if (!is_first_persona) {
+ this.container_grid.attach (create_persona_store_label (p), 0, i, 2);
+ last_store_position = ++i;
+ }
+
+ var rw_props = sort_persona_properties (p.writeable_properties);
+ if (rw_props.length != 0) {
+ this.writable_personas[p.uid] = new HashMap<string, Field?> ();
+ foreach (var prop in rw_props)
+ add_edit_row (p, prop, ref i);
+ }
+
+ if (is_first_persona)
+ this.last_row = i - 1;
+
+ if (i != 3)
+ is_first_persona = false;
+
+ if (i == last_store_position) {
+ i--;
+ this.container_grid.get_child_at (0, i).destroy ();
+ }
+ }
+ }
+
+ private void fill_in_empty () {
+ this.last_row = 2;
+
+ this.writable_personas["null-persona.hack"] = new HashMap<string, Field?> ();
+ foreach (var prop in DEFAULT_PROPS_NEW_CONTACT) {
+ var tok = prop.split (".");
+ add_new_row_for_property (null, tok[0], tok[1].up ());
+ }
+
+ this.focus_widget = this.name_entry;
+ }
+
Value get_value_from_emails (HashMap<int, RowData?> rows) {
var new_details = new HashSet<EmailFieldDetails>();
@@ -754,121 +821,13 @@ public class Contacts.ContactEditor : Grid {
container_grid.insert_row (idx);
}
- [GtkCallback]
private void on_container_grid_size_allocate (Allocation alloc) {
- if (focus_widget != null &&
- focus_widget is Widget) {
- focus_widget.grab_focus ();
- focus_widget = null;
- }
- }
-
- public ContactEditor (Store store, SimpleActionGroup editor_actions) {
- this.store = store;
-
- this.container_grid.set_focus_vadjustment (this.main_sw.get_vadjustment ());
-
- this.main_sw.get_style_context ().add_class ("contacts-main-view");
- this.main_sw.get_style_context ().add_class ("view");
-
- this.add_detail_button.get_popover ().insert_action_group ("edit", editor_actions);
-
- this.writable_personas = new HashMap<string, HashMap<string, Field?>> ();
- }
-
- /**
- * Adjusts the ContactEditor to the given contact.
- * Use clear() to make sure nothing is lingering from the previous one.
- */
- public void edit (Contact c) {
- contact = c;
-
- remove_button.show ();
- remove_button.sensitive = contact.can_remove_personas ();
- linked_button.show ();
- linked_button.sensitive = contact.individual.personas.size > 1;
-
- create_avatar_button ();
- create_name_entry ();
-
- int i = 3;
- int last_store_position = 0;
- bool is_first_persona = true;
-
- var personas = c.get_personas_for_display ();
- foreach (var p in personas) {
- if (!is_first_persona) {
- var store_name = new Label("");
- store_name.set_markup (Markup.printf_escaped ("<span font='16px bold'>%s</span>",
- Contact.format_persona_store_name_for_contact (p)));
- store_name.set_halign (Align.START);
- store_name.xalign = 0.0f;
- store_name.margin_start = 6;
- container_grid.attach (store_name, 0, i, 2, 1);
- last_store_position = ++i;
- }
-
- var rw_props = Contact.sort_persona_properties (p.writeable_properties);
- if (rw_props.length != 0) {
- writable_personas.set (p.uid, new HashMap<string, Field?> ());
- foreach (var prop in rw_props) {
- add_edit_row (p, prop, ref i);
- }
- }
-
- if (is_first_persona) {
- last_row = i - 1;
- }
-
- if (i != 3) {
- is_first_persona = false;
- }
-
- if (i == last_store_position) {
- i--;
- container_grid.get_child_at (0, i).destroy ();
- }
+ if (this.focus_widget != null && this.focus_widget is Widget) {
+ this.focus_widget.grab_focus ();
+ this.focus_widget = null;
}
}
- /**
- * Adjusts the ContactEditor for a new contact.
- * Use clear() to make sure nothing is lingering from the previous one.
- */
- public void set_new_contact () {
- remove_button.hide ();
- linked_button.hide ();
-
- create_avatar_button ();
- create_name_entry ();
- this.last_row = 2;
-
- writable_personas["null-persona.hack"] = new HashMap<string, Field?> ();
- foreach (var prop in DEFAULT_PROPS_NEW_CONTACT) {
- var tok = prop.split (".");
- add_new_row_for_property (null, tok[0], tok[1].up ());
- }
-
- this.focus_widget = this.name_entry;
- }
-
- public void clear () {
- foreach (var w in container_grid.get_children ()) {
- w.destroy ();
- }
-
- remove_button.set_sensitive (false);
- linked_button.set_sensitive (false);
-
- /* clean metadata as well */
- has_birthday_row = false;
- has_nickname_row = false;
- has_notes_row = false;
-
- writable_personas.clear ();
- contact = null;
- }
-
public HashMap<string, PropertyData?> properties_changed () {
var props_set = new HashMap<string, PropertyData?> ();
diff --git a/src/contacts-contact-form.vala b/src/contacts-contact-form.vala
new file mode 100644
index 0000000..f44a2fb
--- /dev/null
+++ b/src/contacts-contact-form.vala
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2018 Niels De Graef <nielsdegraef@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using Folks;
+using Gee;
+using Gtk;
+
+/**
+ * A parent class for the {@link ContactEditor} and the {@link ContactSheet}.
+ *
+ * This exploits the common structure of both widgets: they both display a
+ * (possibly empty) contact, starting with a header and subsequently iterating
+ * over the several {@link Folks.Persona}s, displaying their properties.
+ */
+[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-contact-form.ui")]
+public abstract class Contacts.ContactForm : Grid {
+
+ protected const string[] SORTED_PROPERTIES = {
+ "email-addresses",
+ "phone-numbers",
+ "im-addresses",
+ "urls",
+ "nickname",
+ "birthday",
+ "postal-addresses",
+ "notes"
+ };
+
+ protected Contact? contact;
+
+ protected Store store;
+
+ [GtkChild]
+ private ScrolledWindow main_sw;
+
+ [GtkChild]
+ protected Grid container_grid;
+ protected int last_row = 0;
+
+ construct {
+ this.container_grid.set_focus_vadjustment (this.main_sw.get_vadjustment ());
+ this.main_sw.get_style_context ().add_class ("contacts-contact-form");
+ }
+
+ protected string[] sort_persona_properties (string[] props) {
+ CompareDataFunc<string> compare_properties = (a, b) => {
+ foreach (var prop in SORTED_PROPERTIES) {
+ if (a == prop)
+ return (b == prop)? 0 : -1;
+
+ if (b == prop)
+ return 1;
+ }
+
+ return 0;
+ };
+
+ var sorted_props = new ArrayList<string> ();
+ foreach (var s in props)
+ sorted_props.add (s);
+
+ sorted_props.sort ((owned) compare_properties);
+ return sorted_props.to_array ();
+ }
+
+ protected Label create_persona_store_label (Persona p) {
+ var store_name = new Label("");
+ store_name.set_markup (Markup.printf_escaped ("<span font='16px bold'>%s</span>",
+ Contact.format_persona_store_name_for_contact (p)));
+ store_name.set_halign (Align.START);
+ store_name.xalign = 0.0f;
+ store_name.margin_start = 6;
+
+ return store_name;
+ }
+}
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index e2ee36e..1fabeff 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -39,14 +39,12 @@ public class Contacts.ContactPane : Stack {
private Grid none_selected_page;
[GtkChild]
- private ScrolledWindow contact_sheet_page;
- [GtkChild]
- private Container contact_sheet_container;
+ private Container contact_sheet_page;
private ContactSheet? sheet = null;
[GtkChild]
private Box contact_editor_page;
- private ContactEditor editor;
+ private ContactEditor? editor = null;
private SimpleActionGroup edit_contact_actions = new SimpleActionGroup ();
private const GLib.ActionEntry[] action_entries = {
@@ -80,25 +78,6 @@ public class Contacts.ContactPane : Stack {
this.store = contacts_store;
this.edit_contact_actions.add_action_entries (action_entries, this);
-
- // Contact editor
- this.editor = new ContactEditor (this.store, this.edit_contact_actions);
- this.editor.linked_button.clicked.connect (linked_accounts);
- this.editor.remove_button.clicked.connect (delete_contact);
- this.contact_editor_page.add (this.editor);
-
- /* enable/disable actions*/
- var birthday_action = this.edit_contact_actions.lookup_action ("add.birthday") as SimpleAction;
- this.editor.bind_property ("has-birthday-row", birthday_action, "enabled",
- BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
-
- var nickname_action = this.edit_contact_actions.lookup_action ("add.nickname") as SimpleAction;
- this.editor.bind_property ("has-nickname-row", nickname_action, "enabled",
- BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
-
- var notes_action = this.edit_contact_actions.lookup_action ("add.notes") as SimpleAction;
- this.editor.bind_property ("has-notes-row", notes_action, "enabled",
- BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
}
public void add_suggestion (Contact c) {
@@ -143,8 +122,7 @@ public class Contacts.ContactPane : Stack {
remove_contact_sheet();
this.sheet = new ContactSheet (this.contact, this.store);
- this.contact_sheet_container.add (this.sheet);
- this.sheet.set_focus_vadjustment (this.contact_sheet_page.get_vadjustment ());
+ this.contact_sheet_page.add (this.sheet);
set_visible_child (this.contact_sheet_page);
var matches = this.store.aggregator.get_potential_matches (this.contact.individual, MatchResult.HIGH);
@@ -164,11 +142,43 @@ public class Contacts.ContactPane : Stack {
// Remove the suggestion grid that goes along with it.
remove_suggestion_grid ();
- this.contact_sheet_container.remove (this.sheet);
+ this.contact_sheet_page.remove (this.sheet);
this.sheet.destroy();
this.sheet = null;
}
+ private void create_contact_editor () {
+ if (this.editor != null)
+ remove_contact_editor ();
+
+ this.editor = new ContactEditor (this.contact, this.store, this.edit_contact_actions);
+ this.editor.linked_button.clicked.connect (linked_accounts);
+ this.editor.remove_button.clicked.connect (delete_contact);
+
+ /* enable/disable actions*/
+ var birthday_action = this.edit_contact_actions.lookup_action ("add.birthday") as SimpleAction;
+ this.editor.bind_property ("has-birthday-row", birthday_action, "enabled",
+ BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
+
+ var nickname_action = this.edit_contact_actions.lookup_action ("add.nickname") as SimpleAction;
+ this.editor.bind_property ("has-nickname-row", nickname_action, "enabled",
+ BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
+
+ var notes_action = this.edit_contact_actions.lookup_action ("add.notes") as SimpleAction;
+ this.editor.bind_property ("has-notes-row", notes_action, "enabled",
+ BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
+
+ this.contact_editor_page.add (this.editor);
+ }
+
+ private void remove_contact_editor () {
+ if (this.editor == null)
+ return;
+
+ this.contact_editor_page.remove (this.editor);
+ this.editor = null;
+ }
+
void on_add_detail (GLib.SimpleAction action, GLib.Variant? parameter) {
var tok = action.name.split (".");
@@ -203,10 +213,7 @@ public class Contacts.ContactPane : Stack {
this.on_edit_mode = true;
remove_contact_sheet ();
-
- this.editor.clear ();
- this.editor.edit (this.contact);
- this.editor.show_all ();
+ create_contact_editor ();
set_visible_child (this.contact_editor_page);
}
@@ -219,7 +226,7 @@ public class Contacts.ContactPane : Stack {
if (!drop_changes)
save_editor_changes.begin ();
- this.editor.clear ();
+ remove_contact_editor ();
if (this.contact != null)
show_contact_sheet ();
@@ -257,12 +264,10 @@ public class Contacts.ContactPane : Stack {
}
public void new_contact () {
- on_edit_mode = true;
-
+ this.on_edit_mode = true;
+ this.contact = null;
remove_contact_sheet ();
-
- editor.set_new_contact ();
-
+ create_contact_editor ();
set_visible_child (this.contact_editor_page);
}
diff --git a/src/contacts-contact-sheet.vala b/src/contacts-contact-sheet.vala
index 36bd4da..3a45840 100644
--- a/src/contacts-contact-sheet.vala
+++ b/src/contacts-contact-sheet.vala
@@ -24,17 +24,7 @@ using Gee;
*
* (Note: to edit a contact, use the {@link ContactEditor} instead.
*/
-[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-contact-sheet.ui")]
-public class Contacts.ContactSheet : Grid {
-
- private Contact? contact;
-
- private Store store;
-
- private int last_row = 0;
-
- [GtkChild]
- private Label name_label;
+public class Contacts.ContactSheet : ContactForm {
public ContactSheet (Contact contact, Store store) {
this.contact = contact;
@@ -52,14 +42,14 @@ public class Contacts.ContactSheet : Grid {
type_label.xalign = 1.0f;
type_label.set_halign (Align.END);
type_label.get_style_context ().add_class ("dim-label");
- attach (type_label, 0, this.last_row);
+ this.container_grid.attach (type_label, 0, this.last_row);
var value_button = new Button.with_label (value);
value_button.focus_on_click = false;
value_button.relief = ReliefStyle.NONE;
value_button.xalign = 0.0f;
value_button.set_hexpand (true);
- attach (value_button, 1, this.last_row);
+ this.container_grid.attach (value_button, 1, this.last_row);
this.last_row++;
(value_button.get_child () as Label).set_ellipsize (Pango.EllipsizeMode.END);
@@ -73,14 +63,14 @@ public class Contacts.ContactSheet : Grid {
type_label.xalign = 1.0f;
type_label.set_halign (Align.END);
type_label.get_style_context ().add_class ("dim-label");
- attach (type_label, 0, this.last_row);
+ this.container_grid.attach (type_label, 0, this.last_row);
var value_button = new LinkButton (value);
value_button.focus_on_click = false;
value_button.relief = ReliefStyle.NONE;
value_button.xalign = 0.0f;
value_button.set_hexpand (true);
- attach (value_button, 1, this.last_row);
+ this.container_grid.attach (value_button, 1, this.last_row);
this.last_row++;
(value_button.get_child () as Label).set_ellipsize (Pango.EllipsizeMode.END);
@@ -93,7 +83,7 @@ public class Contacts.ContactSheet : Grid {
type_label.set_halign (Align.END);
type_label.set_valign (Align.START);
type_label.get_style_context ().add_class ("dim-label");
- attach (type_label, 0, this.last_row, 1, 1);
+ this.container_grid.attach (type_label, 0, this.last_row, 1, 1);
var value_label = new Label (value);
value_label.set_line_wrap (true);
@@ -109,7 +99,7 @@ public class Contacts.ContactSheet : Grid {
value_label.margin_top = 3;
value_label.margin_bottom = 3;
- attach (value_label, 1, this.last_row, 1, 1);
+ this.container_grid.attach (value_label, 1, this.last_row, 1, 1);
this.last_row++;
}
@@ -117,44 +107,48 @@ public class Contacts.ContactSheet : Grid {
var image_frame = new Avatar (PROFILE_SIZE, this.contact);
image_frame.set_vexpand (false);
image_frame.set_valign (Align.START);
- attach (image_frame, 0, 0, 1, 3);
+ this.container_grid.attach (image_frame, 0, 0, 1, 3);
- this.contact.keep_widget_uptodate (this.name_label, (w) => {
- this.name_label.set_markup (Markup.printf_escaped ("<span font='16'>%s</span>",
- this.contact.individual.display_name));
- });
+ create_name_label ();
this.last_row += 3; // Name/Avatar takes up 3 rows
- bool is_first_persona = true;
var personas = this.contact.get_personas_for_display ();
/* Cause personas are sorted properly I can do this */
foreach (var p in personas) {
- int persona_store_pos = 0;
+ bool is_first_persona = (this.last_row == 3);
+ int persona_store_pos = this.last_row;
if (!is_first_persona) {
- persona_store_pos = this.last_row;
- var store_name = new Label("");
- store_name.set_markup (Markup.printf_escaped ("<span font='16px bold'>%s</span>",
- Contact.format_persona_store_name_for_contact (p)));
- store_name.set_halign (Align.START);
- store_name.xalign = 0.0f;
- store_name.margin_start = 6;
- attach (store_name, 0, this.last_row, 3, 1);
+ this.container_grid.attach (create_persona_store_label (p), 0, this.last_row, 3);
this.last_row++;
}
- is_first_persona = false;
- foreach (var prop in Contact.SORTED_PROPERTIES)
+ foreach (var prop in ContactForm.SORTED_PROPERTIES)
add_row_for_property (p, prop);
// Nothing to show in the persona: don't mention it
- if (this.last_row == persona_store_pos + 1)
- get_child_at (0, persona_store_pos).destroy ();
+ bool is_empty_persona = (this.last_row == persona_store_pos + 1);
+ if (!is_first_persona && is_empty_persona) {
+ this.container_grid.remove_row (persona_store_pos);
+ this.last_row--;
+ }
}
show_all ();
}
+ private void create_name_label () {
+ var name_label = new Label ("");
+ name_label.ellipsize = Pango.EllipsizeMode.END;
+ name_label.xalign = 0f;
+ name_label.selectable = true;
+ this.container_grid.attach (name_label, 1, 0, 1, 3);
+ this.contact.keep_widget_uptodate (name_label, (w) => {
+ name_label.set_markup (Markup.printf_escaped ("<span font='16'>%s</span>",
+ this.contact.individual.display_name));
+ });
+ }
+
private void add_row_for_property (Persona persona, string property) {
switch (property) {
case "email-addresses":
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 6bf98f4..b537e73 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -475,29 +475,6 @@ public class Contacts.Contact : GLib.Object {
return store.display_name;
}
- public const string[] SORTED_PROPERTIES = { "email-addresses" , "phone-numbers" , "im-addresses", "urls", "nickname", "birthday", "postal-addresses", "notes" };
-
- public static string[] sort_persona_properties (string[] props) {
- CompareDataFunc<string> compare_properties = (a, b) => {
- foreach (var prop in SORTED_PROPERTIES) {
- if (a == prop)
- return (b == prop)? 0 : -1;
-
- if (b == prop)
- return 1;
- }
-
- return 0;
- };
-
- var sorted_props = new ArrayList<string> ();
- foreach (var s in props)
- sorted_props.add (s);
-
- sorted_props.sort ((owned) compare_properties);
- return sorted_props.to_array ();
- }
-
/* Tries to set the property on all persons that have it writeable, and
* if none, creates a new persona and writes to it, returning the new
* persona.
diff --git a/src/contacts-shell-search-provider.vala b/src/contacts-shell-search-provider.vala
index 1b895a9..b0e86b4 100644
--- a/src/contacts-shell-search-provider.vala
+++ b/src/contacts-shell-search-provider.vala
@@ -42,15 +42,16 @@ public class Contacts.SearchProvider : Object {
this.app.quit ();
}
- public async string[] GetInitialResultSet (string[] terms) {
+ public async string[] GetInitialResultSet (string[] terms) throws Error {
return yield do_search (terms);
}
- public async string[] GetSubsearchResultSet (string[] previous_results, string[] new_terms) {
+ public async string[] GetSubsearchResultSet (string[] previous_results, string[] new_terms)
+ throws Error {
return yield do_search (new_terms);
}
- private async string[] do_search (string[] terms) {
+ private async string[] do_search (string[] terms) throws Error {
this.app.hold ();
// Make the query and search view
@@ -72,11 +73,11 @@ public class Contacts.SearchProvider : Object {
return results;
}
- public async HashTable<string, Variant>[] GetResultMetas (string[] ids) {
+ public async HashTable<string, Variant>[] GetResultMetas (string[] ids) throws Error {
return yield get_metas (ids);
}
- private async HashTable<string, Variant>[] get_metas (owned string[] ids) {
+ private async HashTable<string, Variant>[] get_metas (owned string[] ids) throws Error {
this.app.hold ();
var results = new ArrayList<HashTable> ();
@@ -117,7 +118,7 @@ public class Contacts.SearchProvider : Object {
return results.to_array ();
}
- public void ActivateResult (string id, string[] terms, uint32 timestamp) {
+ public void ActivateResult (string id, string[] terms, uint32 timestamp) throws Error {
this.app.hold ();
try {
@@ -128,7 +129,7 @@ public class Contacts.SearchProvider : Object {
this.app.release ();
}
- public void LaunchSearch (string[] terms, uint32 timestamp) {
+ public void LaunchSearch (string[] terms, uint32 timestamp) throws Error {
this.app.hold ();
debug ("LaunchSearch (%s)", string.joinv (", ", terms));
diff --git a/src/contacts-store.vala b/src/contacts-store.vala
index 5b7c715..3b75a88 100644
--- a/src/contacts-store.vala
+++ b/src/contacts-store.vala
@@ -176,20 +176,10 @@ public class Contacts.Store : GLib.Object {
var replaced_individuals = new HashMap<Individual?, Individual?> ();
var old_individuals = changes.get_keys();
- // At startup, a mass of contacts are added here: so, do this in a separate thread.
- var added_individuals = changes[null];
- if (!added_individuals.is_empty) {
- new Thread<void*> (null, () => {
- bulk_add (added_individuals);
- return null;
- });
- }
-
// Pick best replacements at joins
foreach (var old_individual in old_individuals) {
if (old_individual == null)
continue;
-
foreach (var new_individual in changes[old_individual]) {
if (new_individual == null)
continue;
@@ -212,6 +202,9 @@ public class Contacts.Store : GLib.Object {
// Removing an old individual.
var c = Contact.from_individual (old_individual);
remove (c);
+ } else if (new_individual != null) {
+ // Adding a new individual.
+ add (new Contact (this, new_individual));
}
}
@@ -238,9 +231,7 @@ public class Contacts.Store : GLib.Object {
if (i != main_individual) {
// Already replaced this old_individual, i.e. we're splitting
// old_individual. We just make this a new one.
- var new_contact = new Contact (this, i);
- this.contacts.add (new_contact);
- added (new_contact);
+ add (new Contact (this, i));
}
}
}
@@ -286,16 +277,9 @@ public class Contacts.Store : GLib.Object {
return contacts.read_only_view;
}
- private void bulk_add (Collection<Individual> indivs) {
- foreach (var individual in indivs) {
- var c = new Contact (this, individual);
- this.contacts.add (c);
- // Since we do this in a separate thread, use Idle.add.
- Idle.add (() => {
- added (c);
- return false;
- });
- }
+ private void add (Contact c) {
+ contacts.add (c);
+ added (c);
}
private void remove (Contact c) {
diff --git a/src/contacts-utils.vala b/src/contacts-utils.vala
index ad24d26..c1a9d74 100644
--- a/src/contacts-utils.vala
+++ b/src/contacts-utils.vala
@@ -36,7 +36,7 @@ namespace Contacts {
[DBus (name = "ActivateAction")]
public abstract void ActivateAction (string action,
Variant[] parameter,
- HashTable<string, Variant> data) throws IOError;
+ HashTable<string, Variant> data) throws Error;
}
public void activate_action (string app_id,
@@ -62,8 +62,8 @@ namespace Contacts {
new GLib.List<File>());
var data = new HashTable<string, Variant>(str_hash, str_equal);
data.insert ("desktop-startup-id", new Variant.string (startup_id));
- con.ActivateAction (action, param_array, data);
- } catch (IOError e) {
+ con.ActivateAction (action, param_array, data);
+ } catch (Error e) {
debug ("Failed to activate action" + action);
}
}
diff --git a/src/meson.build b/src/meson.build
index d05d1f5..5669450 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,6 +11,7 @@ contacts_vala_sources = files(
'contacts-avatar.vala',
'contacts-avatar-selector.vala',
'contacts-contact-editor.vala',
+ 'contacts-contact-form.vala',
'contacts-contact-list.vala',
'contacts-contact-pane.vala',
'contacts-contact-sheet.vala',
diff --git a/vapi/config.vapi b/vapi/config.vapi
index 1c1b43f..2459e3b 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -1,5 +1,7 @@
[CCode (lower_case_cprefix = "", cheader_filename = "config.h")]
namespace Config {
+public const string APP_ID;
+
/* Package information */
public const string PACKAGE_NAME;
public const string PACKAGE_STRING;