...
 
Commits (61)
......@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
cmake_policy(VERSION 3.1)
project(evolution
VERSION 3.32.0
VERSION 3.32.2
LANGUAGES C)
set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution/issues/")
set(PROJECT_URL "http://wiki.gnome.org/Apps/Evolution/")
......
Evolution 3.32.1 2019-04-08
---------------------------
Bug Fixes:
I#190 - Meeting editor doesn't show addresses after open when set to (Milan Crha)
I#286 - Double click on month/year in minicalendar switches view to Day View (Milan Crha)
I#325 - F2 shortcut to Rename Folder stopped working (Milan Crha)
I#327 - Paragraph format change in quotation can break stored selection (Milan Crha)
I#336 - Change on an existing attendee not recognized by a meeting editor (Milan Crha)
I#339 - Include SUMMARY property in email reminders (Milan Crha)
I#343 - Composer autosave can overwrite backup with empty content (Milan Crha)
I#344 - Make 'next unread mail' shortcut jump to next folder (Milan Crha)
I#348 - Email addresses in composer reset after space deletion (Milan Crha)
I#359 - F6 key to switch between panes does not work (Milan Crha)
I#370 - A collection enable/disable in Accounts not reflected in the Mail view (Milan Crha)
I#373 - [Flatpak] Do not restart already running D-Bus services (Milan Crha)
I#376 - Interactive search in the “Folder Subscriptions” does nothing (Milan Crha)
I#378 - Inconsistent Icons for Tasks with Attendees in To-Do bar (Milan Crha)
I#386 - Forward as Attachment doesn't remember source message reference (Milan Crha)
I#390 - Free form expression search for Attachment doesn't work (Milan Crha)
I#392 - Template user variables not replaced with Alternative Reply (Milan Crha)
I#395 - Escape values in the task/memo preview (Milan Crha)
Miscellaneous:
Update flatpak 'master' version manifest (Milan Crha)
Expand/collapse buttons in vCard preview do nothing (Milan Crha)
Fix few memory leaks around vCard preview and mail attachment parsing (Milan Crha)
Fix some maybe uninitialized variable usages (Milan Crha)
Fix a copy&paste error with LC_TIME in emcu_change_locale() (Milan Crha)
[CompEditor] Use CSS3 color name in the iCalendar COLOR property (Milan Crha)
Update flatpak README (Milan Crha)
Fix two memory leaks (Milan Crha)
help: Cover customizing keyboard shortcuts (Andre Klapper)
help: A custom Archive mail folder requires to first set a general one (Andre Klapper)
help: New mail notification in mail icon is not a star anymore (Andre Klapper)
help: Update application icon for 3.32 (Andre Klapper)
Translations:
Марко Костић (sr)
Gianvito Cavasoli (it)
Daniel Șerbănescu (ro)
Tim Sabsch (de)
Matej Urbančič (sl)
Asier Sarasua Garmendia (eu)
Bruce Cowan (en_GB)
Daniel Șerbănescu (ro)
Jordi Mas (ca)
Ask Hjorth Larsen (da)
Anders Jonsson (sv)
Balázs Úr (hu)
Evolution 3.32.0 2019-03-11
---------------------------
......
......@@ -86,7 +86,8 @@ set(CMAKE_REQUIRED_LIBRARIES "${LDAP_LIBS}")
if(WITH_OPENLDAP)
CHECK_C_SOURCE_COMPILES("#include \"ldap.h\"
int main(void) {
#if !defined(LDAP_VENDOR_VERSION) || LDAP_VENDOR_VERSION < 20000
/* LDAP_VENDOR_VERSION is 0 if OpenLDAP is built from git/master */
#if !defined(LDAP_VENDOR_VERSION) || (LDAP_VENDOR_VERSION != 0 && LDAP_VENDOR_VERSION < 20000)
#error OpenLDAP version not at least 2.0
#endif
return 0; }" openldap_2_x)
......
......@@ -111,6 +111,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
set(_scangobj_cflags "${_scangobj_cflags} ${opt}")
endforeach(opt)
# first add target dependencies, to have built libraries first, then add those non-target dependencies
foreach(opt IN LISTS _scangobj_deps)
if(TARGET ${opt})
set(_target_type)
......@@ -129,11 +130,15 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
unset(_output_name)
endif((_target_type STREQUAL "STATIC_LIBRARY") OR (_target_type STREQUAL "SHARED_LIBRARY") OR (_target_type STREQUAL "MODULE_LIBRARY"))
unset(_target_type)
else(TARGET ${opt})
set(_scangobj_ldflags "${opt} ${_scangobj_ldflags}")
endif(TARGET ${opt})
endforeach(opt)
foreach(opt IN LISTS _scangobj_deps)
if(NOT TARGET ${opt})
set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
endif(NOT TARGET ${opt})
endforeach(opt)
set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
if(NOT (_scangobj_cflags STREQUAL ""))
......
......@@ -2,6 +2,13 @@ This directory contains files related to Flatpak build of Evolution. Apart
of Evolution itself, it builds also evolution-data-server, and uses it,
the same as evolution-ews for Exchange Web Services accounts.
=== Online version of the manual ===
An online version of this manual can be found here:
https://wiki.gnome.org/Apps/Evolution/Flatpak
=== Prerequisites ===
The build uses GNOME Flatpak SDK and runtime.
To build it, one can follow the below commands, which expect flatpak and
......@@ -9,67 +16,120 @@ 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 3.30) 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
key (line "runtime-version": "3.30",). 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:
Evolution uses GNOME SDK and Platform, which is current hosted on the flathub.
If there's preinstalled a flathub repository in the system, then skip
the flatpak remote-add command below. The GNOME SDK and Platform can be
installed with:
flatpak remote-add --from flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install flathub org.gnome.Platform//3.30
flatpak install flathub org.gnome.Sdk//3.30
If it's required to install the GNOME SDK and Platform only for the current
user, rather than system wide (also to not require root password), then
install it with --user argument, like this:
flatpak --user remote-add --from flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak --user install flathub org.gnome.Platform//3.30
flatpak --user install flathub org.gnome.Sdk//3.30
And that's all with respect of prerequisites. All the rest is handled
by Flatpak and Evolution build script.
=== Prepare the build directory ===
Choose a directory where the Flatpak will build Evolution. Let's use
a directory in the user home, like ~/flatpak, which can be prepared by:
mkdir ~/flatpak
cd ~/flatpak
Get the build script now, using wget command:
wget https://gitlab.gnome.org/GNOME/evolution/raw/master/flatpak/org.gnome.Evolution-stable.json
There's everything ready to start the build now.
$ flatpak remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo
$ flatpak install gnome org.gnome.Platform//3.26
$ flatpak install gnome org.gnome.Sdk//3.26
=== Build Evolution ===
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"
occurrences are replaced with "-stable":
To build Evolution in Flatpak, run the below command:
$ flatpak-builder --force-clean org.gnome.Evolution-master org.gnome.Evolution-master.json
flatpak-builder --force-clean org.gnome.Evolution-stable org.gnome.Evolution-stable.json
The above command can be repeated multiple times, for cases when the build fails
and any changes are required.
and flatpak-builder will do everything what is needed to build Evolution,
including downloading other dependencies and building them.
Once it's built, Flatpak requires the built application to be added as a repository,
which means to create, add and install it:
=== Flatpak repository ===
$ flatpak build-export repo-master org.gnome.Evolution-master
$ flatpak --user remote-add --no-gpg-verify --if-not-exists evolution-repo-master repo-master
$ flatpak --user install evolution-repo-master org.gnome.Evolution
Flatpak requires the local build to be part of a repository, thus create
one for it and add it to Flatpak:
And it's basically it. The last thing is to run the flatpak version of Evolution:
flatpak build-export repo-stable org.gnome.Evolution-stable
flatpak --user remote-add --no-gpg-verify --if-not-exists evolution-repo-stable repo-stable
$ flatpak run org.gnome.Evolution
Evolution can be installed from this repository now:
In some cases one might need to debug the build environment, which can be done
with the following command. It opens a bash terminal where can be examined
built data in the /app prefix:
flatpak --user install evolution-repo-stable org.gnome.Evolution
$ flatpak run --devel --command=bash org.gnome.Evolution
=== Run Evolution ===
A short command to rebuild any changes, refresh the repository and update
installed Evolution from this repository can look like:
To run the built Evolution, use this command:
$ flatpak-builder --force-clean org.gnome.Evolution-master org.gnome.Evolution-master.json && \
flatpak build-export repo-master org.gnome.Evolution-master && \
flatpak --user update org.gnome.Evolution
flatpak run org.gnome.Evolution
Note the above commands install the Evolution as a user repository, not
as a system repository, while the GNOME platform and SDK are installed
into the system repository (which requires root password). Add --user
argument to the first three commands at the top to avoid the root requirement.
And that's it.
Finally, to clean up installed Flatpak data, check what is installed:
=== Receiving updates ===
$ flatpak list
Evolution is built from git checkout, which allows to rebuild it from
the latest sources. To do so, move to the build folder and rebuild it:
cd ~/flatpak
flatpak-builder --force-clean org.gnome.Evolution-stable org.gnome.Evolution-stable.json
Once the build is done, its repository needs to be refreshed with the built
bits:
flatpak build-export repo-stable org.gnome.Evolution-stable
Finally, update Evolution from the refreshed repository with:
flatpak --user update org.gnome.Evolution
Then run Evolution as before:
flatpak run org.gnome.Evolution
The Flatpak build of Evolution shows the git commit ID in Help->About at which
the Evolution was when it had been built. It can be used to verify that
the build contains the latest changes.
=== Clean up Flatpak data ===
As a quick reference, in case of removing the Flatpak version of Evolution
from the system, check what is installed first:
flatpak list
and remove Evolution from there:
$ flatpak --user uninstall org.gnome.Evolution
flatpak --user uninstall org.gnome.Evolution
Then also check what repositories are installed:
$ flatpak remotes
flatpak remotes
and remove the custom Evolution repository with:
$ flatpak --user remote-delete evolution-repo-master
flatpak --user remote-delete evolution-repo-stable
Sometimes the build can fail or be stopped by the user, then
the flatpak-builder can left whole checkout without erasing it.
In such cases, the files are stored in ~/flatpak/.flatpak-builder/build.
The folder should be empty when nothing is building, thus remove anything
left there after the build ends.
{
"app-id": "org.gnome.Evolution",
"runtime": "org.gnome.Platform",
"runtime-version": "3.28",
"runtime-version": "3.30",
"sdk": "org.gnome.Sdk",
"command": "evolution",
"rename-icon": "evolution",
......@@ -206,7 +206,7 @@
},
{
"name": "gtkspell3",
"name": "gspell",
"config-opts": [
"--disable-gtk-doc",
"--disable-introspection",
......@@ -216,8 +216,8 @@
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz",
"sha256": "a4f4a4a2789f7499563e26d96b22d8085222ebe278da47d026b2de782b8b4d26"
"url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz",
"sha256": "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5"
}
]
},
......@@ -263,18 +263,48 @@
"else",
" export GIO_USE_NETWORK_MONITOR=base",
" gsettings reset org.gnome.evolution-data-server network-monitor-gio-name",
" /app/libexec/evolution-source-registry &",
" sleep 1",
" /app/libexec/evolution-addressbook-factory -r &",
" /app/libexec/evolution-calendar-factory -r &",
" sleep 1",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-source-registry &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@",
" fi",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-addressbook-factory -r &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@",
" fi",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-calendar-factory -r &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@",
" fi",
"",
" /app/bin/evolution.bin \"$@\"",
"fi"
],
"dest-filename": "flatpak-evolution-wrapper.sh"
"dest-filename": "flatpak-evolution-wrapper.sh.in"
},
{
"type": "script",
"commands": [
"# see https://gitlab.gnome.org/GNOME/glib/issues/1737",
"# previous versions used milliseconds instead of seconds as the timeout argument",
"(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
"",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
],
"post-install": [
"./flatpak-evolution-fix-service-names.sh <flatpak-evolution-wrapper.sh.in >flatpak-evolution-wrapper.sh",
"chmod a+x flatpak-evolution-wrapper.sh",
"mv /app/bin/evolution /app/bin/evolution.bin",
"cp flatpak-evolution-wrapper.sh /app/bin/evolution"
]
......
......@@ -184,7 +184,6 @@
"-DENABLE_DOT_LOCKING=OFF",
"-DENABLE_OAUTH2=ON",
"-DENABLE_GTK=ON",
"-DENABLE_UOA=OFF",
"-DENABLE_GOA=ON",
"-DENABLE_EXAMPLES=OFF",
"-DENABLE_INTROSPECTION=OFF",
......@@ -263,18 +262,48 @@
"else",
" export GIO_USE_NETWORK_MONITOR=base",
" gsettings reset org.gnome.evolution-data-server network-monitor-gio-name",
" /app/libexec/evolution-source-registry &",
" sleep 1",
" /app/libexec/evolution-addressbook-factory -r &",
" /app/libexec/evolution-calendar-factory -r &",
" sleep 1",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-source-registry &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@",
" fi",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-addressbook-factory -r &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@",
" fi",
"",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-calendar-factory -r &",
" gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@",
" fi",
"",
" /app/bin/evolution.bin \"$@\"",
"fi"
],
"dest-filename": "flatpak-evolution-wrapper.sh"
"dest-filename": "flatpak-evolution-wrapper.sh.in"
},
{
"type": "script",
"commands": [
"# see https://gitlab.gnome.org/GNOME/glib/issues/1737",
"# previous versions used milliseconds instead of seconds as the timeout argument",
"(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
"",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
],
"post-install": [
"./flatpak-evolution-fix-service-names.sh <flatpak-evolution-wrapper.sh.in >flatpak-evolution-wrapper.sh",
"chmod a+x flatpak-evolution-wrapper.sh",
"mv /app/bin/evolution /app/bin/evolution.bin",
"cp flatpak-evolution-wrapper.sh /app/bin/evolution"
]
......
......@@ -6,7 +6,7 @@
<link type="seealso" xref="mail-layout-changing"/>
<link type="seealso" xref="calendar-layout"/>
<revision pkgversion="3.25.90" version="0.1" date="2017-07-28" status="final"/>
<revision pkgversion="3.32.0" version="0.2" date="2019-03-14" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
......@@ -15,7 +15,7 @@
<include href="legal.xml" xmlns="https://www.w3.org/2001/XInclude"/>
<desc>Moving and changing tool bar buttons and entries in the main menu.</desc>
<desc>Moving and changing tool bar buttons, menu entries, and keyboard shortcuts.</desc>
</info>
<title>Customizing tool bar and menu items</title>
......@@ -33,4 +33,6 @@ Modify the files in your personal configuration folder so the next <app>Evolutio
<p>The modified files will be used if the <code>evolution-ui-version</code> attribute of the root <code>ui</code> element matches the version of the default files provided by <app>Evolution</app>.</p>
<p>To change keyboard shortcuts, edit <file>~/.config/evolution/accels</file> while <app>Evolution</app> is not running. Commented lines start with a comma character. Not all shortcuts can be changed though.</p>
</page>
help/C/figures/evolutionlogo.png

3.57 KB | W: | H:

help/C/figures/evolutionlogo.png

2.24 KB | W: | H:

help/C/figures/evolutionlogo.png
help/C/figures/evolutionlogo.png
help/C/figures/evolutionlogo.png
help/C/figures/evolutionlogo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -15,7 +15,7 @@
<link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#defaults"/>
<link type="guide" xref="mail-account-manage-microsoft-exchange-evo-ews#defaults"/>
<revision pkgversion="3.13.90" version="0.3" date="2015-03-09" status="final"/>
<revision pkgversion="3.32.0" version="0.4" date="2019-03-14" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
<email its:translate="no">ak-47@gmx.net</email>
......@@ -29,7 +29,7 @@
<title>Mail folder locations</title>
<p>You can set a different place where to store messages in your <gui>Draft</gui> folder and <gui>Sent</gui> folder in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
<p>You can define an <gui>Archive Folder</gui>, for example to move older messages there. Selecting <guiseq><gui>Message</gui><gui>Archive</gui></guiseq> in the main window moves the selected message to the specified folder.</p>
<p>You can define an <gui>Archive Folder</gui> for this account to move older messages there. This requires to first set a fallback folder under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Archive Mail</gui></guiseq>. Selecting <guiseq><gui>Message</gui><gui>Archive</gui></guiseq> in the main window moves the selected message to the specified folder.</p>
<p>For remote account types (accounts such as IMAP) you can also use folders on the mail server for Junk and Trash by selecting the corresponding <gui>Use a Real Folder</gui> option. In this case, <app>Evolution</app>'s local <link xref="mail-search-folders">virtual folders</link> will not be used.</p>
</page>
......@@ -7,7 +7,7 @@
<link type="guide" xref="mail-send-and-receive" />
<link type="seealso" xref="calendar-alarms-and-reminders" />
<revision pkgversion="3.0.2" version="0.6" date="2017-07-28" status="final"/>
<revision pkgversion="3.32.0" version="0.7" date="2019-03-15" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
<email its:translate="no">ak-47@gmx.net</email>
......@@ -20,7 +20,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>
<p><app>Evolution</app> always notifies you of new messages by adding a small emblem to the mailer icon in the window <link xref="intro-main-window">switcher</link>.</p>
<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>
......
This diff is collapsed.
......@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution-help.master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n"
"POT-Creation-Date: 2019-03-01 16:30+0000\n"
"PO-Revision-Date: 2019-03-06 07:44+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
"POT-Creation-Date: 2019-03-15 17:01+0000\n"
"PO-Revision-Date: 2019-03-29 22:24+0100\n"
"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
......@@ -26,8 +26,8 @@ msgstr ""
msgctxt "_"
msgid "translator-credits"
msgstr ""
"Bence Lukács <lukacs.bence1 at gmail dot com>, 2011.\n"
"Gabor Kelemen <kelemeng at gnome dot hu>, 2011, 2012, 2013, 2015, 2017, "
"Lukács Bence <lukacs.bence1 at gmail dot com>, 2011.\n"
"Kelemen Gábor <kelemeng at gnome dot hu>, 2011, 2012, 2013, 2015, 2017, "
"2018.\n"
"Nagy Zoltán <dzodzie at gmail dot com>, 2011.\n"
"Úr Balázs <ur.balazs at fsf dot hu>, 2014, 2019."
......@@ -2664,8 +2664,10 @@ msgstr ""
#. (itstool) path: info/desc
#: C/customize-ui-items.page:18
msgid "Moving and changing tool bar buttons and entries in the main menu."
msgstr "Eszköztárgombok és főmenü-bejegyzések mozgatása és módosítása."
msgid ""
"Moving and changing tool bar buttons, menu entries, and keyboard shortcuts."
msgstr ""
"Eszköztárgombok, menübejegyzések és gyorsbillentyűk mozgatása és módosítása."
#. (itstool) path: page/title
#: C/customize-ui-items.page:21
......@@ -2723,6 +2725,18 @@ msgstr ""
"elem <code>evolution-ui-version</code> attribútuma megegyezik az "
"<app>Evolution</app> által biztosított alapértelmezett fájlokéval."
#. (itstool) path: page/p
#: C/customize-ui-items.page:36
msgid ""
"To change keyboard shortcuts, edit <file>~/.config/evolution/accels</file> "
"while <app>Evolution</app> is not running. Commented lines start with a "
"comma character. Not all shortcuts can be changed though."
msgstr ""
"A gyorsbillentyűk megváltoztatásához szerkessze a <file"
">~/.config/evolution/accels</file> fájlt, miközben az <app>Evolution</app> "
"nem fut. A megjegyzésre állított sorok vessző karakterrel kezdődnek. Habár "
"nem minden gyorsbillentyűt lehet megváltoztatni."
#. (itstool) path: info/desc
#: C/data-storage.page:5
msgid "Where does <app>Evolution</app> store my data on the harddisk?"
......@@ -3544,19 +3558,6 @@ msgstr ""
#. (itstool) path: note/p
#: C/import-single-files.page:32
#| msgid ""
#| "When setting <gui>File type</gui> to <gui>Contacts CSV or Tab</gui>, the "
#| "column headers must correspond to the first entry in each item in English "
#| "in the importer code for <link href=\"https://git.gnome.org/browse/"
#| "evolution/tree/src/addressbook/importers/evolution-csv-importer.c?"
#| "id=bc5f32786d09823247d8188c5f211dcd354097de#n228\"><app>Evolution</app></"
#| "link>, <link href=\"https://git.gnome.org/browse/evolution/tree/src/"
#| "addressbook/importers/evolution-csv-importer.c?"
#| "id=bc5f32786d09823247d8188c5f211dcd354097de#n188\"><app>Mozilla</app></"
#| "link> and <link href=\"https://git.gnome.org/browse/evolution/tree/src/"
#| "addressbook/importers/evolution-csv-importer.c?"
#| "id=bc5f32786d09823247d8188c5f211dcd354097de#n93\"><app>Outlook</app></"
#| "link>."
msgid ""
"When setting <gui>File type</gui> to <gui>Contacts CSV or Tab</gui>, the "
"column headers must correspond to the first entry in each item in English in "
......@@ -3572,16 +3573,15 @@ msgid ""
msgstr ""
"A <gui>Fájltípus</gui> <gui>Névjegyek CSV vagy Tab</gui> formátumra "
"állításakor az oszlopfejléceknek meg kell felelniük minden elemben az első "
"bejegyzés angol nevének az importáló kódban az <link"
" href=\"https://gitlab.gnome.org/GNOME/evolution/blob/bc5f32786d09823247d8188c"
"5f211dcd354097de/src/addressbook/importers/evolution-csv-importer.c#L228\"><"
"app>Evolution</app></"
"link>, <link href=\"https://gitlab.gnome.org/GNOME/evolution/blob/bc5f32786d09"
"823247d8188c5f211dcd354097de/src/addressbook/importers/evolution-csv-importer."
"c#L188\"><app>Mozilla</app></link> és <link"
" href=\"https://gitlab.gnome.org/GNOME/evolution/blob/bc5f32786d09823247d8188c"
"5f211dcd354097de/src/addressbook/importers/evolution-csv-importer.c#L93\"><"
"app>Outlook</app></link> esetén is."
"bejegyzés angol nevének az importáló kódban az <link href=\"https://gitlab."
"gnome.org/GNOME/evolution/blob/bc5f32786d09823247d8188c5f211dcd354097de/src/"
"addressbook/importers/evolution-csv-importer.c#L228\"><app>Evolution</app></"
"link>, <link href=\"https://gitlab.gnome.org/GNOME/evolution/blob/"
"bc5f32786d09823247d8188c5f211dcd354097de/src/addressbook/importers/evolution-"
"csv-importer.c#L188\"><app>Mozilla</app></link> és <link href=\"https://"
"gitlab.gnome.org/GNOME/evolution/blob/"
"bc5f32786d09823247d8188c5f211dcd354097de/src/addressbook/importers/evolution-"
"csv-importer.c#L93\"><app>Outlook</app></link> esetén is."
#. (itstool) path: info/desc
#: C/import-supported-file-formats.page:5
......@@ -5379,7 +5379,8 @@ msgstr ""
#. (itstool) path: info/desc
#: C/mail-account-manage-imap-plus.page:5
msgid "Add and edit an IMAP+ mail account in <app>Evolution</app>."
msgstr "IMAP+ levelezőfiók hozzáadása és szerkesztése."
msgstr ""
"IMAP+ levelezőfiók hozzáadása és szerkesztése az <app>Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-imap-plus.page:20
......@@ -5580,7 +5581,9 @@ msgstr ""
#. (itstool) path: info/desc
#: C/mail-account-manage-local-delivery.page:5
msgid "Add and edit a Local Delivery account in <app>Evolution</app>."
msgstr "Helyi kézbesítésű levelezőfiók hozzáadása és szerkesztése."
msgstr ""
"Helyi kézbesítésű levelezőfiók hozzáadása és szerkesztése az <app"
">Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-local-delivery.page:20
......@@ -5637,7 +5640,9 @@ msgstr "Biztonság (helyi kézbesítésű fiókok)"
msgid ""
"Add and edit a Maildir Format Mail Directories account in <app>Evolution</"
"app>."
msgstr "Maildir formátumú levélkönyvtárak hozzáadása és szerkesztése."
msgstr ""
"Maildir formátumú levélkönyvtárak hozzáadása és szerkesztése az <app"
">Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-maildir-format-directories.page:20
......@@ -5712,7 +5717,9 @@ msgstr "Vállalati fióktípusok"
#: C/mail-account-manage-mh-format-directories.page:5
msgid ""
"Add and edit a MH Format Mail Directories account in <app>Evolution</app>."
msgstr "MH formátumú levélkönyvtárak hozzáadása és szerkesztése."
msgstr ""
"MH formátumú levélkönyvtárak hozzáadása és szerkesztése az <app>Evolutionben<"
"/app>."
#. (itstool) path: page/title
#: C/mail-account-manage-mh-format-directories.page:20
......@@ -5756,7 +5763,9 @@ msgstr "Biztonság (MH-formátumú levélkönyvtár fiókok)"
msgid ""
"Add and edit a Microsoft Exchange 2007 or 2010 account in <app>Evolution</"
"app>."
msgstr "Microsoft Exchange 2007 vagy 2010 fiók hozzáadása és szerkesztése."
msgstr ""
"Microsoft Exchange 2007 vagy 2010 fiók hozzáadása és szerkesztése az <app"
">Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-microsoft-exchange-evo-ews.page:20
......@@ -5819,7 +5828,9 @@ msgstr ""
#. (itstool) path: info/desc
#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5
msgid "Add and edit a Microsoft Exchange MAPI account in <app>Evolution</app>."
msgstr "Microsoft Exchange MAPI fiók hozzáadása és szerkesztése."
msgstr ""
"Microsoft Exchange MAPI fiók hozzáadása és szerkesztése az <app>Evolutionben<"
"/app>."
#. (itstool) path: page/title
#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:20
......@@ -5863,7 +5874,8 @@ msgstr "Biztonság (Exchange MAPI fiókok)"
#. (itstool) path: info/desc
#: C/mail-account-manage-microsoft-exchange.page:7
msgid "Add and edit a Microsoft Exchange account in <app>Evolution</app>."
msgstr "Microsoft Exchange fiók hozzáadása és szerkesztése."
msgstr ""
"Microsoft Exchange fiók hozzáadása és szerkesztése az <app>Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-microsoft-exchange.page:22
......@@ -5928,7 +5940,8 @@ msgstr ""
#. (itstool) path: info/desc
#: C/mail-account-manage-pop.page:5
msgid "Add and edit a POP mail account in <app>Evolution</app>."
msgstr "POP levelezőfiók hozzáadása és szerkesztése."
msgstr ""
"POP levelezőfiók hozzáadása és szerkesztése az <app>Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-pop.page:20
......@@ -5970,7 +5983,9 @@ msgstr "Biztonság (POP fiókok)"
msgid ""
"Add and edit a Standard Unix mbox Spool Directory account in <app>Evolution</"
"app>."
msgstr "Szabványos Unix mbox tárolókönyvtár fiók hozzáadása és szerkesztése."
msgstr ""
"Szabványos Unix mbox tárolókönyvtár fiók hozzáadása és szerkesztése az <app"
">Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-unix-mbox-spool-directory.page:20
......@@ -6015,7 +6030,9 @@ msgstr "Biztonság (szabványos Unix mbox tárolókönyvtár fiókok)"
#: C/mail-account-manage-unix-mbox-spool-file.page:5
msgid ""
"Add and edit a Standard Unix mbox Spool File account in <app>Evolution</app>."
msgstr "Szabványos Unix mbox tárolófájl fiók hozzáadása és szerkesztése."
msgstr ""
"Szabványos Unix mbox tárolófájl fiók hozzáadása és szerkesztése az <app"
">Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-unix-mbox-spool-file.page:20
......@@ -6059,7 +6076,7 @@ msgstr "Biztonság (szabványos Unix mbox tárolófájl fiókok)"
#. (itstool) path: info/desc
#: C/mail-account-manage-usenet-news.page:5
msgid "Add and edit a Usenet news account in <app>Evolution</app>."
msgstr "Usenet hírfiók hozzáadása és szerkesztése."
msgstr "Usenet hírfiók hozzáadása és szerkesztése az <app>Evolutionben</app>."
#. (itstool) path: page/title
#: C/mail-account-manage-usenet-news.page:20
......@@ -6519,14 +6536,6 @@ msgstr ""
#. (itstool) path: note/p
#: C/mail-change-columns-in-message-list.page:27
#: C/mail-sorting-message-list.page:57
#| msgid ""
#| "If you would like to have the same column layout in all mail folders "
#| "except for the <gui>Sent</gui> folder, you can enable <guiseq><gui>Edit</"
#| "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
#| "gui><gui>Apply the same view settings to all folders</gui></guiseq>. Note "
#| "that this setting also influences <link xref=\"mail-sorting-message-"
#| "list#email-threads\"><gui>Group by Threads</gui></link> and the "
#| "<gui>Message Preview</gui> visibility in all folders."
msgid ""
"If you would like to have a different sort order and/or columns for specific "
"mail folders, make sure that <guiseq><gui>Edit</gui><gui>Preferences</"
......@@ -6536,14 +6545,13 @@ msgid ""
"gui><gui>Save Custom View…</gui></guiseq> and apply the view also to other "
"folders."
msgstr ""
"Ha eltérő sorrendet és/vagy oszlopokat szeretne látni az egyes"
" levélmappákban, akkor kapcsolja ki a "
"<guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui><gui>Levelezés "
"beállításai</gui><gui>Általános</gui><gui>Ugyanazon nézetbeállítások "
"használata minden mappára</gui></guiseq> jelölőnégyzetet. Ezután módosíthatja"
" nézetet és mentheti módosításait a <guiseq><gui>Nézet</gui><gui>Jelenlegi"
" nézet</gui><gui>Egyéni nézet mentése</gui></guiseq> alatt, és ezt a nézetet"
" más mappákra is alkalmazhatja."
"Ha eltérő sorrendet és/vagy oszlopokat szeretne látni az egyes "
"levélmappákban, akkor kapcsolja ki a <guiseq><gui>Szerkesztés</"
"gui><gui>Beállítások</gui><gui>Levelezés beállításai</gui><gui>Általános</"
"gui><gui>Ugyanazon nézetbeállítások használata minden mappára</gui></guiseq> "
"jelölőnégyzetet. Ezután módosíthatja nézetet és mentheti módosításait a "
"<guiseq><gui>Nézet</gui><gui>Jelenlegi nézet</gui><gui>Egyéni nézet mentése</"
"gui></guiseq> alatt, és ezt a nézetet más mappákra is alkalmazhatja."
#. (itstool) path: info/desc
#: C/mail-change-time-format.page:5
......@@ -8531,15 +8539,20 @@ msgstr ""
#. (itstool) path: page/p
#: C/mail-default-folder-locations.page:32
msgid ""
"You can define an <gui>Archive Folder</gui>, for example to move older "
"messages there. Selecting <guiseq><gui>Message</gui><gui>Archive</gui></"
"guiseq> in the main window moves the selected message to the specified "
"folder."
"You can define an <gui>Archive Folder</gui> for this account to move older "
"messages there. This requires to first set a fallback folder under "
"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
"gui><gui>General</gui><gui>Archive Mail</gui></guiseq>. Selecting "
"<guiseq><gui>Message</gui><gui>Archive</gui></guiseq> in the main window "
"moves the selected message to the specified folder."
msgstr ""
"Megadhat egy <gui>Archívum mappát</gui>, például a régebbi üzenetek "
"áthelyezéséhez. A főablakban az <guiseq><gui>Üzenet</gui><gui>Archiválás</"
"gui></guiseq> menüpont kiválasztásakor a kijelölt üzenet áthelyezésre kerül "
"a megadott mappába."
"Megadhat egy <gui>Archívum mappát</gui> ehhez a fiókhoz a régebbi üzenetek "
"áthelyezéséhez. Ehhez az szükséges, hogy először beállítson egy tartalék "
"mappát a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui><gui>Levelezés "
"beállításai</gui><gui>Általános</gui><gui>Levél archiválása</gui></guiseq> "
"alatt. A főablakban az <guiseq><gui>Üzenet</gui><gui>Archiválás</gui><"
"/guiseq> menüpont kiválasztásakor a kijelölt üzenet áthelyezésre kerül a "
"megadott mappába."
#. (itstool) path: page/p
#: C/mail-default-folder-locations.page:33
......@@ -10687,11 +10700,11 @@ msgstr "Értesítés új levelekről"
#. (itstool) path: page/p
#: C/mail-received-notification.page:23
msgid ""
"<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"
"<app>Evolution</app> always notifies you of new messages by adding a small "
"emblem to the mailer icon in the window <link xref=\"intro-main-window"
"\">switcher</link>."
msgstr ""
"Az <app>Evolution</app> mindig értesíti az új levelekről egy sárga csillag "
"Az <app>Evolution</app> mindig értesíti az új levelekről egy kis embléma "
"hozzáadásával a levelezőikonhoz az <link xref=\"intro-main-window"
"\">ablakváltóban</link>."
......@@ -11910,21 +11923,17 @@ msgid ""
"For Advanced Users: By default, all email threads are expanded. If you want "
"all threads to be collapsed by default:"
msgstr ""
"Tapasztalt felhasználóknak: alapesetben minden e-mail szál ki van bontva. Ha"
" alapesetben összecsukva szeretné ezeket látni:"
"Tapasztalt felhasználóknak: alapesetben minden e-mail szál ki van bontva. Ha "
"alapesetben összecsukva szeretné ezeket látni:"
#. (itstool) path: item/p
#: C/mail-sorting-message-list.page:41
#| msgid ""
#| "Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-"
#| "actions true</cmd>"
msgid ""
"Run the command <cmd>gsettings set org.gnome.evolution.mail thread-expand "
"false</cmd>"
msgstr ""
"Futtassa a következő parancsot: <cmd>gsettings set org.gnome.evolution.mail"
" thread-expand "
"false</cmd>"
"Futtassa a következő parancsot: <cmd>gsettings set org.gnome.evolution.mail "
"thread-expand false</cmd>"
#. (itstool) path: section/title
#: C/mail-sorting-message-list.page:47
......@@ -14344,23 +14353,3 @@ msgstr "Szerkessze a címet vagy a keresési feltételeket az ablakban."
#: C/xinclude-searching.xml:30
msgid "Click <_:gui-1/>."
msgstr "Kattintson az <_:gui-1/> gombra."
#~ msgid ""
#~ "For Advanced Users: There is a GSettings key that allows you to toggle "
#~ "between the collapsed and expanded state of the email threads. The "
#~ "collapsed state is enabled by default. It can be changed by starting the "
#~ "<app>Terminal</app> application and running the command <cmd>gsettings "
#~ "set org.gnome.evolution.mail thread-expand true</cmd>"
#~ msgstr ""
#~ "Gyakorlott felhasználóknak: az e-mail szálak összecsukott és kibontott "
#~ "állapota között egy GSettings kulcs használatával válthat. Alapesetben az "
#~ "összecsukott állapot van engedélyezve, ez módosítható a <app>Terminálban</"
#~ "app> kiadott <cmd>gsettings set org.gnome.evolution.mail thread-expand "
#~ "true</cmd> parancs használatával."
#~ msgid ""
#~ "Run the command <cmd>gsettings set org.gnome.desktop.interface can-change-"
#~ "accels true</cmd>"
#~ msgstr ""
#~ "Futtassa a következő parancsot: <cmd>gsettings set org.gnome.desktop."
#~ "interface can-change-accels true</cmd>"
......@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: evolution.help.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution&keywords=I18N+L10N&component=User%20Documentation\n"
"POT-Creation-Date: 2019-03-01 16:30+0000\n"
"PO-Revision-Date: 2019-03-01 22:00+0100\n"
"POT-Creation-Date: 2019-03-15 19:21+0000\n"
"PO-Revision-Date: 2019-03-15 21:21+0100\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
......@@ -2648,8 +2648,10 @@ msgstr ""
#. (itstool) path: info/desc
#: C/customize-ui-items.page:18
msgid "Moving and changing tool bar buttons and entries in the main menu."
msgstr "Flytta och ändra verktygsfältsknappar och poster i huvudmenyn."
msgid ""
"Moving and changing tool bar buttons, menu entries, and keyboard shortcuts."
msgstr ""
"Flytta och ändra verktygsfältsknappar, menyposter och tangentbordsgenvägar."
#. (itstool) path: page/title
#: C/customize-ui-items.page:21
......@@ -2710,6 +2712,17 @@ msgstr ""
"version</code> för rotelementet <code>ui</code> matchar versionen för "
"standardfilerna som tillhandahålls av <app>Evolution</app>."
#. (itstool) path: page/p
#: C/customize-ui-items.page:36
msgid ""
"To change keyboard shortcuts, edit <file>~/.config/evolution/accels</file> "
"while <app>Evolution</app> is not running. Commented lines start with a "
"comma character. Not all shortcuts can be changed though."
msgstr ""
"För att ändra tangentbordsgenvägar, redigera <file>~/.config/evolution/"
"accels</file> medan <app>Evolution</app> inte körs. Kommenterade rader "
"startar med ett kommatecken. Alla kortkommandon kan dock inte ändras."
#. (itstool) path: info/desc
#: C/data-storage.page:5
msgid "Where does <app>Evolution</app> store my data on the harddisk?"
......@@ -8496,13 +8509,18 @@ msgstr ""
#. (itstool) path: page/p
#: C/mail-default-folder-locations.page:32
msgid ""
"You can define an <gui>Archive Folder</gui>, for example to move older "
"messages there. Selecting <guiseq><gui>Message</gui><gui>Archive</gui></"
"guiseq> in the main window moves the selected message to the specified "
"folder."
msgstr ""
"Du kan definiera en <gui>Arkivmapp</gui> för att till exempel flytta äldre "
"meddelanden dit. Om du väljer <guiseq><gui>Meddelande</gui><gui>Arkiv</gui></"
"You can define an <gui>Archive Folder</gui> for this account to move older "
"messages there. This requires to first set a fallback folder under "
"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
"gui><gui>General</gui><gui>Archive Mail</gui></guiseq>. Selecting "
"<guiseq><gui>Message</gui><gui>Archive</gui></guiseq> in the main window "
"moves the selected message to the specified folder."
msgstr ""
"Du kan definiera en <gui>Arkiveringsmapp</gui> för detta konto för att "
"flytta äldre meddelanden dit. Detta kräver att du först ställer in en mapp "
"att falla tillbaka till under <guiseq><gui>Redigera</gui><gui>Inställningar</"
"gui><gui>E-postinställningar</gui><gui>Allmänt</gui><gui>Arkivera e-post</"
"gui></guiseq>. Om du väljer <guiseq><gui>Meddelande</gui><gui>Arkiv</gui></"
"guiseq> i huvudfönstret kommer det valda meddelandet att flyttas till den "
"angivna mappen."
......@@ -10648,12 +10666,12 @@ msgstr "Bli aviserad om ny e-post"
#. (itstool) path: page/p
#: C/mail-received-notification.page:23
msgid ""
"<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"
"<app>Evolution</app> always notifies you of new messages by adding a small "
"emblem to the mailer icon in the window <link xref=\"intro-main-window"
"\">switcher</link>."
msgstr ""
"<app>Evolution</app> aviserar alltid dig om nya meddelanden genom att lägga "
"till en gul stjärna till e-postikonen i <link xref=\"intro-main-window"
"till ett litet emblem till e-postikonen i <link xref=\"intro-main-window"
"\">fönsterväxlaren</link>."
#. (itstool) path: page/media
......
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.
......@@ -8,11 +8,12 @@
# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2017.
# Марко М. Костић <marko.m.kostic@gmail.com>, 2015—2016.
# Борисав Живановић <borisavzivanovic@gmail.com>, 2017.
#: ../src/shell/main.c:527
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n"
"POT-Creation-Date: 2019-03-01 15:46+0000\n"
"POT-Creation-Date: 2019-03-06 16:23+0000\n"
"PO-Revision-Date: 2019-03-06 18:38+0100\n"
"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
"Language-Team: српски <gnome-sr@googlegroups.org>\n"
......@@ -7378,7 +7379,7 @@ msgstr "Време почетка није исправно време"
#: ../src/calendar/gui/e-comp-editor.c:337
#: ../src/em-format/e-mail-part-secure-button.c:93
#: ../src/e-util/e-misc-utils.c:4218 ../src/e-util/e-misc-utils.c:4230
#: ../src/e-util/e-misc-utils.c:4244 ../src/mail/e-mail-autoconfig.c:1027
#: ../src/e-util/e-misc-utils.c:4244 ../src/mail/e-mail-autoconfig.c:1029
#: ../src/mail/e-mail-display.c:2292 ../src/mail/e-mail-reader-utils.c:805
#: ../src/mail/em-composer-utils.c:3969 ../src/mail/em-composer-utils.c:4000
#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
......@@ -13468,7 +13469,7 @@ msgstr "Пронађите ставке које задовољавају сле
#: ../src/e-util/e-mail-identity-combo-box.c:694
#: ../src/e-util/e-mail-signature-combo-box.c:422
#: ../src/libemail-engine/camel-null-store.c:29
#: ../src/mail/e-mail-autoconfig.c:764
#: ../src/mail/e-mail-autoconfig.c:766
#: ../src/mail/e-mail-config-summary-page.c:141
#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
msgid "None"
......@@ -16536,57 +16537,57 @@ msgstr "Под_разумевано"
msgid "Invalid URI: “%s”"
msgstr "Неисправан УРИ: „%s“"
#: ../src/mail/e-mail-autoconfig.c:754
#: ../src/mail/e-mail-autoconfig.c:756
#, c-format
msgid "Host: %s:%d"
msgstr "Домаћин: %s:%d"
#: ../src/mail/e-mail-autoconfig.c:758
#: ../src/mail/e-mail-autoconfig.c:760
#, c-format
msgid "User: %s"
msgstr "Корисник: %s"
#: ../src/mail/e-mail-autoconfig.c:762
#: ../src/mail/e-mail-autoconfig.c:764
#, c-format
msgid "Security method: %s"
msgstr "Метода безбедности: %s"
#: ../src/mail/e-mail-autoconfig.c:763
#: ../src/mail/e-mail-autoconfig.c:765
#: ../src/mail/e-mail-config-summary-page.c:144
msgid "TLS"
msgstr "ТЛС"
#: ../src/mail/e-mail-autoconfig.c:764
#: ../src/mail/e-mail-autoconfig.c:766
#: ../src/mail/e-mail-config-summary-page.c:147
msgid "STARTTLS"
msgstr "СТАРТТЛС"
#: ../src/mail/e-mail-autoconfig.c:768
#: ../src/mail/e-mail-autoconfig.c:770
#, c-format
msgid "Authentication mechanism: %s"
msgstr "Механизам за идентификовање: %s"
#: ../src/mail/e-mail-autoconfig.c:948
#: ../src/mail/e-mail-autoconfig.c:950
msgid "No email address provided"
msgstr "Није достављена адреса е-поште"
#: ../src/mail/e-mail-autoconfig.c:957
#: ../src/mail/e-mail-autoconfig.c:959
msgid "Missing domain in email address"
msgstr "Недостаје домен у адреси е-поште"
#: ../src/mail/e-mail-autoconfig.c:1307
#: ../src/mail/e-mail-autoconfig.c:1309
#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
msgid "IMAP server"
msgstr "IMAP сервер"
#: ../src/mail/e-mail-autoconfig.c:1314
#: ../src/mail/e-mail-autoconfig.c:1316
#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
msgid "POP3 server"
msgstr "POP3 сервер"
#: ../src/mail/e-mail-autoconfig.c:1321
#: ../src/mail/e-mail-autoconfig.c:1323
#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
msgid "SMTP server"
msgstr "SMTP сервер:"
......@@ -23274,7 +23275,7 @@ msgstr "LDAP сервер"
msgid "Looking up LDAP server…"
msgstr "Потражујем LDAP сервер…"
#: ../src/modules/config-lookup/e-srv-config-lookup.c:240
#: ../src/modules/config-lookup/e-srv-config-lookup.c:242
msgid "Look up in SRV records"
msgstr "Потражи унутар SRV записа"
......@@ -534,8 +534,8 @@ eab_contact_display_init (EABContactDisplay *display)
display, "web-process-crashed",
G_CALLBACK (contact_display_web_process_crashed_cb), NULL);
e_signal_connect_notify (
web_view, "notify::load-changed",
g_signal_connect (
web_view, "load-changed",
G_CALLBACK (contact_display_load_changed), NULL);
g_signal_connect (
web_view, "style-updated",
......
......@@ -1154,6 +1154,8 @@ render_compact (EABContactFormatter *formatter,
}
}
g_list_free_full (email_list, g_free);
g_string_append (buffer, "</td></tr></table>");
} else {
......
......@@ -182,6 +182,30 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
return e_datetime_format_format_tm ("calendar", "table", itt.is_date ? DTFormatKindDate : DTFormatKindDateTime, &tm);
}
static void
cal_component_preview_add_table_line (GString *buffer,
const gchar *header,
const gchar *value)
{
gchar *markup_header, *markup_value;
g_return_if_fail (buffer != NULL);
if (!value || !*value)
return;
markup_header = header ? g_markup_escape_text (header, -1) : NULL;
markup_value = g_markup_escape_text (value, -1);
g_string_append_printf (buffer,
"<tr><th>%s</th><td>%s</td></tr>",
markup_header ? markup_header : "",
markup_value);
g_free (markup_header);
g_free (markup_value);
}
static void
cal_component_preview_write_html (ECalComponentPreview *preview,
GString *buffer)
......@@ -197,8 +221,9 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
icalcomponent *icalcomp;
icalproperty *icalprop;
icalproperty_status status;
const gchar *location, *url;
const gchar *location, *url, *tmp;
gint *priority_value;
gchar *markup;
client = preview->priv->client;
comp = preview->priv->comp;
......@@ -210,18 +235,23 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
g_string_append (buffer, HTML_HEADER);
g_string_append (buffer, "<body class=\"-e-web-view-background-color -e-web-view-text-color\">");
markup = g_markup_escape_text (text.value ? text.value : _("Untitled"), -1);
if (text.value)
g_string_append_printf (buffer, "<h2>%s</h2>", text.value);
g_string_append_printf (buffer, "<h2>%s</h2>", markup);
else
g_string_append_printf (buffer, "<h2><i>%s</i></h2>",_("Untitled"));
g_string_append_printf (buffer, "<h2><i>%s</i></h2>", markup);
g_free (markup);
g_string_append (buffer, "<table border=\"0\" cellspacing=\"5\">");
/* write icons for the categories */
string = g_string_new (NULL);
e_cal_component_get_categories_list (comp, &list);
if (list != NULL)
g_string_append_printf (buffer, "<tr><th>%s</th><td>", _("Categories:"));
if (list != NULL) {
markup = g_markup_escape_text (_("Categories:"), -1);
g_string_append_printf (buffer, "<tr><th>%s</th><td>", markup);
g_free (markup);
}
for (iter = list; iter != NULL; iter = iter->next) {
const gchar *category = iter->data;
gchar *icon_file;
......@@ -238,7 +268,10 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
} else {
if (iter != list)
g_string_append_len (string, ", ", 2);
g_string_append (string, category);
markup = g_markup_escape_text (category, -1);
g_string_append (string, markup);
g_free (markup);
}
g_free (icon_file);
......@@ -252,18 +285,13 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
/* write location */
e_cal_component_get_location (comp, &location);
if (location && *location)
g_string_append_printf (
buffer, "<tr><th>%s</th><td>%s</td></tr>",
_("Location:"), location);
cal_component_preview_add_table_line (buffer, _("Location:"), location);
/* write start date */
e_cal_component_get_dtstart (comp, &dt);
if (dt.value != NULL) {
str = timet_to_str_with_zone (&dt, client, default_zone);
g_string_append_printf (
buffer, "<tr><th>%s</th><td>%s</td></tr>",
_("Start Date:"), str);
cal_component_preview_add_table_line (buffer, _("Start Date:"), str);
g_free (str);
}
e_cal_component_free_datetime (&dt);
......@@ -272,9 +300,7 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
e_cal_component_get_dtend (comp, &dt);
if (dt.value != NULL) {
str = timet_to_str_with_zone (&dt, client, default_zone);
g_string_append_printf (
buffer,"<tr><th>%s</th><td>%s</td></tr>",
_("End Date:"), str);
cal_component_preview_add_table_line (buffer, _("End Date:"), str);
g_free (str);
}
e_cal_component_free_datetime (&dt);
......@@ -283,9 +309,7 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
e_cal_component_get_due (comp, &dt);
if (dt.value != NULL) {
str = timet_to_str_with_zone (&dt, client, default_zone);
g_string_append_printf (
buffer, "<tr><th>%s</th><td>%s</td></tr>",
_("Due Date:"), str);
cal_component_preview_add_table_line (buffer, _("Due Date:"), str);
g_free (str);
}
e_cal_component_free_datetime (&dt);
......@@ -295,9 +319,7 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
calendar_config_get_week_start_day (), E_CAL_RECUR_DESCRIBE_RECURRENCE_FLAG_NONE);
if (str) {
g_string_append_printf (
buffer, "<tr><th>%s</th><td>%s</td></tr>",
_("Recurs:"), str);
cal_component_preview_add_table_line (buffer, _("Recurs:"), str);
g_free (str);
}
}
......@@ -307,46 +329,37 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
icalprop = icalcomponent_get_first_property (
icalcomp, ICAL_STATUS_PROPERTY);
if (icalprop != NULL) {
g_string_append_printf (
buffer, "<tr><th>%s</th>",
_("Status:"));
e_cal_component_get_status (comp, &status);
switch (status) {
case ICAL_STATUS_INPROCESS :
str = g_strdup (_("In Progress"));
tmp = _("In Progress");
break;
case ICAL_STATUS_COMPLETED :
str = g_strdup (_("Completed"));
tmp = _("Completed");
break;
case ICAL_STATUS_CANCELLED :
str = g_strdup (_("Cancelled"));
tmp = _("Cancelled");
break;
case ICAL_STATUS_NONE :
default :
str = g_strdup (_("Not Started"));
tmp = _("Not Started");
break;
}
g_string_append_printf (buffer, "<td>%s</td></tr>", str);
g_free (str);
cal_component_preview_add_table_line (buffer, _("Status:"), tmp);
}
/* write priority */
e_cal_component_get_priority (comp, &priority_value);
if (priority_value && *priority_value != 0) {
g_string_append_printf (
buffer, "<tr><th>%s</th>",
_("Priority:"));
if (*priority_value <= 4)
str = g_strdup (_("High"));
tmp = _("High");
else if (*priority_value == 5)
str = g_strdup (_("Normal"));
tmp = _("Normal");
else
str = g_strdup (_("Low"));
g_string_append_printf (buffer, "<td>%s</td></tr>", str);
tmp = _("Low");
g_free (str);
cal_component_preview_add_table_line (buffer, _("Priority:"), tmp);
}
if (priority_value)
......@@ -359,9 +372,9 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
if (list) {
GSList *node;
g_string_append_printf (
buffer, "<tr><th>%s</th>",
_("Description:"));
markup = g_markup_escape_text (_("Description:"), -1);
g_string_append_printf (buffer, "<tr><th>%s</th>", markup);
g_free (markup);
g_string_append (buffer, "<td class=\"description\">");
......@@ -390,7 +403,7 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
/* URL */
e_cal_component_get_url (comp, &url);
if (url) {
gchar *scheme;
gchar *scheme, *header_markup;
const gchar *href = url;
str = NULL;
......@@ -403,10 +416,22 @@ cal_component_preview_write_html (ECalComponentPreview *preview,
g_free (scheme);
if (strchr (href, '\"')) {
markup = g_markup_escape_text (href, -1);
g_free (str);
str = markup;
href = str;
}
header_markup = g_markup_escape_text (_("Web Page:"), -1);
markup = g_markup_escape_text (url, -1);
g_string_append_printf (
buffer, "<tr><th>%s</th><td><a href=\"%s\">%s</a></td></tr>",
_("Web Page:"), href, url);
header_markup, href, markup);
g_free (header_markup);
g_free (markup);
g_free (str);
}
......
......@@ -269,7 +269,7 @@ ecep_general_attendees_add_clicked_cb (GtkButton *button,
attendee = e_meeting_store_add_attendee_with_defaults (page_general->priv->meeting_store);
if ((flags & E_COMP_EDITOR_FLAG_DELEGATE) != 0)
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s",
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s",
page_general->priv->user_delegator ? page_general->priv->user_delegator : ""));
e_meeting_list_view_edit (E_MEETING_LIST_VIEW (page_general->priv->attendees_list_view), attendee);
......@@ -463,7 +463,7 @@ ecep_general_attendee_added_cb (EMeetingListView *meeting_list_view,
client = e_comp_editor_get_target_client (comp_editor);
/* do not remove here, it did EMeetingListView already */
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s",
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s",
page_general->priv->user_delegator ? page_general->priv->user_delegator : ""));
if (client && !e_client_check_capability (E_CLIENT (client), CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
......@@ -481,6 +481,32 @@ ecep_general_attendee_added_cb (EMeetingListView *meeting_list_view,
g_clear_object (&comp_editor);
}
static void
ecep_general_attendee_row_changed_cb (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
ECompEditorPageGeneral *page_general)
{
ECompEditor *comp_editor;
comp_editor = e_comp_editor_page_ref_editor (E_COMP_EDITOR_PAGE (page_general));
if (comp_editor)
e_comp_editor_set_changed (comp_editor, TRUE);
g_clear_object (&comp_editor);
}
static void
ecep_general_attendee_show_address_notify_cb (GObject *store,
GParamSpec *param,
ECompEditorPageGeneral *page_general)
{
if (gtk_widget_get_realized (GTK_WIDGET (page_general)) &&
gtk_widget_get_realized (page_general->priv->attendees_list_view))
gtk_widget_queue_draw (page_general->priv->attendees_list_view);
}
static gboolean
ecep_general_get_organizer (ECompEditorPageGeneral *page_general,
gchar **out_name,
......@@ -505,7 +531,7 @@ ecep_general_get_organizer (ECompEditorPageGeneral *page_general,
if (out_name)
*out_name = g_strdup (str_name);
if (out_mailto)
*out_mailto = g_strconcat ("MAILTO:", itip_strip_mailto (str_address), NULL);
*out_mailto = g_strconcat ("mailto:", itip_strip_mailto (str_address), NULL);
} else if (out_error_message) {
*out_error_message = _("Organizer address is not a valid user mail address");
}
......@@ -611,7 +637,7 @@ ecep_general_list_view_event_cb (EMeetingListView *list_view,
flags = e_comp_editor_get_flags (comp_editor);
if ((flags & E_COMP_EDITOR_FLAG_DELEGATE) != 0) {
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", page_general->priv->user_delegator));
e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s", page_general->priv->user_delegator));
}
g_clear_object (&comp_editor);
......@@ -1104,7 +1130,7 @@ ecep_general_fill_component (ECompEditorPage *page,
gchar *sentby;
gboolean differs;
sentby = g_strconcat ("MAILTO:", cal_email_address, NULL);
sentby = g_strconcat ("mailto:", cal_email_address, NULL);
differs = !organizer_mailto || g_ascii_strcasecmp (sentby, organizer_mailto) != 0;
if (differs) {
......@@ -1481,6 +1507,12 @@ ecep_general_constructed (GObject *object)
g_signal_connect (page_general->priv->attendees_list_view, "attendee-added",
G_CALLBACK (ecep_general_attendee_added_cb), page_general);
g_signal_connect (page_general->priv->meeting_store, "row-changed",
G_CALLBACK (ecep_general_attendee_row_changed_cb), page_general);
e_signal_connect_notify (page_general->priv->meeting_store, "notify::show-address",
G_CALLBACK (ecep_general_attendee_show_address_notify_cb), page_general);
g_signal_connect (page_general->priv->attendees_list_view, "event",
G_CALLBACK (ecep_general_list_view_event_cb), page_general);
......