aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r--addressbook/gui/widgets/addresstypes.xml67
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c2
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c37
3 files changed, 21 insertions, 85 deletions
diff --git a/addressbook/gui/widgets/addresstypes.xml b/addressbook/gui/widgets/addresstypes.xml
index 813bf1c0ac..c93f9cac19 100644
--- a/addressbook/gui/widgets/addresstypes.xml
+++ b/addressbook/gui/widgets/addresstypes.xml
@@ -74,72 +74,7 @@
</option>
</input>
<input type="optionlist" name="category">
- <option value="Anniversary">
- <title>Anniversary</title>
- </option>
- <option value="Holiday">
- <title>Holiday</title>
- </option>
- <option value="Ideas">
- <title>Ideas</title>
- </option>
- <option value="Status">
- <title>Status</title>
- </option>
- <option value="Holiday Cards">
- <title>Holiday Cards</title>
- </option>
- <option value="Hot Contacts">
- <title>Hot Contacts</title>
- </option>
- <option value="International">
- <title>International</title>
- </option>
- <option value="Birthday">
- <title>Birthday</title>
- </option>
- <option value="VIP">
- <title>VIP</title>
- </option>
- <option value="Gifts">
- <title>Gifts</title>
- </option>
- <option value="Waiting">
- <title>Waiting</title>
- </option>
- <option value="Key Customer">
- <title>Key Customer</title>
- </option>
- <option value="Time &amp; Expenses">
- <title>Time &amp; Expenses </title>
- </option>
- <option value="Miscellaneous">
- <title>Miscellaneous</title>
- </option>
- <option value="Business">
- <title>Business</title>
- </option>
- <option value="Personal">
- <title>Personal</title>
- </option>
- <option value="Suppliers">
- <title>Suppliers</title>
- </option>
- <option value="Goals/Objectives">
- <title>Goals/Objectives</title>
- </option>
- <option value="Strategies">
- <title>Strategies</title>
- </option>
- <option value="Competition">
- <title>Competition</title>
- </option>
- <option value="Favourites">
- <title>Favourites</title>
- </option>
- <option value="Phone Calls">
- <title>Phone Calls</title>
- </option>
+ <dynamic func="e_util_get_category_filter_options"/>
</input>
</part>
<part name="sexp">
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 1d22f3ea70..0208c4fd0f 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -91,6 +91,7 @@ common_location [] =
#define MSN_ICON "im-msn"
#define YAHOO_ICON "im-yahoo"
#define GADUGADU_ICON "im-gadugadu"
+#define SKYPE_ICON "stock_people"
#define VIDEOCONF_ICON "stock_video-conferencing"
#define MAX_COMPACT_IMAGE_DIMENSION 48
@@ -617,6 +618,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
accum_multival_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0);
accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
accum_multival_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0);
+ accum_multival_attribute (accum, contact, _("Skype"), E_CONTACT_IM_SKYPE, SKYPE_ICON, 0);
if (accum->len > 0)
gtk_html_stream_printf (html_stream, "%s", accum->str);
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index d3c0910827..9db9630b72 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -101,46 +101,45 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) {
can_detail_error = FALSE;
- label_string = _("We were unable to open this address book. This either means "
- "this book is not marked for offline usage or not yet downloaded "
+ label_string = _("This address book cannot be opened. This either means this "
+ "book is not marked for offline usage or not yet downloaded "
"for offline usage. Please load the address book once in online mode "
- "to download its contents");
+ "to download its contents.");
}
else if (!strncmp (uri, "file:", 5)) {
char *path = g_filename_from_uri (uri, NULL, NULL);
label = g_strdup_printf (
- _("We were unable to open this address book. Please check that the "
- "path %s exists and that you have permission to access it."), path);
+ _("This address book cannot be opened. Please check that the "
+ "path %s exists and that permissions are set to access it."), path);
g_free (path);
label_string = label;
}
+
+#ifndef HAVE_LDAP
else if (!strncmp (uri, "ldap:", 5)) {
/* special case for ldap: contact folders so we can tell the user about openldap */
-#ifdef HAVE_LDAP
- label_string =
- _("We were unable to open this address book. This either "
- "means you have entered an incorrect URI, or the LDAP server "
- "is unreachable.");
-#else
+
can_detail_error = FALSE;
label_string =
_("This version of Evolution does not have LDAP support "
- "compiled in to it. If you want to use LDAP in Evolution, "
- "you must install an LDAP-enabled Evolution package.");
+ "compiled in to it. To use LDAP in Evolution "
+ "an LDAP-enabled Evolution package must be installed.");
+
+ }
#endif
- } else {
- /* other network folders */
+ else {
+ /* other network folders (or if ldap is enabled and server is unreachable) */
label_string =
- _("We were unable to open this address book. This either "
- "means you have entered an incorrect URI, or the server "
+ _("This address book cannot be opened. This either "
+ "means that an incorrect URI was entered, or the server "
"is unreachable.");
}
if (can_detail_error) {
/* do not show repository offline message, it's kind of generic error */
if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) {
- label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL);
+ label = g_strconcat (label_string, "\n\n", _("Detailed error message:"), " ", _(status_to_string [status]), NULL);
label_string = label;
}
}
@@ -170,7 +169,7 @@ eab_search_result_dialog (GtkWidget *parent,
break;
case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED:
str = _("The time to execute this query exceeded the server limit or the limit\n"
- "you have configured for this address book. Please make your search\n"
+ "configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
"preferences for this address book.");
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 23:25:10 +0800