Skip to content

GitLab

Commit ede5f221 authored by Julian Sparber's avatar Julian Sparber
Browse files
Options

Merge branch 'librem5' into pureos/sloppy

parents 724e40b5 c0e95b80
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2907 additions and 2377 deletions
README.md
View file @ ede5f221
# GNOME Contacts
Contacts organizes your contacts information from all your online and offline
sources, providing a centralized place for managing your contacts.
[![Flatpak](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Flathub-badge-en.svg/240px-Flathub-badge-en.svg.png)](https://flathub.org/apps/details/org.gnome.Contacts)
## Building
You can build and install Contacts using [Meson](http://mesonbuild.com/):
```sh
meson build
ninja -C build
......@@ -11,16 +16,19 @@ ninja -C build install
```
## Contributing
The code and issue tracker of Contacts can be found at the
[gnome-contacts repository](https://gitlab.gnome.org/GNOME/gnome-contacts) on
GNOME's GitLab instance.
### Reporting issues
If you find a bug in Contacts, please [file an
issue](https://gitlab.gnome.org/GNOME/gnome-contacts/issues) with reproducible
steps and the version of Contacts you were using at that point.
### Developers
If you want to contribute functionality or bug fixes to Contacts, you should
fork the Contacts repository, commit your changes, and then [open a merge
request](https://gitlab.gnome.org/GNOME/gnome-contacts/merge_requests/new) (MR).
......@@ -28,6 +36,7 @@ If the MR fixes an existing issue, please refer to that issue in the
description of the commit.
### Translators
If GNOME Contacts is not translated in your language or you believe that the
current translation has errors, then you can join one of the various
translation teams in GNOME. Translators do not commit directly to Git, but are
......@@ -36,10 +45,11 @@ be found at GNOME's Wiki page on the translation
project](https://wiki.gnome.org/TranslationProject/JoiningTranslation).
## More information
Contacts has its own web page on https://wiki.gnome.org/Apps/Contacts.
To discuss issues with developers and other users, you can subscribe to the
[mailing list](https://mail.gnome.org/mailman/listinfo/gnome-contacts-list)
Contacts has its own web page on <https://wiki.gnome.org/Apps/Contacts>.
To discuss issues with developers and other users, you can post to the
[GNOME Discourse instance](https://discourse.gnome.org/tags/contacts)
or join [#contacts](irc://irc.gnome.org/contacts) on irc.gnome.org.
If you would like to get involved with GNOME projects, please also visit our
......
data/flatpak/org.gnome.Contacts.json
View file @ ede5f221
......@@ -100,6 +100,17 @@
}
]
},
{
"name": "intltool",
"cleanup": [ "*" ],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
"sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
}
]
},
{
"name": "evolution-data-server",
"cleanup": [
......@@ -169,9 +180,11 @@
},
{
"name": "cheese",
"buildsystem": "meson",
"config-opts": [
"--disable-man",
"--disable-lcov"
"-Dgtk_doc=false",
"-Dintrospection=true",
"-Dman=false"
],
"sources": [
{
......
data/org.gnome.Contacts.appdata.xml.in
View file @ ede5f221
......@@ -26,7 +26,66 @@
</screenshots>
<releases>
<release date="2019-07-22" version="3.33.4"/> <!-- TODO: describe this nonmaintainer release -->
<release date="2019-09-09" version="3.34">
<description>
<p>
Version 3.34 is a stable release, with the following major
improvements since 3.32:
</p>
<ul>
<li>Updated avatars which follow the GNOME avatar style</li>
<li>Better accessibility with mnemonics for the setup window</li>
<li>A new --search option for the command-line</li>
<li>Fixed issues when using the webcam to add an avatar</li>
<li>Fixed searching contacts in GNOME Shell returning no results</li>
</ul>
<p>This release also updates translations in several languages.</p>
</description>
</release>
<release date="2019-09-04" version="3.33.92">
<description>
<p>
This is the last unstable release in the 3.33 development series,
with the following improvements since 3.33.91:
</p>
<ul>
<li>Updated the man page</li>
</ul>
<p>This release also updates translations in several languages.</p>
</description>
</release>
<release date="2019-08-20" version="3.33.91">
<description>
<p>
This is the next unstable release in the 3.33 development series,
some would say a beta, with the following improvements:
</p>
<ul>
<li>
Make the avatars more in line with the other apps in the GNOME
ecoosystem. If possible, the initials will be used to make an
avatar if none is available.
</li>
<li>Fix searching contacts from GNOME Shell returning no results</li>
<li>Add a small description of the --search option</li>
</ul>
<p>This release also updates translations in several languages.</p>
</description>
</release>
<release date="2019-07-22" version="3.33.4">
<description>
<p>
This is the second unstable release in the 3.33 development series,
with the following improvements:
</p>
<ul>
<li>Flatpak: Allow webcam access (and other small fixes)</li>
<li>Even better integration with CI</li>
<li>Add mnemonics to the setup window</li>
</ul>
<p>This release also updates translations in several languages.</p>
</description>
</release>
<release date="2019-04-24" version="3.33.1">
<description>
<p>
......
data/ui/contacts-link-suggestion-grid.ui
View file @ ede5f221
......@@ -6,41 +6,36 @@
<property name="orientation">vertical</property>
<property name="valign">end</property>
<child>
<object class="GtkGrid" id="grid">
<property name="orientation">horizontal</property>
<object class="GtkBox" id="content_box">
<property name="visible">True</property>
<property name="column_spacing">6</property>
<property name="margin">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="description_label">
<object class="GtkBox">
<property name="visible">True</property>
<property name="valign">end</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="margin_top">12</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="extra_info_label">
<property name="visible">False</property>
<property name="valign">start</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="margin_bottom">12</property>
<style>
<class name="dim-label"/>
</style>
<property name="orientation">vertical</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="description_label">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
</object>
</child>
<child>
<object class="GtkLabel" id="extra_info_label">
<property name="visible">False</property>
<property name="halign">start</property>
<style>
<class name="dim-label"/>
</style>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="height">1</property>
<property name="expand">true</property>
<property name="pack_type">end</property>
</packing>
</child>
</object>
......@@ -52,40 +47,26 @@
<property name="halign">center</property>
<property name="orientation">horizontal</property>
<property name="spacing">6</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="margin">12</property>
<child>
<object class="GtkButton" id="accept_button">
<object class="GtkButton" id="reject_button">
<property name="visible">True</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Link Contacts</property>
<property name="margin_end">6</property>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="label" translatable="yes">Dismiss</property>
</object>
</child>
<child>
<object class="GtkButton" id="reject_button">
<object class="GtkButton" id="accept_button">
<property name="visible">True</property>
<property name="valign">center</property>
<style>
<class name="flat"/>
</style>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">window-close-symbolic</property>
</object>
</child>
<property name="label" translatable="yes">Link Contacts</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
</template>
</interface>
data/ui/contacts-window.ui
View file @ ede5f221
......@@ -69,10 +69,10 @@
</child>
<child>
<object class="GtkModelButton">
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">Keyboard Shortcuts</property>
<property name="action-name">win.show-help-overlay</property>
<property name="visible">True</property>
</object>
</child>
<child>
......
gnome-contacts.doap
View file @ ede5f221
......@@ -11,26 +11,12 @@
</description>
<homepage rdf:resource="https://wiki.gnome.org/Apps/Contacts" />
<mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-contacts-list" />
<mailing-list rdf:resource="https://discourse.gnome.org/tags/contacts" />
<download-page rdf:resource="http://download.gnome.org/sources/gnome-contacts/" />
<bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-contacts/issues" />
<category rdf:resource="http://api.gnome.org/doap-extensions#core" />
<programming-language>Vala</programming-language>
<maintainer>
<foaf:Person>
<foaf:name>Alexander Larsson</foaf:name>
<foaf:mbox rdf:resource="mailto:alexl@redhat.com" />
<gnome:userid>alexl</gnome:userid>
</foaf:Person>
</maintainer>
<maintainer>
<foaf:Person>
<foaf:name>Erick Pérez Castellanos</foaf:name>
<foaf:mbox rdf:resource="mailto:erick.red@gmail.com" />
<gnome:userid>erickpc</gnome:userid>
</foaf:Person>
</maintainer>
<maintainer>
<foaf:Person>
<foaf:name>Niels De Graef</foaf:name>
......
man/gnome-contacts.xml
View file @ ede5f221
......@@ -60,6 +60,26 @@
text and exits.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-e</option>, <option>--email</option></term>
<listitem><para>Show contact with this
email address.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-i</option>, <option>--individual</option></term>
<listitem><para>Show contact with this
individual id.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option>, <option>--version</option></term>
<listitem><para>Show the current version of
Contacts.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
......
meson.build
View file @ ede5f221
project('gnome-contacts', [ 'vala', 'c' ],
version: '3.33.4',
version: '3.34',
license: 'GPL2+',
meson_version: '>= 0.41',
)
......
po/ca.po
View file @ ede5f221
......@@ -10,7 +10,7 @@ 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: 2019-02-01 08:24+0000\n"
"POT-Creation-Date: 2019-08-19 23:31+0000\n"
"PO-Revision-Date: 2018-06-30 20:59+0200\n"
"Last-Translator: Gil Forcada Codinachs <gil.gnome@gmail.com>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
......@@ -23,7 +23,7 @@ msgstr ""
#: data/org.gnome.Contacts.appdata.xml.in:6
#: data/org.gnome.Contacts.desktop.in:3 data/ui/contacts-window.ui:102
#: data/ui/contacts-window.ui:122 src/contacts-window.vala:223
#: data/ui/contacts-window.ui:122 src/contacts-window.vala:220
msgid "Contacts"
msgstr "Contactes"
......@@ -52,7 +52,7 @@ msgstr ""
"El Contactes també s'integra amb llibretes d'adreces en línia i enllaçarà "
"automàticament els contactes des de diferents orígens en línia."
#: data/org.gnome.Contacts.appdata.xml.in:270
#: data/org.gnome.Contacts.appdata.xml.in:323
msgid "The GNOME Project"
msgstr "El projecte GNOME"
......@@ -61,11 +61,6 @@ msgstr "El projecte GNOME"
msgid "friends;address book;"
msgstr "amics;llibreta d'adreces;"
#. 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"
......@@ -169,7 +164,7 @@ msgid "Select a contact"
msgstr "Seleccioneu un contacte"
#: data/ui/contacts-crop-cheese-dialog.ui:27 data/ui/contacts-window.ui:241
#: src/contacts-app.vala:118
#: src/contacts-app.vala:119
msgid "Cancel"
msgstr "Cancel·la"
......@@ -177,9 +172,8 @@ msgstr "Cancel·la"
msgid "Take Another…"
msgstr "Fes una altra…"
#: data/ui/contacts-crop-cheese-dialog.ui:64
#: data/ui/contacts-setup-window.ui:40 data/ui/contacts-window.ui:299
#: src/contacts-window.vala:230
#: data/ui/contacts-crop-cheese-dialog.ui:64 data/ui/contacts-window.ui:299
#: src/contacts-window.vala:227
msgid "Done"
msgstr "Fet"
......@@ -209,22 +203,26 @@ msgid "Contacts Setup"
msgstr "Configuració del Contactes"
#: data/ui/contacts-setup-window.ui:22
msgid "Quit"
msgstr "Surt"
msgid "_Quit"
msgstr "_Surt"
#: data/ui/contacts-setup-window.ui:26
#: data/ui/contacts-setup-window.ui:27
msgid "Cancel setup and quit"
msgstr "Cancel·la la configuració i surt"
#: data/ui/contacts-setup-window.ui:43
#: data/ui/contacts-setup-window.ui:41
msgid "_Done"
msgstr "_Fet"
#: data/ui/contacts-setup-window.ui:45
msgid "Setup complete"
msgstr "S'ha finalitzat la configuració"
#: data/ui/contacts-setup-window.ui:69
#: data/ui/contacts-setup-window.ui:71
msgid "Welcome"
msgstr "Us donem la benvinguda"
#: data/ui/contacts-setup-window.ui:81
#: data/ui/contacts-setup-window.ui:83
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 "
......@@ -294,36 +292,40 @@ msgstr "S'està carregant"
msgid "Local Address Book"
msgstr "Llibreta d'adreces local"
#: src/contacts-app.vala:41
#: src/contacts-app.vala:42
msgid "Show contact with this individual id"
msgstr "Mostra el contacte amb aquest identificador individual"
#: src/contacts-app.vala:42
#: src/contacts-app.vala:43
msgid "Show contact with this email address"
msgstr "Mostra el contacte amb aquesta adreça electrònica"
#: src/contacts-app.vala:44
msgid "Show contacts with the given filter"
msgstr "Mostra el contactes amb els filtres donats"
#: src/contacts-app.vala:45
msgid "Show the current version of Contacts"
msgstr "Mostra la versió actual del Contactes"
#: src/contacts-app.vala:102
#: src/contacts-app.vala:103
#, c-format
msgid "No contact with id %s found"
msgstr "No s'ha trobat cap contacte amb l'identificador %s"
#: src/contacts-app.vala:103 src/contacts-app.vala:230
#: src/contacts-app.vala:104 src/contacts-app.vala:231
msgid "Contact not found"
msgstr "No s'ha trobat el contacte"
#: src/contacts-app.vala:112
#: src/contacts-app.vala:113
msgid "Change Address Book"
msgstr "Canvia la llibreta d'adreces"
#: src/contacts-app.vala:117
#: src/contacts-app.vala:118
msgid "Change"
msgstr "Canvia"
#: src/contacts-app.vala:127
#: src/contacts-app.vala:128
msgid ""
"New contacts will be added to the selected address book.\n"
"You are able to view and edit contacts from other address books."
......@@ -331,51 +333,51 @@ msgstr ""
"Els contactes nous s'afegiran a la llibreta d'adreces seleccionada.\n"
"Podeu veure i editar els contactes d'altres llibretes d'adreces."
#: src/contacts-app.vala:209
#: src/contacts-app.vala:210
msgid "translator-credits"
msgstr ""
"Gil Forcada <gilforcada@guifi.net>\n"
"Pau Iranzo <paugnu@gmail.com>"
# Deixem el nom tal qual?
#: src/contacts-app.vala:210
#: src/contacts-app.vala:211
msgid "GNOME Contacts"
msgstr "Contactes del GNOME"
#: src/contacts-app.vala:211
#: src/contacts-app.vala:212
msgid "About GNOME Contacts"
msgstr "Quant al Contactes del GNOME"
#: src/contacts-app.vala:212
#: src/contacts-app.vala:213
msgid "Contact Management Application"
msgstr "Aplicació de gestió de contactes"
#: src/contacts-app.vala:213
#: src/contacts-app.vala:214
msgid ""
"© 2011 Red Hat, Inc.\n"
"© 2011-2018 The Contacts Developers"
msgstr ""
"© 2011 Red Hat, Inc.\n"
"© 2011-2018 Els desenvolupadors del Contactes"
"© 2011-2018 L'equip de desenvolupament del Contactes"
#: src/contacts-app.vala:229
#: src/contacts-app.vala:230
#, c-format
msgid "No contact with email address %s found"
msgstr "No s'ha trobat cap contacte amb l'adreça electrònica %s"
#: src/contacts-avatar-selector.vala:110 src/contacts-avatar-selector.vala:230
#: src/contacts-avatar-selector.vala:111 src/contacts-avatar-selector.vala:231
msgid "Failed to set avatar."
msgstr "S'ha produït un error en establir l'avatar."
#: src/contacts-avatar-selector.vala:190
#: src/contacts-avatar-selector.vala:191
msgid "Browse for more pictures"
msgstr "Navega per més imatges"
#: src/contacts-avatar-selector.vala:193
#: src/contacts-avatar-selector.vala:194
msgid "_Open"
msgstr "_Obre"
#: src/contacts-avatar-selector.vala:193
#: src/contacts-avatar-selector.vala:194
msgid "_Cancel"
msgstr "_Cancel·la"
......@@ -666,65 +668,65 @@ msgstr "Tèlex"
msgid "TTY"
msgstr "Teletip"
#: src/contacts-window.vala:193
#: src/contacts-window.vala:190
#, c-format
msgid "%d Selected"
msgid_plural "%d Selected"
msgstr[0] "%d seleccionat"
msgstr[1] "%d seleccionats"
#: src/contacts-window.vala:230
#: src/contacts-window.vala:227
msgid "Add"
msgstr "Afegeix"
#: src/contacts-window.vala:252
#: src/contacts-window.vala:249
#, c-format
msgid "Editing %s"
msgstr "S'està editant %s"
#: src/contacts-window.vala:308
#: src/contacts-window.vala:305
msgid "Unmark as favorite"
msgstr "No el marquis més com a preferit"
#: src/contacts-window.vala:309
#: src/contacts-window.vala:306
msgid "Mark as favorite"
msgstr "Marca'l com a preferit"
#: src/contacts-window.vala:323
#: src/contacts-window.vala:320
msgid "New Contact"
msgstr "Contacte nou"
#: src/contacts-window.vala:421
#: src/contacts-window.vala:418
#, c-format
msgid "%d contacts linked"
msgid_plural "%d contacts linked"
msgstr[0] "%d contacte enllaçat"
msgstr[1] "%d contactes enllaçats"
#: src/contacts-window.vala:425 src/contacts-window.vala:449
#: src/contacts-window.vala:486
#: src/contacts-window.vala:422 src/contacts-window.vala:446
#: src/contacts-window.vala:483
msgid "_Undo"
msgstr "_Desfés"
#: src/contacts-window.vala:444
#: src/contacts-window.vala:441
#, c-format
msgid "Deleted contact %s"
msgstr "S'ha suprimit el contacte %s"
#: src/contacts-window.vala:446
#: src/contacts-window.vala:443
#, c-format
msgid "%d contact deleted"
msgid_plural "%d contacts deleted"
msgstr[0] "%d contacte suprimit"
msgstr[1] "%d contactes suprimits"
#: src/contacts-window.vala:482
#: src/contacts-window.vala:479
#, c-format
msgid "%s linked to %s"
msgstr "%s està enllaçat amb %s"
# Caldrà vore el context per veure si aquesta traducció és correcta
#: src/contacts-window.vala:484
#: src/contacts-window.vala:481
#, c-format
msgid "%s linked to the contact"
msgstr "S'ha enllaçat %s al contacte"
......@@ -783,14 +785,3 @@ msgstr "Està la finestra maximitzada?"
msgid "Stores if the window is currently maximized."
msgstr "Emmagatzema si x la finestra està actualment maximitzada."
#~ msgid "_Help"
#~ msgstr "_Ajuda"