...
 
Commits (124)
......@@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.1)
cmake_policy(VERSION 3.1)
project(evolution
VERSION 3.28.0
VERSION 3.28.6
LANGUAGES C)
set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution")
set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution/issues/")
set(PROJECT_URL "http://wiki.gnome.org/Apps/Evolution/")
# Base Version: This is for API/version tracking for things like
......@@ -380,7 +380,10 @@ if(NOT HAVE_ICONV)
endif(NOT HAVE_ICONV)
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
unset(_binary_dir_with_separator)
unset(CMAKE_REQUIRED_LIBRARIES)
if(NOT _correct_iconv)
......@@ -425,17 +428,6 @@ if(HAVE_ISO_CODES)
endif(HAVE_ISO_CODES)
endif(HAVE_ISO_CODES)
# ******************************
# libcryptui, aka Seahorse
# ******************************
add_printable_option(ENABLE_LIBCRYPTUI "Enable libcryptui usage" ON)
if(ENABLE_LIBCRYPTUI)
pkg_check_modules_for_option(ENABLE_LIBCRYPTUI "libcryptui usage" LIBCRYPTUI cryptui-0.0)
set(HAVE_LIBCRYPTUI ON)
endif(ENABLE_LIBCRYPTUI)
# ******************************
# TNEF implementation
# ******************************
......
Evolution 3.28.5 2018-07-30
---------------------------
Bug Fixes:
I#71 - Workaround cursor movement through unbreakable anchor bug (Milan Crha)
I#75 - "Empty Junk" does not work on a real Junk folder (Milan Crha)
I#78 - Search scope in Mail view not restored properly (Milan Crha)
I#57 - Edited event time keeps the old instance in the UI (Milan Crha)
Miscellaneous:
[Mail-Notification] Remove unused code (reported by David Binderman) (Milan Crha)
Highlight of the search bar entry doesn't work (Milan Crha)
Evolution 3.28.4 2018-07-16
---------------------------
Bug Fixes:
Bug 796174 - strcat() considered unsafe for buffer overflow (Milan Crha)
Bug 757504 - [Composer] Do not wrap URLs in Plain Text mode (Milan Crha)
Bug 548681 - [MessageList] Restore of cursor mispositioned after delete (Milan Crha)
Bug 750636 - [Composer] Wrapped line should not start with a space (Milan Crha)
I#31 - help: German translation: Fix typo in closing tag (Antoine Jacoutot)
I#32 - Add column to sort at the end when Ctrl+Click its header (Milan Crha)
eds-I#13 - [IMAPx] Fails to append message to Yahoo! with no CRLF at the end (Milan Crha)
I#43 - Tasks not shown when Side Panel is hidden (Milan Crha)
I#55 - "Custom sort" dialog freezes Evolution and hogs the CPU under Wayland (Milan Crha)
I#69 - [MessageList] Regeneration loses selection start (Milan Crha)
Miscellaneous:
Update links to GNOME git repositories in flatpak files (Milan Crha)
[EContactEditor] Do not store empty values in vCard (Milan Crha)
Correct memory leak of object returned by atk_object_ref_relation_set() (Milan Crha)
Try also with the From address when looking up correct From account for composer (Milan Crha)
Properly wrap text in 'Security Information' dialog (Milan Crha)
Add 4px bottom margin to secure button table (Milan Crha)
[Composer] Message generated twice when using 'Send through Outbox' (Milan Crha)
Update couple HTML editor tests (Milan Crha)
Help: Update meeting invitation process due to UI changes (Дилян Палаузов)
Translations:
Pieter Schalk Schoeman (af)
Daniel Șerbănescu (ro)
Evolution 3.28.3 2018-06-18
---------------------------
Bug Fixes:
Bug 795977 - AutoArchive archives Junk and Deleted messages too (Milan Crha)
Bug 796114 - [Collection Accounts] Preselect each unique collection kind, not only first (Milan Crha)
Bug 796294 - No LTR text direction style in composed HTML messages (Milan Crha)
Bug 776162 - "Ignore Thread" does not always ignore thread (Milan Crha)
I#19 - Show "message/feedback-report" attachments inline (Milan Crha)
Miscellaneous:
Address some of the clang warnings (Milan Crha)
Fix a 'variable hides parameter' warning (Milan Crha)
[alarm-notify] Do not use markup around organizer name in libnotify text (Milan Crha)
Address some of the compiler and static analyzers warnings (Milan Crha)
Crash when making links clickable in composer (Milan Crha)
Shift+Click on switcher button to open a new window (Milan Crha)
Fix a possible memory leak in mail_display_uri_requested_cb() (Milan Crha)
[composer-autosave] Use-after-free during snapshot save to file ][ (Milan Crha)
Update bug URL and switch to https:// in the DOAP file (Milan Crha)
Fix few memory leaks around camel_data_wrapper_get_mime_type() (Milan Crha)
[ENameSelectorEntry] Plain text drag & drop between entries misbehaves (Milan Crha)
Mail Accounts in Preferences not always properly sorted (Milan Crha)
Drop dependency on libcryptui (Milan Crha)
Translations:
Kukuh Syafaat (id)
Uladzimir Manulenka (be)
Christian Kirbach (de)
Evolution 3.28.2 2018-05-07
---------------------------
Bug Fixes:
Bug 793583 - webkit_web_view_load_html() garbages linked CSS content (Milan Crha)
Bug 795106 - Compiler warnings about identical inner 'if' condition (Milan Crha)
Bug 795108 - Trailing bracket not stripped when linkifying URL inside angle brackets (Milan Crha)
Bug 795289 - Proxy settings ignored when checking for auth types (Milan Crha)
Bug 795331 - Use correct desktop-entry name in notifications (Mathieu Bridon)
Miscellaneous:
[EMailDisplay] Do not call reload when nothing is loaded (Milan Crha)
Revert message composer part of the previous commit (Milan Crha)
Translations:
Stas Solovey (ru)
Matej Urbančič (sl)
Balázs Meskó (hu)
Muhammet Kara (tr)
Gábor Kelemen (hu)
Evolution 3.28.1 2018-04-09
---------------------------
Bug Fixes:
Bug 794151 - The "File Under" field can not be edited (Milan Crha)
Bug 794138 - Search for Category Unmatched in Memos results in an error (Milan Crha)
Bug 793848 - Split PRE into separate paragraphs in HTML ][ (Milan Crha)
Bug 794474 - Headers in forwarded message credits in opposite order (HTML) (Milan Crha)
Bug 791244 - Cannot copy text/click links in read-only events (Milan Crha)
Bug 792688 - Failed mail print operation causes crash (Milan Crha)
Bug 794628 - Don't preload timezones on libical 3.0.2+ (Dan Nicholson)
Bug 764044 - Leftover "Generating message list" in the status pane (Milan Crha)
Bug 794693 - Crash when trying to view email message source (Milan Crha)
Bug 794648 - Undo/Redo doesn't work in component Description (Milan Crha)
Bug 794718 - Calendar List view shows wrong start/end time (when in UTC) (Milan Crha)
Bug 794451 - Fix my previous changes (Andre Klapper)
Miscellaneous:
Correct typo in config.h.in (Milan Crha)
Correct e_mail_formatter_canon_header_name() (Milan Crha)
Correct evolution stable flatpak build (Milan Crha)
Update version requirements in flatpak files (Milan Crha)
Avoid runtime warning when printing message with text/calendar attachment (Milan Crha)
Avoid runtime warning when creating fullname.ui dialog (Milan Crha)
Reply includes HTML attachment in message body (Milan Crha)
Mark missing string for translation (Piotr Drąg)
Ensure transient parent for ETimezoneDialog (Milan Crha)
Fix broken markup in Hungarian translation (Andre Klapper)
Use proper its format for translator comments (Andre Klapper)
Update how to use address book as a data source in LibreOffice (Andre Klapper)
Remove step covering a non-existing UI element (Andre Klapper)
No globe button anymore, just a 'Select' button (Andre Klapper)
Classification UI in task/cal editor is not consistent anymore (Andre Klapper)
Translations:
Efstathios Iosifidis (el)
Stas Solovey (ru)
Muhammet Kara (tr)
Emin Tufan Çetin (tr)
Cheng-Chia Tseng (zh_TW)
Daniel Șerbănescu (ro)
Piotr Drąg (pl)
Anders Jonsson (sv)
Rafael Fontenelle (pt_BR)
Marek Černocký (cs)
Gianvito Cavasoli (it)
Christian Kirbach (de)
Rūdolfs Mazurs (lv)
Aurimas Černius (lt)
Daniel Șerbănescu (ro)
Hannie Dumoleyn (nl)
Evolution 3.28.0 2018-03-12
---------------------------
......
......@@ -75,9 +75,6 @@
/* defined if you have X11/XF86keysym.h */
#cmakedefine HAVE_XFREE 1
/* Define if using libcryptui */
#cmakedefine HAVE_LIBCRYPTUI 1
/* Define if TNEF attachments parser should be built */
#cmakedefine ENABLE_YTNEF 1
......@@ -127,7 +124,7 @@
#cmakedefine HAVE_LDAP 1
/* Define if you use SunLDAP */
/#cmakedefine SUNLDAP 1
#cmakedefine SUNLDAP 1
/* Define to the full path of mozilla nss library */
#define MOZILLA_NSS_LIB_DIR "@MOZILLA_NSS_LIB_DIR@"
......@@ -9,9 +9,9 @@
<shortdesc xml:lang="en">Manage your email, contacts and schedule</shortdesc>
<description>Manage your email, contacts and schedule</description>
<homepage rdf:resource="https://wiki.gnome.org/Apps/Evolution" />
<mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/evolution-list" />
<download-page rdf:resource="http://download.gnome.org/sources/evolution" />
<bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=evolution" />
<mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/evolution-list" />
<download-page rdf:resource="https://download.gnome.org/sources/evolution" />
<bug-database rdf:resource="https://gitlab.gnome.org/GNOME/evolution/issues/" />
<category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
<programming-language>C</programming-language>
<programming-language>XML</programming-language>
......
......@@ -8,11 +8,17 @@ To build it, one can follow the below commands, which expect flatpak and
flatpak-builder installed. Refer to the Flatpak developer documentation
and command man pages for the meaning of respective arguments.
Note the actual versions of the GNOME SDK and Platform (below is used
version 3.26) can differ each release of Evolution. The exact expected
version can be seen (or changed) in the .json file, the runtime-version
key (line "runtime-version": "3.26",). Use the same version in the below
install commands as is written in the runtime-version key of the .json file.
To prepare Flatpak, add GNOME repository and install the SDK and Platform:
$ flatpak remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo
$ flatpak install gnome org.gnome.Platform//3.24
$ flatpak install gnome org.gnome.Sdk//3.24
$ flatpak install gnome org.gnome.Platform//3.26
$ flatpak install gnome org.gnome.Sdk//3.26
After this, Evolution can be built. While the below commands build the git master
version of Evolution, it can be changed to the stable version, when all "-master"
......
{
"app-id": "org.gnome.Evolution",
"runtime": "org.gnome.Platform",
"runtime-version": "3.24",
"runtime-version": "3.26",
"sdk": "org.gnome.Sdk",
"command": "evolution",
"rename-icon": "evolution",
......@@ -22,11 +22,11 @@
"*.a"
],
"finish-args": [
"--socket=x11",
"--share=ipc",
"--share=network",
"--socket=x11",
"--socket=wayland",
"--socket=pulseaudio",
"--share=network"
"--socket=pulseaudio"
],
"modules": [
{
......@@ -243,7 +243,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution-data-server",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"branch": "master"
}
]
......@@ -275,7 +275,6 @@
"-DENABLE_GNOME_DESKTOP=OFF",
"-DENABLE_GTK_DOC=OFF",
"-DENABLE_INSTALLED_TESTS=OFF",
"-DENABLE_LIBCRYPTUI=OFF",
"-DENABLE_PST_IMPORT=OFF",
"-DENABLE_TEXT_HIGHLIGHT=OFF",
"-DENABLE_YTNEF=OFF",
......@@ -289,7 +288,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution",
"url": "https://gitlab.gnome.org/GNOME/evolution.git",
"branch": "master"
},
......@@ -349,7 +348,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution-ews",
"url": "https://gitlab.gnome.org/GNOME/evolution-ews.git",
"branch": "master"
}
]
......
......@@ -4,7 +4,6 @@
"runtime-version": "3.26",
"sdk": "org.gnome.Sdk",
"command": "evolution",
"rename-desktop-file": "evolution.desktop",
"rename-icon": "evolution",
"copy-icon": true,
"branch": "gnome-3-28",
......@@ -22,11 +21,11 @@
"*.a"
],
"finish-args": [
"--socket=x11",
"--share=ipc",
"--share=network",
"--socket=x11",
"--socket=wayland",
"--socket=pulseaudio",
"--share=network"
"--socket=pulseaudio"
],
"modules": [
{
......@@ -243,7 +242,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution-data-server",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"branch": "gnome-3-28"
}
]
......@@ -275,7 +274,6 @@
"-DENABLE_GNOME_DESKTOP=OFF",
"-DENABLE_GTK_DOC=OFF",
"-DENABLE_INSTALLED_TESTS=OFF",
"-DENABLE_LIBCRYPTUI=OFF",
"-DENABLE_PST_IMPORT=OFF",
"-DENABLE_TEXT_HIGHLIGHT=OFF",
"-DENABLE_YTNEF=OFF",
......@@ -289,7 +287,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution",
"url": "https://gitlab.gnome.org/GNOME/evolution.git",
"branch": "gnome-3-28"
},
......@@ -349,7 +347,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evolution-ews",
"url": "https://gitlab.gnome.org/GNOME/evolution-ews.git",
"branch": "gnome-3-28"
}
]
......
......@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="index#calendar-advanced" />
<revision pkgversion="3.0.2" version="0.2" date="2017-04-08" status="final"/>
<revision pkgversion="3.26.5" version="0.3" date="2018-03-28" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
......@@ -20,7 +20,7 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Classifying appointments and tasks on remote servers.</desc>
<desc>Restricting visibility of appointments on remote servers.</desc>
</info>
<title>Using Classifications</title>
......@@ -29,7 +29,7 @@
or Microsoft Exchange), you can select a classification to determine who can
view it.</p>
<p>To set a classification for an appointment or a task, click
<p>To set a classification for an appointment, click
<guiseq><gui>Options</gui><gui>Classification</gui></guiseq> and select a
classification in the editor. <gui>Public</gui> is the default category, and
a public appointment can be viewed by anyone on the calendar-sharing network.
......
......@@ -5,7 +5,7 @@
<link type="guide" xref="calendar-sharing-information" />
<revision pkgversion="3.1.5" version="0.5" date="2012-02-20" status="final"/>
<revision pkgversion="3.28.2" version="0.6" date="2018-07-09" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
<email its:translate="no">ak-47@gmx.net</email>
......@@ -53,8 +53,8 @@
people you want to invite.</p>
</item>
<item>
<p>Click the <gui>Free/Busy</gui> button on the toolbar, or click
<guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p>
<p>Click the <gui style="button">Free/Busy</gui> button on the toolbar,
or the <gui>Schedule</gui> tab.</p>
</item>
<item>
<p>Adjust the meeting time, either by dragging the meeting borders or by
......
......@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="calendar-meetings" />
<revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
<revision pkgversion="3.28.2" version="0.3" date="2018-07-09" status="stub"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
......@@ -85,8 +85,8 @@
</item>
<item>
<p>To query <link xref="calendar-free-busy">free/busy</link> information
for the attendees, click the <gui>Free/Busy</gui> button on the toolbar,
or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p>
for the attendees, click the <gui style="button">Free/Busy</gui> button on
the toolbar, or the <gui>Schedule</gui> tab.</p>
</item>
<item>
<p>Click <gui>Save</gui> to save the meeting.</p>
......
......@@ -47,10 +47,10 @@
<p>You can also configure time zone information specific to each appointment.
To do that,
<link xref="calendar-usage">add a new or edit an existing appointment</link>
and click the globe button to customize the time zone that the time exists
in. For example, if you live in New York but have a telephone meeting set for
noon with someone in California, you need to make sure that your schedules
<link xref="calendar-usage">add a new or edit an existing appointment</link>.
Under <gui>Time zone</gui>, click <gui style="button">Select…</gui> to customize
the time zone. For example, if you live in New York but have a telephone meeting
set with someone in California, you need to make sure that your schedules
are coordinated. Setting time zones on a per-appointment basis helps avoid
that potential confusion.</p>
......
......@@ -49,11 +49,6 @@
<item>
<p>Select the date and time.</p>
</item>
<item>
<p>If the event is not an all day event, select either <gui>For</gui> to
specify the duration, or select <gui>Until</gui> to specify the ending
time of the event.</p>
</item>
<item>
<p>(Optional) Enter a description in the <gui>Description</gui> field.</p>
</item>
......
......@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="index#data-migration-and-sync"/>
<revision pkgversion="3.1.5" version="0.2" date="2012-02-18" status="draft"/>
<revision pkgversion="3.26.6" version="0.3" date="2018-03-26" status="draft"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
......@@ -20,13 +20,13 @@
<title>Contacts in LibreOffice</title>
<p>You can use your <app>Evolution</app> address books in LibreOffice as a data source.
The following steps refer to LibreOffice version 3.3.3.</p>
<p>You can use your <app>Evolution</app> address books in <app>LibreOffice Writer</app> as a data source.
The following steps refer to LibreOffice version 5.4.</p>
<steps>
<item>
<p>Click <guiseq><gui>Edit</gui><gui>Exchange Database…</gui></guiseq>
in the menu bar. This will bring up the <gui>Exchange databases</gui>
in the menu bar. This will bring up the <gui>Exchange Databases</gui>
dialog box.</p>
</item>
<item>
......@@ -37,25 +37,11 @@
<item>
<p>Choose an addressbook and click <gui style="button">Define</gui>.</p>
</item>
<item>
<p>In case it is not listed already, click
<gui style="button">Browse…</gui>. A file chooser dialog opens.</p>
</item>
<item>
<p>As <app>Evolution</app> stores its data in a hidden directory, press
<keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar
displayed.</p>
</item>
<item>
<p>Go to
<file>~/.local/share/evolution/addressbook/system/addressbook.db</file>
and click <gui style="button">Open</gui>.</p>
</item>
</steps>
<p>This makes the <app>Evolution</app> address book the default data source
for LibreOffice. You can now select a field to insert into a LibreOffice
document via
<guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></guiseq>.</p>
<guiseq><gui>Insert</gui><gui>Field</gui></guiseq>.</p>
</page>
......@@ -39,7 +39,6 @@ Phil Bull
<section id="translators">
<title>Translators of the <app>Evolution</app> User Documentation</title>
<!-- TO TRANSLATORS: This is shown in the 'Translators of the User Documentation' section. Please REPLACE this string by adding your own names here so you get some well-deserved fame on the interwebs! Do NOT use "\n" for linebreaks or square brackets (<>) for potential email addresses here as this will not work. Thanks for all your hard work! andre -->
<p its:locNote="TO TRANSLATORS: This is shown in the 'Translators of the User Documentation' section. Please REPLACE this string by adding your own names here so you get some well-deserved fame on the interwebs! Do NOT use '\n' for linebreaks or square brackets for potential email addresses here as this will not work. Thanks for all your hard work! andre">(Not applicable to the English version)</p>
</section>
......
......@@ -40,8 +40,7 @@
<item><p>Enter the preferred quotation string as the value for the key <code>composer-message-attribution</code>.</p></item>
</list>
<!-- Translators: Do NOT translate the variable names inside the brackets! -->
<p>The default string in English is:
<p xmlns:its="http://www.w3.org/2005/11/its" its:locNote="Translators: Do NOT translate the variable names inside the ${brackets}!">The default string in English is:
<code>"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"</code>
</p>
......
......@@ -21,15 +21,9 @@
<p>To set a custom email address and sender name on a message you intend to send, enable <guiseq><gui>View</gui><gui>From Override Field</gui></guiseq> and change the default sender name and email address in the corresponding fields.</p>
<!-- Translators: If no Wikipedia article exists for your language and you
leave the URL untranslated and pointing to the English Wikipedia, you might
want to indicate in your translation text that the link is in English. -->
<p>This functionality can be useful for <link href="https://en.wikipedia.org/wiki/Qmail#Innovations">wildcard mailboxes when using qmail</link> and <link href="https://en.wikipedia.org/wiki/Email_address#Address_tags">sub-addressing</link>.</p>
<!-- Translators: If no Wikipedia article exists for your language and you
leave the URL untranslated and pointing to the English Wikipedia, you might
want to indicate in your translation text that the link is in English. -->
<note style="important"><p>Setting an arbitrary address might collide with your email provider's <link href="https://en.wikipedia.org/wiki/Sender_Policy_Framework">Sender Policy Framework</link> and/or <link href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail">DomainKeys Identified Mail</link> restrictions.</p></note>
<p xmlns:its="http://www.w3.org/2005/11/its" its:locNote="Translators: If no Wikipedia article exists for your language and you leave the URL untranslated and pointing to the English Wikipedia, you might want to indicate in your translation text that the link is in English.">This functionality can be useful for <link href="https://en.wikipedia.org/wiki/Qmail#Innovations">wildcard mailboxes when using qmail</link> and <link href="https://en.wikipedia.org/wiki/Email_address#Address_tags">sub-addressing</link>.</p>
<note style="important"><p xmlns:its="http://www.w3.org/2005/11/its" its:locNote="Translators: If no Wikipedia article exists for your language and you leave the URL untranslated and pointing to the English Wikipedia, you might want to indicate in your translation text that the link is in English.">Setting an arbitrary address might collide with your email provider's <link href="https://en.wikipedia.org/wiki/Sender_Policy_Framework">Sender Policy Framework</link> and/or <link href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail">DomainKeys Identified Mail</link> restrictions.</p></note>
</page>
......@@ -52,10 +52,8 @@
<title>Using Elements From a Message in a Template When Replying</title>
<p>Templates can contain more than just the predefined set of <link xref="#configure">key-value pairs</link>. You can also get any message header values from the email that you are applying the template on, plus the complete message body.</p>
<!-- TRANSLATORS: Do NOT translate "$ORIG[subject]" and "$ORIG[body]" in this sentence. -->
<p its:locNote="TO TRANSLATORS: Do NOT translate $ORIG[subject] and $ORIG[body] in this sentence!">In order to do this, use the format <code>$ORIG[header_name]</code> and replace the variable <code>header_name</code> by the actual header. For example, if you would like to insert the subject line of the message that you reply to, use <code>$ORIG[subject]</code>. To insert the complete body, use <code>$ORIG[body]</code>.</p>
<!-- TRANSLATORS: Do NOT translate "$ORIG[body]" and "$ORIG[reply-to]" in this sentence. -->
<p its:locNote="TO TRANSLATORS: Do NOT translate $ORIG[body] and $ORIG[reply-to] in this sentence!">If no replacement for a variable is found, the variable is not removed (except for <code>$ORIG[body]</code>) but left in place so that you see that something went wrong. This could happen when trying to use headers that are not necessarily always available in the original message (for example <code>$ORIG[reply-to]</code>).</p>
</section>
......
......@@ -21,8 +21,7 @@
<title>Getting notified of new mail</title>
<p><app>Evolution</app> always notifies you of new messages by adding a yellow star to the mailer icon in the window <link xref="intro-main-window">switcher</link>.</p>
<!-- Translators: Please make sure that the screenshot does have the small yellow star in the Mail icon -->
<media type="image" src="./figures/new-mail-switcher.png" width="256">
<media type="image" src="./figures/new-mail-switcher.png" width="256" xmlns:its="http://www.w3.org/2005/11/its" its:locNote="Translators: Please make sure that the screenshot does have the small yellow star in the Mail icon">
<p>Switcher layout when a new message has arrived</p>
</media>
......
......@@ -31,7 +31,7 @@
<p>If you just want to quickly add a task by entering a summary you can directly enter it in the list of tasks.</p>
<p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> for the task, or add an attachment.</p>
<p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> (via the drop-down menu) for the task, or add an attachment or set a <link xref="calendar-alarms-and-reminders">reminder</link> (via the corresponding tabs).</p>
<section id="assigned-tasks">
<title>Assigned Tasks</title>
......
This diff is collapsed.
......@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: manual_evolution\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-05 18:00+0000\n"
"PO-Revision-Date: 2018-02-18 15:54+0100\n"
"POT-Creation-Date: 2018-03-28 13:01+0000\n"
"PO-Revision-Date: 2018-05-14 09:30+0200\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"Language: de_DE\n"
......@@ -48,7 +48,7 @@ msgid "translator-credits"
msgstr ""
"Andre Klapper <ak-47@gmx.net>, 2007-2009\n"
"Mario Blättermann <mario.blaettermann@gmail.com>, 2009-2013, 2016-2018\n"
"Christian Kirbach <Christian.Kirbach@gmail.com>, 2009-2013, 2015-2017\n"
"Christian Kirbach <Christian.Kirbach@gmail.com>, 2009-2013, 2015-2018\n"
"Gabor Karsay <gabor.karsay@gmx.at>, 2011-2012\n"
"Bernd Homuth <dev@hmt.im>, 2015"
......@@ -341,8 +341,9 @@ msgstr ""
#. (itstool) path: info/desc
#: C/calendar-classifications.page:23
msgid "Classifying appointments and tasks on remote servers."
msgstr "So klassifizieren Sie Termine und Aufgaben auf entfernten Servern."
msgid "Restricting visibility of appointments on remote servers."
msgstr ""
"So beschränken Sie die Sichtbarkeit von Terminen auf entfernten Servern."
#. (itstool) path: page/title
#: C/calendar-classifications.page:26
......@@ -363,19 +364,19 @@ msgstr ""
#. (itstool) path: page/p
#: C/calendar-classifications.page:32
msgid ""
"To set a classification for an appointment or a task, click "
"<guiseq><gui>Options</gui><gui>Classification</gui></guiseq> and select a "
"classification in the editor. <gui>Public</gui> is the default category, and "
"a public appointment can be viewed by anyone on the calendar-sharing "
"network. <gui>Private</gui> denotes one level of security, and "
"<gui>Confidential</gui> an even higher level."
"To set a classification for an appointment, click <guiseq><gui>Options</"
"gui><gui>Classification</gui></guiseq> and select a classification in the "
"editor. <gui>Public</gui> is the default category, and a public appointment "
"can be viewed by anyone on the calendar-sharing network. <gui>Private</gui> "
"denotes one level of security, and <gui>Confidential</gui> an even higher "
"level."
msgstr ""
"Um eine Einstufung für einen Termin oder eine Aufgabe festzulegen, klicken "
"Sie auf <guiseq><gui>Optionen</gui><gui>Einstufungen</gui></guiseq> und "
"wählen Sie eine Einstufung im Editor. <gui>Öffentlich</gui> ist die "
"voreingestellte Einstufung. Ein öffentlicher Termin kann von jedem im "
"Netzwerk eingesehen werden. <gui>Privat</gui> bezeichnet die erste "
"Sicherheitsstufe und <gui>Vertraulich</gui> eine noch höhere."
"Um eine Einstufung für einen Termin festzulegen, klicken Sie auf "
"<guiseq><gui>Optionen</gui><gui>Einstufungen</gui></guiseq> und wählen Sie "
"eine Einstufung im Editor. <gui>Öffentlich</gui> ist die voreingestellte "
"Einstufung. Ein öffentlicher Termin kann von jedem im selben Netzwerk "
"eingesehen werden. <gui>Privat</gui> bezeichnet die erste Sicherheitsstufe "
"und <gui>Vertraulich</gui> eine noch höhere."
#. (itstool) path: page/p
#: C/calendar-classifications.page:39
......@@ -1232,7 +1233,6 @@ msgstr "Wählen Sie Datum und Zeit."
#. (itstool) path: item/p
#: C/calendar-meetings-sending-invitation.page:78
#: C/calendar-usage-add-appointment.page:53
msgid ""
"If the event is not an all day event, select either <gui>For</gui> to "
"specify the duration, or select <gui>Until</gui> to specify the ending time "
......@@ -1244,7 +1244,7 @@ msgstr ""
#. (itstool) path: item/p
#: C/calendar-meetings-sending-invitation.page:83
#: C/calendar-usage-add-appointment.page:58
#: C/calendar-usage-add-appointment.page:53
msgid "(Optional) Enter a description in the <gui>Description</gui> field."
msgstr ""
"(Optional) Geben Sie eine Beschreibung im <gui>Beschreibung</gui>-Feld ein."
......@@ -1276,7 +1276,7 @@ msgstr ""
#. (itstool) path: page/p
#: C/calendar-meetings-sending-invitation.page:99
#: C/calendar-usage-add-appointment.page:67
#: C/calendar-usage-add-appointment.page:62
msgid ""
"You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
"<link xref=\"using-categories\">category</link>, a <link xref=\"calendar-"
......@@ -1573,20 +1573,20 @@ msgstr "Eine Zeitzone für einen Termin festlegen"
msgid ""
"You can also configure time zone information specific to each appointment. "
"To do that, <link xref=\"calendar-usage\">add a new or edit an existing "
"appointment</link> and click the globe button to customize the time zone "
"that the time exists in. For example, if you live in New York but have a "
"telephone meeting set for noon with someone in California, you need to make "
"sure that your schedules are coordinated. Setting time zones on a per-"
"appointment basis helps avoid that potential confusion."
"appointment</link>. Under <gui>Time zone</gui>, click <gui style=\"button"
"\">Select…</gui> to customize the time zone. For example, if you live in New "
"York but have a telephone meeting set with someone in California, you need "
"to make sure that your schedules are coordinated. Setting time zones on a "
"per-appointment basis helps avoid that potential confusion."
msgstr ""
"Sie können die Zeitzone-Informationen auch spezifisch für einen Termin "
"Sie können die Zeitzone-Informationen auch individuell für jeden Termin "
"eingeben. Hierzu <link xref=\"calendar-usage\">erstellen Sie einen neuen "
"Termin oder bearbeiten einen bestehenden Termin</link> und klicken dann auf "
"den Globus-Knopf, um die gewünschte Zeitzone einzugeben. Wenn Sie zum "
"Beispiel in Berlin leben, aber eine Telefonbesprechung mit jemandem in New "
"York um 12 Uhr mittags haben, müssen Sie Ihre Planungen untereinander "
"koordinieren. Sie können Verwirrung vermeiden, indem Sie die Zeitzone dieses "
"Termins korrekt setzen."
"Termin oder bearbeiten einen bestehenden Termin</link> und klicken dann "
"unter <gui>Zeitzone</gui> auf <gui style=\"button\">Auswählen …</gui>, um die "
"gewünschte Zeitzone einzugeben. Wenn Sie zum Beispiel in Berlin leben, aber "
"eine Telefonbesprechung mit jemandem in New York um 12 Uhr mittags haben, "
"müssen Sie Ihre Planungen untereinander koordinieren. Sie können Verwirrung "
"vermeiden, indem Sie die Zeitzone dieses Termins korrekt setzen."
#. (itstool) path: info/desc
#: C/calendar-usage-add-appointment.page:17
......@@ -1621,7 +1621,7 @@ msgid "If you use the Appointment dialog:"
msgstr "Falls Sie den Termindialog verwenden:"
#. (itstool) path: item/p
#: C/calendar-usage-add-appointment.page:61
#: C/calendar-usage-add-appointment.page:56
msgid ""
"To show the time as <link xref=\"calendar-free-busy\">busy</link> to others, "
"click <guiseq><gui>Options</gui> <gui>Show Time as Busy</gui></guiseq>."
......@@ -2206,22 +2206,23 @@ msgstr "Kontakte in LibreOffice"
#. (itstool) path: page/p
#: C/contacts-libreoffice.page:23
msgid ""
"You can use your <app>Evolution</app> address books in LibreOffice as a data "
"source. The following steps refer to LibreOffice version 3.3.3."
"You can use your <app>Evolution</app> address books in <app>LibreOffice "
"Writer</app> as a data source. The following steps refer to LibreOffice "
"version 5.4."
msgstr ""
"Sie können Ihre <app>Evolution</app>-Adressbücher in LibreOffice als "
"Datenquelle nutzen. Die folgenden Schritte beziehen sich auf LibreOffice "
"3.3.3."
"Sie können Ihre <app>Evolution</app>-Adressbücher in <app>LibreOffice</app> "
"als Datenquelle nutzen. Die folgenden Schritte beziehen sich auf LibreOffice "
"5.4."
#. (itstool) path: item/p
#: C/contacts-libreoffice.page:28
msgid ""
"Click <guiseq><gui>Edit</gui><gui>Exchange Database…</gui></guiseq> in the "
"menu bar. This will bring up the <gui>Exchange databases</gui> dialog box."
"menu bar. This will bring up the <gui>Exchange Databases</gui> dialog box."
msgstr ""
"Klicken Sie in der Menüleiste auf <guiseq><gui>Bearbeiten</gui><gui>Exchange-"
"Datenbank…</gui></guiseq>. Daraufhin öffnet sich der Dialog <gui>Exchange-"
"Datenbank</gui>."
"Datenbank …</gui></guiseq>. Daraufhin öffnet sich der Dialog <gui>Exchange-"
"Datenbanken</gui>."
#. (itstool) path: item/p
#: C/contacts-libreoffice.page:33
......@@ -2241,47 +2242,17 @@ msgstr ""
"Wählen Sie ein Adressbuch und klicken Sie auf <gui style=\"button"
"\">Definieren</gui>."
#. (itstool) path: item/p
#: C/contacts-libreoffice.page:41
msgid ""
"In case it is not listed already, click <gui style=\"button\">Browse…</gui>. "
"A file chooser dialog opens."
msgstr ""
"Falls es dort nicht schon aufgeführt ist, klicken Sie auf <gui style=\"button"
"\">Durchsuchen …</gui>. Daraufhin öffnet sich ein Dateiwähler."
#. (itstool) path: item/p
#: C/contacts-libreoffice.page:45
msgid ""
"As <app>Evolution</app> stores its data in a hidden directory, press "
"<keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar "
"displayed."
msgstr ""
"Weil <app>Evolution</app> seine Daten in einem versteckten Ordner speichert, "
"drücken Sie <keyseq><key>Strg</key><key>L</key></keyseq>, um zur Ortsleiste "
"zu gelangen."
#. (itstool) path: item/p
#: C/contacts-libreoffice.page:50
msgid ""
"Go to <file>~/.local/share/evolution/addressbook/system/addressbook.db</"
"file> and click <gui style=\"button\">Open</gui>."
msgstr ""
"Suchen Sie nach <file>~/.local/share/evolution/addressbook/system/"
"addressbook.db</file> und klicken Sie auf <gui style=\"button\">Öffnen</gui>."
#. (itstool) path: page/p
#: C/contacts-libreoffice.page:56
#: C/contacts-libreoffice.page:42
msgid ""
"This makes the <app>Evolution</app> address book the default data source for "
"LibreOffice. You can now select a field to insert into a LibreOffice "
"document via <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></"
"guiseq>."
"document via <guiseq><gui>Insert</gui><gui>Field</gui></guiseq>."
msgstr ""
"Damit wird das <app>Evolution</app>-Adressbuch die vorausgewählte "
"Datenquelle für LibreOffice. Sie können nun ein Feld wählen, um es in ein "
"LibreOffice-Dokument einzufügen mit <guiseq><gui>Einfügen</gui><gui>Felder</"
"gui><gui>Andere</gui></guiseq>."
"LibreOffice-Dokument einzufügen mit <guiseq><gui>Einfügen</gui><gui>Feld</"
"gui></guiseq>."
#. (itstool) path: info/desc
#: C/contacts-local.page:17
......@@ -2689,7 +2660,7 @@ msgid "Authors of the <app>Evolution</app> User Documentation"
msgstr "Die Autoren des Benutzerhandbuchs von <app>Evolution</app>"
#. (itstool) path: item/p
#: C/credits.page:25 C/credits.page:55
#: C/credits.page:25 C/credits.page:54
msgid "André Klapper"
msgstr "André Klapper"
......@@ -2720,27 +2691,27 @@ msgstr "Die Übersetzer des Benutzerhandbuchs von <app>Evolution</app>"
#. use '\n' for linebreaks or square brackets for potential email
#. addresses here as this will not work. Thanks for all your hard work!
#. andre
#: C/credits.page:43
#: C/credits.page:42
msgid "(Not applicable to the English version)"
msgstr "Christian Kirbach, Gabor Karsay, Mario Blättermann"
#. (itstool) path: section/title
#: C/credits.page:47
#: C/credits.page:46
msgid "Authors of the previous version"
msgstr "Die Autoren der vorherigen Version"
#. (itstool) path: section/title
#: C/credits.page:89
#: C/credits.page:88
msgid "Contact information"
msgstr "Kontaktinformationen"
#. (itstool) path: section/p
#: C/credits.page:90
#: C/credits.page:89
msgid "The GNOME Documentation Project:"
msgstr "Das GNOME-Dokumentationsprojekt:"
#. (itstool) path: item/p
#: C/credits.page:92
#: C/credits.page:91
msgid ""
"<link href=\"https://wiki.gnome.org/DocumentationProject\">Website</link>"
msgstr ""
......@@ -2748,7 +2719,7 @@ msgstr ""
"link>"
#. (itstool) path: item/p
#: C/credits.page:95
#: C/credits.page:94
msgid ""
"<link href=\"https://mail.gnome.org/mailman/listinfo/gnome-doc-list"
"\">Mailing list</link>"
......@@ -6656,7 +6627,8 @@ msgstr ""
"<code>composer-message-attribution</code> an."
#. (itstool) path: page/p
#: C/mail-composer-change-quotation-string.page:44
#. Translators: Do NOT translate the variable names inside the ${brackets}!
#: C/mail-composer-change-quotation-string.page:43
msgid ""
"The default string in English is: <code>\"On ${AbbrevWeekdayName}, ${Year}-"
"${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:\"</code>"
......@@ -6666,32 +6638,32 @@ msgstr ""
"${TimeZone}, ${Sender} wrote:\"</code>"
#. (itstool) path: page/p
#: C/mail-composer-change-quotation-string.page:48
#: C/mail-composer-change-quotation-string.page:47
msgid "The following placeholders are available:"
msgstr "Die folgenden Platzhalter sind verfügbar:"
#. (itstool) path: item/p
#: C/mail-composer-change-quotation-string.page:57
#: C/mail-composer-change-quotation-string.page:56
msgid "<_:code-1/> (format: 01-31)"
msgstr "<_:code-1/> (Format: 01-31)"
#. (itstool) path: item/p
#: C/mail-composer-change-quotation-string.page:58
#: C/mail-composer-change-quotation-string.page:57
msgid "<_:code-1/> (format: 1-31)"
msgstr "<_:code-1/> (Format: 1-31)"
#. (itstool) path: item/p
#: C/mail-composer-change-quotation-string.page:63
#: C/mail-composer-change-quotation-string.page:62
msgid "<_:code-1/> (format: 1-366)"
msgstr "<_:code-1/> (Format: 1-366)"
#. (itstool) path: item/p
#: C/mail-composer-change-quotation-string.page:64
#: C/mail-composer-change-quotation-string.page:63
msgid "<_:code-1/> (format: 01-12)"
msgstr "<_:code-1/> (Format: 01-12)"
#. (itstool) path: item/p
#: C/mail-composer-change-quotation-string.page:67
#: C/mail-composer-change-quotation-string.page:66
msgid "<_:code-1/> (e.g. 15 for the year 2015)"
msgstr "<_:code-1/> (z.B. »15« für das Jahr 2015)"
......@@ -7048,7 +7020,11 @@ msgstr ""
"Feldern."
#. (itstool) path: page/p
#: C/mail-composer-from-field-override.page:27
#. Translators: If no Wikipedia article exists for your language and you
#. leave the URL untranslated and pointing to the English Wikipedia, you
#. might want to indicate in your translation text that the link is in
#. English.
#: C/mail-composer-from-field-override.page:24
msgid ""
"This functionality can be useful for <link href=\"https://en.wikipedia.org/"
"wiki/Qmail#Innovations\">wildcard mailboxes when using qmail</link> and "
......@@ -7061,7 +7037,11 @@ msgstr ""
"\">Unteradressierung</link>."
#. (itstool) path: note/p
#: C/mail-composer-from-field-override.page:32
#. Translators: If no Wikipedia article exists for your language and you
#. leave the URL untranslated and pointing to the English Wikipedia, you
#. might want to indicate in your translation text that the link is in
#. English.
#: C/mail-composer-from-field-override.page:26
msgid ""
"Setting an arbitrary address might collide with your email provider's <link "
"href=\"https://en.wikipedia.org/wiki/Sender_Policy_Framework\">Sender Policy "
......@@ -7868,7 +7848,7 @@ msgstr ""
#. (itstool) path: section/p
#. TO TRANSLATORS: Do NOT translate $ORIG[subject] and $ORIG[body] in this
#. sentence!
#: C/mail-composer-message-templates-variables.page:56
#: C/mail-composer-message-templates-variables.page:55
msgid ""
"In order to do this, use the format <code>$ORIG[header_name]</code> and "
"replace the variable <code>header_name</code> by the actual header. For "
......@@ -7885,7 +7865,7 @@ msgstr ""
#. (itstool) path: section/p
#. TO TRANSLATORS: Do NOT translate $ORIG[body] and $ORIG[reply-to] in
#. this sentence!
#: C/mail-composer-message-templates-variables.page:59
#: C/mail-composer-message-templates-variables.page:57
msgid ""
"If no replacement for a variable is found, the variable is not removed "
"(except for <code>$ORIG[body]</code>) but left in place so that you see that "
......@@ -10797,7 +10777,7 @@ msgstr ""
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
#: C/mail-received-notification.page:25
#: C/mail-received-notification.page:24
msgctxt "_"
msgid ""
"external ref='./figures/new-mail-switcher.png' "
......@@ -10805,13 +10785,15 @@ msgid ""
msgstr "lokalisiert"
#. (itstool) path: media/p
#: C/mail-received-notification.page:26
#. Translators: Please make sure that the screenshot does have the small
#. yellow star in the Mail icon
#: C/mail-received-notification.page:25
msgid "Switcher layout when a new message has arrived"
msgstr ""
"Layout der Umschalter-Knöpfe, sobald eine neue Nachricht eingetroffen ist"
#. (itstool) path: page/p
#: C/mail-received-notification.page:29
#: C/mail-received-notification.page:28
msgid ""
"In order to also be notified of new messages in the GNOME Notification area "
"at the bottom of the screen, make sure that <guiseq><gui>Edit</"
......@@ -10829,7 +10811,7 @@ msgstr ""
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
#: C/mail-received-notification.page:31
#: C/mail-received-notification.page:30
msgctxt "_"
msgid ""
"external ref='./figures/new-mail-notification.png' "
......@@ -10837,7 +10819,7 @@ msgid ""
msgstr "lokalisiert"
#. (itstool) path: media/p
#: C/mail-received-notification.page:32
#: C/mail-received-notification.page:31
msgid "GNOME notification area when a new message has arrived"
msgstr "GNOME-Benachrichtigung, wenn eine neue Nachricht eingetroffen ist"
......@@ -13627,12 +13609,15 @@ msgstr ""
msgid ""
"You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
"<link xref=\"using-categories\">category</link>, or a <link xref=\"calendar-"
"classifications\">classification</link> for the task, or add an attachment."
"classifications\">classification</link> (via the drop-down menu) for the "
"task, or add an attachment or set a <link xref=\"calendar-alarms-and-"
"reminders\">reminder</link> (via the corresponding tabs)."
msgstr ""
"Legen Sie auf Wunsch eine <link xref=\"calendar-timezones\">Zeitzone</link>, "
"eine <link xref=\"using-categories\">Kategorie</link> oder eine <link xref="
"\"calendar-classifications\">Einstufung</link> für die Aufgabe fest. Oder "
"Sie fügen einen Anhang hinzu."
"\"calendar-classifications\">Einstufung</link> mit Hilfe des Auswahlmenüs "
"für die Aufgabe fest. Oder Sie fügen einen Anhang hinzu oder legen eine "
"<link xref=\"calendar-alarms-and-reminders\">Erinnerung</link> fest."
#. (itstool) path: section/title
#: C/tasks-usage-add-task.page:37
......@@ -14475,3 +14460,27 @@ msgstr "Bearbeiten Sie den Titel oder die Suchbedingungen im Dialog."
#: C/xinclude-searching.xml:30
msgid "Click <_:gui-1/>."
msgstr "Klicken Sie auf <_:gui-1/>."
#~ msgid ""
#~ "In case it is not listed already, click <gui style=\"button\">Browse…</"
#~ "gui>. A file chooser dialog opens."
#~ msgstr ""
#~ "Falls es dort nicht schon aufgeführt ist, klicken Sie auf <gui style="
#~ "\"button\">Durchsuchen …</gui>. Daraufhin öffnet sich ein Dateiwähler."
#~ msgid ""
#~ "As <app>Evolution</app> stores its data in a hidden directory, press "
#~ "<keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar "
#~ "displayed."
#~ msgstr ""
#~ "Weil <app>Evolution</app> seine Daten in einem versteckten Ordner "
#~ "speichert, drücken Sie <keyseq><key>Strg</key><key>L</key></keyseq>, um "
#~ "zur Ortsleiste zu gelangen."
#~ msgid ""
#~ "Go to <file>~/.local/share/evolution/addressbook/system/addressbook.db</"
#~ "file> and click <gui style=\"button\">Open</gui>."
#~ msgstr ""
#~ "Suchen Sie nach <file>~/.local/share/evolution/addressbook/system/"
#~ "addressbook.db</file> und klicken Sie auf <gui style=\"button\">Öffnen</"
#~ "gui>."
This diff is collapsed.
This diff is collapsed.
......@@ -50,8 +50,8 @@ enum {
typedef struct {
char *charset;
char *format;
const char *charset;
const char *format;
int id;
} CharInfo;
......@@ -90,8 +90,8 @@ static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo);
static int
test_iconv (void)
{
char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
char *jp = (char *) "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
const char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
char *transbuf = malloc (10), *trans = transbuf;
iconv_t cd;
size_t jp_len = strlen (jp), utf8_len = 10;
......@@ -128,7 +128,7 @@ main (int argc,
if (!test_iconv ())
return 1;
fp = fopen ("iconv-detect.h", "w");
fp = fopen (ICONV_DETECT_BUILD_DIR "iconv-detect.h", "w");
if (fp == NULL)
return 255;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -414,13 +414,13 @@
<object class="GtkComboBox" id="combo-file-as">
<property name="name">file-as</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="model">model1</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">False</property>
<property name="can_focus">True</property>
</object>
</child>
</object>
......
......@@ -2845,7 +2845,7 @@ extract_simple_field (EContactEditor *editor,
if (GTK_IS_ENTRY (widget)) {
const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget));
e_contact_set (contact, field_id, (gchar *) text);
e_contact_set (contact, field_id, (text && *text) ? (gchar *) text : NULL);
} else if (GTK_IS_COMBO_BOX_TEXT (widget)) {
gchar *text = NULL;
......@@ -2859,7 +2859,7 @@ extract_simple_field (EContactEditor *editor,
if (!text)
text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (widget));
e_contact_set (contact, field_id, text);
e_contact_set (contact, field_id, (text && *text) ? text : NULL);
g_free (text);
} else if (GTK_IS_COMBO_BOX (widget)) {
......@@ -2885,7 +2885,7 @@ extract_simple_field (EContactEditor *editor,
-1);
}
e_contact_set (contact, field_id, text);
e_contact_set (contact, field_id, (text && *text) ? text : NULL);
g_free (text);
......@@ -2897,12 +2897,12 @@ extract_simple_field (EContactEditor *editor,
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
e_contact_set (contact, field_id, text);
e_contact_set (contact, field_id, (text && *text) ? text : NULL);
g_free (text);
} else if (E_IS_URL_ENTRY (widget)) {
const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget));
e_contact_set (contact, field_id, (gchar *) text);
e_contact_set (contact, field_id, (text && *text) ? (gchar *) text : NULL);
} else if (E_IS_DATE_EDIT (widget)) {
EContactDate date;
......
......@@ -245,6 +245,7 @@ eab_editor_show (EABEditor *editor)
g_return_if_fail (EAB_IS_EDITOR (editor));
class = EAB_EDITOR_GET_CLASS (editor);
g_return_if_fail (class != NULL);
g_return_if_fail (class->show != NULL);
class->show (editor);
......@@ -258,6 +259,7 @@ eab_editor_close (EABEditor *editor)
g_return_if_fail (EAB_IS_EDITOR (editor));
class = EAB_EDITOR_GET_CLASS (editor);
g_return_if_fail (class != NULL);
g_return_if_fail (class->close != NULL);
class->close (editor);
......@@ -271,6 +273,7 @@ eab_editor_raise (EABEditor *editor)
g_return_if_fail (EAB_IS_EDITOR (editor));
class = EAB_EDITOR_GET_CLASS (editor);
g_return_if_fail (class != NULL);
g_return_if_fail (class->raise != NULL);
class->raise (editor);
......@@ -285,6 +288,7 @@ eab_editor_save_contact (EABEditor *editor,
g_return_if_fail (EAB_IS_EDITOR (editor));
class = EAB_EDITOR_GET_CLASS (editor);
g_return_if_fail (class != NULL);
g_return_if_fail (class->save_contact != NULL);
class->save_contact (editor, should_close);
......@@ -298,6 +302,7 @@ eab_editor_is_changed (EABEditor *editor)
g_return_val_if_fail (EAB_IS_EDITOR (editor), FALSE);
class = EAB_EDITOR_GET_CLASS (editor);
g_return_val_if_fail (class != NULL, FALSE);
g_return_val_if_fail (class->is_changed != NULL, FALSE);
return class->is_changed (editor);
......@@ -311,6 +316,7 @@ eab_editor_is_valid (EABEditor *editor)
g_return_val_if_fail (EAB_IS_EDITOR (editor), FALSE);
class = EAB_EDITOR_GET_CLASS (editor);
g_return_val_if_fail (class != NULL, FALSE);
g_return_val_if_fail (class->is_valid != NULL, FALSE);
return class->is_valid (editor);
......@@ -324,6 +330,7 @@ eab_editor_get_window (EABEditor *editor)
g_return_val_if_fail (EAB_IS_EDITOR (editor), NULL);
class = EAB_EDITOR_GET_CLASS (editor);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->get_window != NULL, NULL);
return class->get_window (editor);
......
......@@ -9,7 +9,7 @@
</columns>
<data>
<row>
<col id="0" translatable="yes"/>
<col id="0" translatable="no"></col>
</row>
<row>
<col id="0" translatable="yes">Mr.</col>
......@@ -35,7 +35,7 @@
</columns>
<data>
<row>
<col id="0" translatable="yes"/>
<col id="0" translatable="no"></col>
</row>
<row>
<col id="0" translatable="yes">Sr.</col>
......
......@@ -285,13 +285,13 @@ contact_list_editor_add_email (EContactListEditor *editor,
addr = camel_internet_address_new ();
addr_length = camel_address_unformat (CAMEL_ADDRESS (addr), email);
if (addr_length >= 1) {
const gchar *name, *mail;
gint ii;
for (ii = 0; ii < addr_length; ii++) {
camel_internet_address_get (addr, ii, &name, &mail);
const gchar *name = NULL, *mail = NULL;
if (name || mail) {
if (camel_internet_address_get (addr, ii, &name, &mail) &&
(name || mail)) {
dest = e_destination_new ();
if (mail)
e_destination_set_email (dest, mail);
......
......@@ -45,8 +45,8 @@ struct _MergeContext {
guint pending_removals;
gboolean pending_adds;
gint remove_from_source : 1;
gint copy_done : 1;
guint remove_from_source : 1;
guint copy_done : 1;
};
enum {
......
......@@ -1153,13 +1153,12 @@ e_minicard_reflow (GnomeCanvasItem *item,
for (list = e_minicard->fields; list; list = g_list_next (list)) {
EMinicardField *field = E_MINICARD_FIELD (list->data);
/* Why not use the item that is passed in? */
GnomeCanvasItem *item = field->label;
GnomeCanvasItem *label_item = field->label;
g_object_get (
item,
label_item,
"height", &text_height,
NULL);
e_canvas_item_move_absolute (item, 2, e_minicard->height);
e_canvas_item_move_absolute (label_item, 2, e_minicard->height);
e_minicard->height += text_height;
}
e_minicard->height += 2;
......
......@@ -638,7 +638,7 @@ check_if_same (EContact *contact,
} else { /* Do pairwise-comparisons on all of the e-mail addresses. */
iter1 = email_attr_list1;
while (iter1) {
gboolean match = FALSE;
gboolean matches = FALSE;
EVCardAttribute *attr;
gchar *email_address1;
......@@ -646,14 +646,14 @@ check_if_same (EContact *contact,
email_address1 = e_vcard_attribute_get_value (attr);
iter2 = email_attr_list2;
while ( iter2 && match == FALSE) {
while ( iter2 && matches == FALSE) {
gchar *email_address2;
attr = iter2->data;
email_address2 = e_vcard_attribute_get_value (attr);
if (g_ascii_strcasecmp (email_address1, email_address2) == 0) {
match = TRUE;
matches = TRUE;
}
g_free (email_address2);
......@@ -663,7 +663,7 @@ check_if_same (EContact *contact,
g_free (email_address1);
iter1 = g_list_next (iter1);
if (match == FALSE) {
if (matches == FALSE) {
res = FALSE;
break;
}
......
......@@ -430,10 +430,10 @@ parseLine (CSVImporter *gci,
home_street = g_string_new ("");