From 0be822175bb3cef0534b9a0597e84ae1ee6374ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Sep 2014 01:57:36 -0300 Subject: remove nonprism suffix and add complex pkgrel on nonprism packages --- nonprism/amarok-nonprism/PKGBUILD | 56 - nonprism/amarok-nonprism/amarok.install | 12 - .../remove-amazon-references-on-docs.patch | 794 -- nonprism/amarok/PKGBUILD | 54 + nonprism/amarok/amarok.install | 12 + .../amarok/remove-amazon-references-on-docs.patch | 794 ++ .../Initial-port-to-GStreamer-1.0.patch | 1022 --- nonprism/banshee-nonprism/PKGBUILD | 62 - ...build-time-enable-gapless-playback-option.patch | 202 - nonprism/banshee-nonprism/banshee.install | 15 - .../banshee/Initial-port-to-GStreamer-1.0.patch | 1022 +++ nonprism/banshee/PKGBUILD | 60 + ...build-time-enable-gapless-playback-option.patch | 202 + nonprism/banshee/banshee.install | 15 + nonprism/bitlbee-nonprism/PKGBUILD | 61 - nonprism/bitlbee-nonprism/bitlbee.install | 22 - nonprism/bitlbee-nonprism/bitlbee.tmpfiles | 1 - nonprism/bitlbee/PKGBUILD | 59 + nonprism/bitlbee/bitlbee.install | 22 + nonprism/bitlbee/bitlbee.tmpfiles | 1 + nonprism/bti-nonprism/PKGBUILD | 40 - nonprism/bti-nonprism/nonprism.patch | 407 - nonprism/bti/PKGBUILD | 38 + nonprism/bti/nonprism.patch | 407 + nonprism/centerim-nonprism/PKGBUILD | 48 - nonprism/centerim-nonprism/nonprism.patch | 14 - nonprism/centerim/PKGBUILD | 46 + nonprism/centerim/nonprism.patch | 14 + nonprism/choqok-nonprism/PKGBUILD | 57 - nonprism/choqok-nonprism/choqok.install | 11 - nonprism/choqok/PKGBUILD | 56 + nonprism/choqok/choqok.install | 11 + nonprism/claws-mail-nonprism/PKGBUILD | 75 - nonprism/claws-mail-nonprism/claws-mail.install | 16 - nonprism/claws-mail/PKGBUILD | 74 + nonprism/claws-mail/claws-mail.install | 16 + nonprism/darktable-nonprism/PKGBUILD | 47 - nonprism/darktable-nonprism/darktable.install | 11 - nonprism/darktable/PKGBUILD | 45 + nonprism/darktable/darktable.install | 11 + nonprism/duplicity-nonprism/PKGBUILD | 50 - nonprism/duplicity-nonprism/gpg-encode.patch | 216 - nonprism/duplicity/PKGBUILD | 48 + nonprism/duplicity/gpg-encode.patch | 216 + nonprism/eog-plugins-nonprism/PKGBUILD | 38 - nonprism/eog-plugins-nonprism/eog-plugins.install | 11 - nonprism/eog-plugins/PKGBUILD | 36 + nonprism/eog-plugins/eog-plugins.install | 11 + nonprism/evolution-data-server-nonprism/PKGBUILD | 37 - .../evolution-data-server.install | 11 - .../evolution-data-server-nonprism/git-fixes.patch | 7856 -------------------- nonprism/evolution-data-server/PKGBUILD | 35 + .../evolution-data-server.install | 11 + nonprism/evolution-data-server/git-fixes.patch | 7856 ++++++++++++++++++++ nonprism/gnome-online-accounts-nonprism/PKGBUILD | 38 - .../gnome-online-accounts.install | 11 - nonprism/gnome-online-accounts/PKGBUILD | 36 + .../gnome-online-accounts.install | 11 + nonprism/grilo-plugins-nonprism/PKGBUILD | 42 - nonprism/grilo-plugins/PKGBUILD | 40 + nonprism/gthumb-nonprism/PKGBUILD | 60 - nonprism/gthumb-nonprism/gthumb.install | 19 - nonprism/gthumb-nonprism/nonprism.patch | 179 - nonprism/gthumb/PKGBUILD | 58 + nonprism/gthumb/gthumb.install | 19 + nonprism/gthumb/nonprism.patch | 179 + nonprism/jitsi-nonprism/PKGBUILD | 97 - .../drop-open-term-on-index-jn-html.patch | 6 - nonprism/jitsi-nonprism/jitsi.desktop | 10 - nonprism/jitsi-nonprism/jitsi.sh | 17 - nonprism/jitsi-nonprism/nonprism.patch | 294 - nonprism/jitsi/PKGBUILD | 95 + .../jitsi/drop-open-term-on-index-jn-html.patch | 6 + nonprism/jitsi/jitsi.desktop | 10 + nonprism/jitsi/jitsi.sh | 17 + nonprism/jitsi/nonprism.patch | 294 + nonprism/openshot-nonprism/PKGBUILD | 34 - nonprism/openshot-nonprism/nonprism.patch | 1257 ---- nonprism/openshot-nonprism/openshot.install | 12 - nonprism/openshot/PKGBUILD | 32 + nonprism/openshot/nonprism.patch | 1257 ++++ nonprism/openshot/openshot.install | 12 + nonprism/pidgin-nonprism/PKGBUILD | 137 - nonprism/pidgin-nonprism/nonprism.patch | 67 - nonprism/pidgin-nonprism/pidgin.install | 11 - nonprism/pidgin/PKGBUILD | 134 + nonprism/pidgin/nonprism.patch | 67 + nonprism/pidgin/pidgin.install | 11 + nonprism/shotwell-nonprism/PKGBUILD | 53 - nonprism/shotwell-nonprism/nonprism.patch | 439 -- nonprism/shotwell-nonprism/shotwell.install | 17 - nonprism/shotwell/PKGBUILD | 51 + nonprism/shotwell/nonprism.patch | 439 ++ nonprism/shotwell/shotwell.install | 17 + nonprism/sylpheed-nonprism/PKGBUILD | 51 - nonprism/sylpheed-nonprism/nonprism.patch | 168 - nonprism/sylpheed-nonprism/sylpheed.install | 11 - nonprism/sylpheed/PKGBUILD | 49 + nonprism/sylpheed/nonprism.patch | 168 + nonprism/sylpheed/sylpheed.install | 11 + 100 files changed, 14185 insertions(+), 14222 deletions(-) delete mode 100644 nonprism/amarok-nonprism/PKGBUILD delete mode 100644 nonprism/amarok-nonprism/amarok.install delete mode 100644 nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch create mode 100644 nonprism/amarok/PKGBUILD create mode 100644 nonprism/amarok/amarok.install create mode 100644 nonprism/amarok/remove-amazon-references-on-docs.patch delete mode 100644 nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch delete mode 100644 nonprism/banshee-nonprism/PKGBUILD delete mode 100644 nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch delete mode 100644 nonprism/banshee-nonprism/banshee.install create mode 100644 nonprism/banshee/Initial-port-to-GStreamer-1.0.patch create mode 100644 nonprism/banshee/PKGBUILD create mode 100644 nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch create mode 100644 nonprism/banshee/banshee.install delete mode 100644 nonprism/bitlbee-nonprism/PKGBUILD delete mode 100644 nonprism/bitlbee-nonprism/bitlbee.install delete mode 100644 nonprism/bitlbee-nonprism/bitlbee.tmpfiles create mode 100644 nonprism/bitlbee/PKGBUILD create mode 100644 nonprism/bitlbee/bitlbee.install create mode 100644 nonprism/bitlbee/bitlbee.tmpfiles delete mode 100644 nonprism/bti-nonprism/PKGBUILD delete mode 100644 nonprism/bti-nonprism/nonprism.patch create mode 100644 nonprism/bti/PKGBUILD create mode 100644 nonprism/bti/nonprism.patch delete mode 100644 nonprism/centerim-nonprism/PKGBUILD delete mode 100644 nonprism/centerim-nonprism/nonprism.patch create mode 100644 nonprism/centerim/PKGBUILD create mode 100644 nonprism/centerim/nonprism.patch delete mode 100644 nonprism/choqok-nonprism/PKGBUILD delete mode 100644 nonprism/choqok-nonprism/choqok.install create mode 100644 nonprism/choqok/PKGBUILD create mode 100644 nonprism/choqok/choqok.install delete mode 100644 nonprism/claws-mail-nonprism/PKGBUILD delete mode 100644 nonprism/claws-mail-nonprism/claws-mail.install create mode 100644 nonprism/claws-mail/PKGBUILD create mode 100644 nonprism/claws-mail/claws-mail.install delete mode 100644 nonprism/darktable-nonprism/PKGBUILD delete mode 100644 nonprism/darktable-nonprism/darktable.install create mode 100644 nonprism/darktable/PKGBUILD create mode 100644 nonprism/darktable/darktable.install delete mode 100644 nonprism/duplicity-nonprism/PKGBUILD delete mode 100644 nonprism/duplicity-nonprism/gpg-encode.patch create mode 100644 nonprism/duplicity/PKGBUILD create mode 100644 nonprism/duplicity/gpg-encode.patch delete mode 100644 nonprism/eog-plugins-nonprism/PKGBUILD delete mode 100644 nonprism/eog-plugins-nonprism/eog-plugins.install create mode 100644 nonprism/eog-plugins/PKGBUILD create mode 100644 nonprism/eog-plugins/eog-plugins.install delete mode 100644 nonprism/evolution-data-server-nonprism/PKGBUILD delete mode 100644 nonprism/evolution-data-server-nonprism/evolution-data-server.install delete mode 100644 nonprism/evolution-data-server-nonprism/git-fixes.patch create mode 100644 nonprism/evolution-data-server/PKGBUILD create mode 100644 nonprism/evolution-data-server/evolution-data-server.install create mode 100644 nonprism/evolution-data-server/git-fixes.patch delete mode 100644 nonprism/gnome-online-accounts-nonprism/PKGBUILD delete mode 100644 nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install create mode 100644 nonprism/gnome-online-accounts/PKGBUILD create mode 100644 nonprism/gnome-online-accounts/gnome-online-accounts.install delete mode 100644 nonprism/grilo-plugins-nonprism/PKGBUILD create mode 100644 nonprism/grilo-plugins/PKGBUILD delete mode 100644 nonprism/gthumb-nonprism/PKGBUILD delete mode 100644 nonprism/gthumb-nonprism/gthumb.install delete mode 100644 nonprism/gthumb-nonprism/nonprism.patch create mode 100644 nonprism/gthumb/PKGBUILD create mode 100644 nonprism/gthumb/gthumb.install create mode 100644 nonprism/gthumb/nonprism.patch delete mode 100644 nonprism/jitsi-nonprism/PKGBUILD delete mode 100644 nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch delete mode 100644 nonprism/jitsi-nonprism/jitsi.desktop delete mode 100644 nonprism/jitsi-nonprism/jitsi.sh delete mode 100644 nonprism/jitsi-nonprism/nonprism.patch create mode 100644 nonprism/jitsi/PKGBUILD create mode 100644 nonprism/jitsi/drop-open-term-on-index-jn-html.patch create mode 100644 nonprism/jitsi/jitsi.desktop create mode 100644 nonprism/jitsi/jitsi.sh create mode 100644 nonprism/jitsi/nonprism.patch delete mode 100644 nonprism/openshot-nonprism/PKGBUILD delete mode 100644 nonprism/openshot-nonprism/nonprism.patch delete mode 100644 nonprism/openshot-nonprism/openshot.install create mode 100644 nonprism/openshot/PKGBUILD create mode 100644 nonprism/openshot/nonprism.patch create mode 100644 nonprism/openshot/openshot.install delete mode 100644 nonprism/pidgin-nonprism/PKGBUILD delete mode 100644 nonprism/pidgin-nonprism/nonprism.patch delete mode 100644 nonprism/pidgin-nonprism/pidgin.install create mode 100644 nonprism/pidgin/PKGBUILD create mode 100644 nonprism/pidgin/nonprism.patch create mode 100644 nonprism/pidgin/pidgin.install delete mode 100644 nonprism/shotwell-nonprism/PKGBUILD delete mode 100644 nonprism/shotwell-nonprism/nonprism.patch delete mode 100644 nonprism/shotwell-nonprism/shotwell.install create mode 100644 nonprism/shotwell/PKGBUILD create mode 100644 nonprism/shotwell/nonprism.patch create mode 100644 nonprism/shotwell/shotwell.install delete mode 100644 nonprism/sylpheed-nonprism/PKGBUILD delete mode 100644 nonprism/sylpheed-nonprism/nonprism.patch delete mode 100644 nonprism/sylpheed-nonprism/sylpheed.install create mode 100644 nonprism/sylpheed/PKGBUILD create mode 100644 nonprism/sylpheed/nonprism.patch create mode 100644 nonprism/sylpheed/sylpheed.install diff --git a/nonprism/amarok-nonprism/PKGBUILD b/nonprism/amarok-nonprism/PKGBUILD deleted file mode 100644 index 6bf592d5b..000000000 --- a/nonprism/amarok-nonprism/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 211520 2014-04-19 11:27:02Z andrea $ -# Maintainer (Arch): Ronald van Haren -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): damir -# Maintainer: André Silva - -_pkgname=amarok -pkgname=amarok-nonprism -pkgver=2.8.0 -pkgrel=3 -pkgdesc="The powerful music player for KDE, without Amazon MP3 store support" -arch=("i686" "x86_64") -url="http://amarok.kde.org/" -license=('GPL2' 'LGPL2.1' 'FDL') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson') -makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' - 'libmygpo-qt' 'mesa') -optdepends=("libgpod: support for Apple iPod audio devices" - "libmtp: support for portable media devices" - "loudmouth: backend needed by mp3tunes for syncing" - "ifuse: support for Apple iPod Touch and iPhone" - "libmygpo-qt: gpodder.net Internet Service") -install="${_pkgname}.install" -source=("http://download.kde.org/stable/${_pkgname}/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" - 'remove-amazon-references-on-docs.patch') -sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937' - 'eed2616fd1465cd16f86f2e3554e3b34b83557af') - -prepare() { - cd ${srcdir}/${_pkgname}-${pkgver} - sed -i '\|amzdownloader|d' utilities/CMakeLists.txt - sed -i '\|amazon|d' src/services/CMakeLists.txt - patch -Np1 -i ${srcdir}/remove-amazon-references-on-docs.patch - cd .. - mkdir build -} - -build() { - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_NepomukCore=OFF \ - -DWITH_Soprano=OFF - make -} - -package(){ - cd build - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/amarok-nonprism/amarok.install b/nonprism/amarok-nonprism/amarok.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/nonprism/amarok-nonprism/amarok.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch b/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch deleted file mode 100644 index b2b824c4d..000000000 --- a/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch +++ /dev/null @@ -1,794 +0,0 @@ -diff --git a/doc/en_US/index.docbook b/doc/en_US/index.docbook -index 2f60f4d..4608911 100644 ---- a/doc/en_US/index.docbook -+++ b/doc/en_US/index.docbook -@@ -1199,7 +1199,7 @@ - The Media Sources pane - The Media Sources pane on the left by default is where you access your local collection as well as other services: Local Music on top, which is the primary interface to your local collection and connected media such as mp3 players and CDs. - --There is a section for all Internet Services that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your last.fm account, purchase music from online stores such as our new Amazon mp3 store, Magnatune and download independent artists' music from Jamendo and more. -+There is a section for all Internet Services that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your last.fm account, Magnatune and download independent artists' music from Jamendo and more. - - The Playlists section allows you to create and manage Dynamic Playlists, access your Saved Playlists as well as the Automatic Playlist Generator. - -@@ -1495,14 +1495,6 @@ - - - -- MP3 Music Store -- -- -- Connects with Amazon MP3 Store, an online music store. -- -- -- -- - Podcast Directory - - -@@ -3065,22 +3057,6 @@ - - - Plugins -- -- -- -- -- -- -- -- -- Plugins configuration dialog -- -- -- Plugins configuration dialog -- -- -- -- - Plugins configuration controls Collections, Internet Services, and Local Collection Backends. - - Collections -@@ -3219,17 +3195,6 @@ - - - -- MP3 Music Store -- -- -- Access the Amazon MP3 Store directly from Amarok -- -- -- Yes -- -- -- -- - mp3tunes - - -@@ -3311,21 +3276,6 @@ - To download, you then go to the Media Sources pane, select the Internet section and click on the Magnatune Store. It will then download the catalog where you can search and select the music you want to buy. - - --MP3 Store configuration --Access the Amazon MP3 Store directly from &amarok;. -- --The Amazon MP3 Store needs to know what country you are located in because it offers different items depending on your location. The following countries are allowed: -- -- --France --Austria, Germany, Switzerland --Japan --United Kingdom --United States (default) -- --NOTE: Changing the country invalidates your shopping cart. If your country is not in the list, you cannot use the Amazon MP3 Store because it is not supported by Amazon. -- -- - mp3tunes configuration - If you have a personal mp3tunes locker, click and enter your username and password. You will then be able to access your online locker. - -diff --git a/doc/es/index.docbook b/doc/es/index.docbook -index dd74364..f2eea97 100644 ---- a/doc/es/index.docbook -+++ b/doc/es/index.docbook -@@ -2344,7 +2344,7 @@ - >Servicios de Internet que usted tiene activados. Aquí usted puede navegar por listas de emisoras de radio y podcasts; escucharlas o suscribirse a ellas, interactuar con su cuenta last.fm, adquirir música desde tiendas en línea tales como nuestra nueva tienda Amazon, , Magnatune y descargar música de artistas independientes desde Jamendo - Tienda de música MP3 -- -- -- Conecta con Tienda de MP3 Amazon, una tienda de música en línea. -- -- -- -- -- Directorio de podcast - -@@ -4981,25 +4967,6 @@ - >Complementos -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - La configuración de complementos controla Colecciones - Tienda de música MP3 -- -- -- Acceder a la tienda MP3 Amazon directamente desde Amarok -- -- -- Sí -- -- -- -- -- mp3tunes - -@@ -5382,39 +5333,6 @@ - >Orígenes de medios, seleccionar la sección Internet y pulsar en la tienda Magnatune. Entonces se descargará el catálogo donde usted puede buscar y seleccionar la música que quiere comprar. - --Configuración de la tienda MP3 --Acceder a la tienda MP3 Amazon directamente desde &amarok;. --La tienda MP3 de Amazon necesita conocer en que país está usted localizado porque ofrece diferentes elementos en función de su ubicación. Se permiten los siguientes países: -- --Francia --Austria, Alemania, Suiza --Japón --Reino Unido --Estados Unidos (predeterminado) -- --NOTA: Al cambiar el país se invalida su carro de la compra. Si su país no está en la lista, usted no puede usar la tienda MP3 de Amazon porque no está admitido por Amazon. -- - Configuración de mp3tunesInternet Services die u hebt ingeschakeld. Hier kunnen lijsten met radiostations en podcasts doorgebladerd worden; beluisterd worden en/of zich aanmelden, met het account van last.fm worden gewerkt, muziek worden aangekocht in internetwinkels zoals onze nieuwe Amazon mp3-winkel, worden gewerkt, Magnatune en downloaden van muziek van onafhankelijke artiesten van Jamendo - MP3 Music-store -- -- -- Maakt verbinding met Amazon MP3 winkel, een geweldige online muziekwinkel. -- -- -- -- -- Podcastmap - -@@ -5181,22 +5167,6 @@ - - MP3 Music-store -- -- -- De Amazon MP3-store direct vanuit Amarok benaderen -- -- -- Ja -- -- -- -- -- mp3tunes - -@@ -5340,39 +5310,6 @@ - >Mediabronnen gaan, de internetsectie selecteren en op de Magnatune-winkel klikken. De catalogus wordt gedownload zodat de muziek die u wilt kopen opgezocht en geselecteerd kan worden. - --Instellingen van MP3 winkel --De Amazon MP3 winkel direct vanuit &amarok; benaderen --De MP3-winkel van Amazon moet weten in welk land u verblijft omdat het afhankelijk van de locatie andere items aanbiedt. De volgende landen zijn toegestaan: -- --Frankrijk --Oostenrijk, Duitsland, Zwitserland --Japan --Verenigd Koninkrijk --Verenigde Staten (standaard) -- --LET OP: het wijzigen van het land maakt het winkelmandje ongeldig. In landen die niet voorkomen in de lijst kunt u de MP3-winkel van Amazon niet gebruiken. -- - Configuratie van mp3tunesPlug-ins. -- -- -- -- -- -- -- -- -- klik op het pictogram Gereedschap om het instellingenvenster te openen -- -- -- klik op het pictogram Gereedschap om het instellingenvenster te openen -- -- -- -- - Server toevoegen - Loja de Músicas MP3 -- -- -- Connects with Amazon MP3 Store an online music store. -- -- -- -- -- Pasta de 'Podcasts' - -@@ -5281,22 +5267,6 @@ - - Loja de Músicas MP3 -- -- -- Aceder à loja de MP da Amazon directamente do Amarok -- -- -- Sim -- -- -- -- -- Pasta de 'Podcasts' - -@@ -5374,39 +5344,6 @@ - >Fontes Multimédia, seleccione a secção da Internet e carregue na Loja Magnatune. Irá então transferir o catálogo, para que possa procurar e seleccionar a música que deseja comprar. - --Configuração da Loja de MP3 --Acede directamente à Loja de MP3 da Amazon directamente a partir do &amarok;. --A Loja de MP3 da Amazon necessita de saber em que país você se localiza, dado que apresenta diferentes itens de acordo com a sua localização. São permitidos os seguintes países: -- --França --Áustria, Alemanha, Suíça --Japão --Reino Unido --Estados Unidos (por omissão) -- --NOTA: Se modificar o país, irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, não poderá usar a Loja de MP3 da Amazon, dado não ser suportada pela Amazon. -- - - Serviços Internet</emphasis - > que você tiver ativado. Aqui você pode navegar por listas de estações de rádio e podcasts; ouvir e/ou inscrever-se a eles, interagir com sua conta do <ulink url="http://www.last.fm" - >last.fm</ulink -->, comprar músicas de lojas on-line, como a nova loja Amazon MP3 ou a <ulink url="http://www.magnatune.com/" -+>, comprar músicas de lojas on-line ou a <ulink url="http://www.magnatune.com/" - >Magnatune</ulink - > e baixar músicas de artistas independentes a partir da <ulink url="http://www.jamendo.com/" - >Jamendo</ulink -@@ -2793,20 +2793,6 @@ - <entry> - <para - ><guilabel -->MP3 Music Store</guilabel --></para> -- </entry> -- <entry> -- <para -->Conecta com a <guilabel -->Loja Amazon MP3</guilabel -->, uma grande loja de músicas online.</para> -- </entry> -- </row> -- <row> -- <entry> -- <para --><guilabel - >Pasta de Podcast</guilabel - ></para> - </entry> -@@ -4961,25 +4947,6 @@ - ><title - >Plugins -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - A configuração dos plugins controla as Coleções - MP3 Music Store -- -- -- Acessa a loja Amazon MP3 diretamente do Amarok -- -- -- Sim -- -- -- -- -- MP3tunes - -@@ -5362,39 +5313,6 @@ - >Fontes multimídia, selecione a seção Internet e clique na loja Magnatune. Irá então baixar o catálogo, para que você possa procurar e selecionar a música que deseja comprar. - --Configuração da loja de MP3 --Acessa a loja Amazon MP3 diretamente do &amarok;. --A loja Amazon MP3 precisa saber o país em que você está, pois ela oferece diferentes itens de acordo com a sua localização. São permitidos os seguintes países: -- --França --Áustria, Alemanha, Suíça --Japão --Reino Unido --Estados Unidos (padrão) -- --NOTA: Se modificar o país irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, você não poderá usar a loja Amazon MP3 porque não há suporte. -- - Configuração do mp3tunesInternettjänster som du har aktiverat. Här kan du bläddra bland listor över radiostationer och podsändningar, lyssna på eller prenumerera på dem, interagera med ditt konto på last.fm, köpa musik från Internetbutiker som vår nya Amazon MP3-butik, , Magnatune och ladda ner oberoende artisters musik från Jamendo - MP3-musikbutik -- -- -- Ansluter till Amazons MP3-butik, en musikaffär på Internet. -- -- -- -- -- Podsändningskatalog - -@@ -4947,25 +4933,6 @@ - >Insticksprogram -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - Anpassning av insticksprogram styr nu Samlingar - MP3-musikbutik -- -- -- Kom åt Amazons MP3-butik direkt från Amarok -- -- -- Ja -- -- -- -- -- mp3tunes - -@@ -5348,39 +5299,6 @@ - >Mediakällor, väljer Internetavdelningen, och klickar på Magnatunes butik. Det kommer då ladda ner katalogen där du kan söka och välja musiken du vill köpa. - --Inställning av MP3-butik --Kom åt Amazons MP3-butik direkt från &amarok;. --Amazons MP3-butik måste veta vilket land du finns i, eftersom den erbjuder olika varor beroende på var du bor. Följande länder är tillåtna: -- --Frankrike --Österrike, Tyskland, Schweiz --Japan --Storbritannien --Förenta staterna (förval) -- --Observera: Att ändra land gör att kundvagnen inte gäller längre. Om landet du bor i inte finns i listan kan du inte använda Amazons MP3-butik eftersom det inte stöds av Amazon. -- - Inställning av mp3tunesІнтернет-служб. За допомогою цього розділу ви можете переглядати списки радіостанцій та трансляцій (подкастів); прослуховувати і/або підписуватися на них, працювати з вашим обліковим записом last.fm, купувати музику у мережевих магазинах, зокрема нашої нової крамниці MP3 у Amazon, , купувати музику у мережевих магазинах, Magnatune і отримувати музику від незалежних виконавців з Jamendo - Музична крамниця з продажу MP3 -- -- -- З’єднує ваш комп’ютер з Amazon MP3 Store, музичною крамницею у інтернеті. -- -- -- -- -- Каталог трансляцій - -@@ -5138,25 +5124,6 @@ - >Додатки -- -- -- -- -- -- -- -- -- Діалогове вікно налаштовування додатків -- -- -- Діалогове вікно налаштовування додатків -- -- -- -- - За допомогою налаштування додатків можна керувати Збірками - Музична крамниця з продажу MP3 -- -- -- Доступ до крамниці з продажу MP3 Amazon безпосередньо з Amarok -- -- -- Так -- -- -- -- -- mp3tunes - -@@ -5540,39 +5491,6 @@ - >Джерела даних, виберіть розділ «Інтернет» і натисніть пункт крамниці Magnatune. Програма виконає звантаження каталогу, у якому ви зможете знайти і вибрати музичні твори, записи яких ви хотіли б придбати. - --Налаштовування доступу до крамниці MP3 --Доступ до крамниці з продажу MP3 Amazon безпосередньо з &amarok;. --Для користування музичною крамницею MP3 Amazon програмі потрібно знати, у якій країні ви користуєтеся цією крамницею, оскільки список пропозицій залежатиме від вашого розташування. Передбачено роботу у таких країнах: -- --Франція --Австрія, Німеччина, Швейцарія --Японія --Великобританія --США (типова країна) -- --Зауваження: після зміни країни втрачає чинність кошик з придбаннями. Якщо вашої країни немає у списку, ви не зможете скористатися музичною крамницею MP3 Amazon, оскільки таке користування не передбачено правилами Amazon. -- - Налаштовування mp3tunes +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): damir +# Maintainer: André Silva + +pkgname=amarok +pkgver=2.8.0 +pkgrel=3.nonprism1 +pkgdesc="The powerful music player for KDE, without Amazon MP3 store support" +arch=("i686" "x86_64") +url="http://amarok.kde.org/" +license=('GPL2' 'LGPL2.1' 'FDL') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' + 'liblastfm' 'ffmpeg' 'libofa' 'qjson') +makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' + 'libmygpo-qt' 'mesa') +optdepends=("libgpod: support for Apple iPod audio devices" + "libmtp: support for portable media devices" + "loudmouth: backend needed by mp3tunes for syncing" + "ifuse: support for Apple iPod Touch and iPhone" + "libmygpo-qt: gpodder.net Internet Service") +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'remove-amazon-references-on-docs.patch') +sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937' + 'eed2616fd1465cd16f86f2e3554e3b34b83557af') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + sed -i '\|amzdownloader|d' utilities/CMakeLists.txt + sed -i '\|amazon|d' src/services/CMakeLists.txt + patch -Np1 -i ${srcdir}/remove-amazon-references-on-docs.patch + cd .. + mkdir build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_NepomukCore=OFF \ + -DWITH_Soprano=OFF + make +} + +package(){ + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/amarok/amarok.install b/nonprism/amarok/amarok.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/nonprism/amarok/amarok.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/amarok/remove-amazon-references-on-docs.patch b/nonprism/amarok/remove-amazon-references-on-docs.patch new file mode 100644 index 000000000..b2b824c4d --- /dev/null +++ b/nonprism/amarok/remove-amazon-references-on-docs.patch @@ -0,0 +1,794 @@ +diff --git a/doc/en_US/index.docbook b/doc/en_US/index.docbook +index 2f60f4d..4608911 100644 +--- a/doc/en_US/index.docbook ++++ b/doc/en_US/index.docbook +@@ -1199,7 +1199,7 @@ + The Media Sources pane + The Media Sources pane on the left by default is where you access your local collection as well as other services: Local Music on top, which is the primary interface to your local collection and connected media such as mp3 players and CDs. + +-There is a section for all Internet Services that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your last.fm account, purchase music from online stores such as our new Amazon mp3 store, Magnatune and download independent artists' music from Jamendo and more. ++There is a section for all Internet Services that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your last.fm account, Magnatune and download independent artists' music from Jamendo and more. + + The Playlists section allows you to create and manage Dynamic Playlists, access your Saved Playlists as well as the Automatic Playlist Generator. + +@@ -1495,14 +1495,6 @@ + + + +- MP3 Music Store +- +- +- Connects with Amazon MP3 Store, an online music store. +- +- +- +- + Podcast Directory + + +@@ -3065,22 +3057,6 @@ + + + Plugins +- +- +- +- +- +- +- +- +- Plugins configuration dialog +- +- +- Plugins configuration dialog +- +- +- +- + Plugins configuration controls Collections, Internet Services, and Local Collection Backends. + + Collections +@@ -3219,17 +3195,6 @@ + + + +- MP3 Music Store +- +- +- Access the Amazon MP3 Store directly from Amarok +- +- +- Yes +- +- +- +- + mp3tunes + + +@@ -3311,21 +3276,6 @@ + To download, you then go to the Media Sources pane, select the Internet section and click on the Magnatune Store. It will then download the catalog where you can search and select the music you want to buy. + + +-MP3 Store configuration +-Access the Amazon MP3 Store directly from &amarok;. +- +-The Amazon MP3 Store needs to know what country you are located in because it offers different items depending on your location. The following countries are allowed: +- +- +-France +-Austria, Germany, Switzerland +-Japan +-United Kingdom +-United States (default) +- +-NOTE: Changing the country invalidates your shopping cart. If your country is not in the list, you cannot use the Amazon MP3 Store because it is not supported by Amazon. +- +- + mp3tunes configuration + If you have a personal mp3tunes locker, click and enter your username and password. You will then be able to access your online locker. + +diff --git a/doc/es/index.docbook b/doc/es/index.docbook +index dd74364..f2eea97 100644 +--- a/doc/es/index.docbook ++++ b/doc/es/index.docbook +@@ -2344,7 +2344,7 @@ + >Servicios de Internet que usted tiene activados. Aquí usted puede navegar por listas de emisoras de radio y podcasts; escucharlas o suscribirse a ellas, interactuar con su cuenta last.fm, adquirir música desde tiendas en línea tales como nuestra nueva tienda Amazon, , Magnatune y descargar música de artistas independientes desde Jamendo + Tienda de música MP3 +- +- +- Conecta con Tienda de MP3 Amazon, una tienda de música en línea. +- +- +- +- +- Directorio de podcast + +@@ -4981,25 +4967,6 @@ + >Complementos +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + La configuración de complementos controla Colecciones + Tienda de música MP3 +- +- +- Acceder a la tienda MP3 Amazon directamente desde Amarok +- +- +- Sí +- +- +- +- +- mp3tunes + +@@ -5382,39 +5333,6 @@ + >Orígenes de medios, seleccionar la sección Internet y pulsar en la tienda Magnatune. Entonces se descargará el catálogo donde usted puede buscar y seleccionar la música que quiere comprar. + +-Configuración de la tienda MP3 +-Acceder a la tienda MP3 Amazon directamente desde &amarok;. +-La tienda MP3 de Amazon necesita conocer en que país está usted localizado porque ofrece diferentes elementos en función de su ubicación. Se permiten los siguientes países: +- +-Francia +-Austria, Alemania, Suiza +-Japón +-Reino Unido +-Estados Unidos (predeterminado) +- +-NOTA: Al cambiar el país se invalida su carro de la compra. Si su país no está en la lista, usted no puede usar la tienda MP3 de Amazon porque no está admitido por Amazon. +- + Configuración de mp3tunesInternet Services die u hebt ingeschakeld. Hier kunnen lijsten met radiostations en podcasts doorgebladerd worden; beluisterd worden en/of zich aanmelden, met het account van last.fm worden gewerkt, muziek worden aangekocht in internetwinkels zoals onze nieuwe Amazon mp3-winkel, worden gewerkt, Magnatune en downloaden van muziek van onafhankelijke artiesten van Jamendo + MP3 Music-store +- +- +- Maakt verbinding met Amazon MP3 winkel, een geweldige online muziekwinkel. +- +- +- +- +- Podcastmap + +@@ -5181,22 +5167,6 @@ + + MP3 Music-store +- +- +- De Amazon MP3-store direct vanuit Amarok benaderen +- +- +- Ja +- +- +- +- +- mp3tunes + +@@ -5340,39 +5310,6 @@ + >Mediabronnen gaan, de internetsectie selecteren en op de Magnatune-winkel klikken. De catalogus wordt gedownload zodat de muziek die u wilt kopen opgezocht en geselecteerd kan worden. + +-Instellingen van MP3 winkel +-De Amazon MP3 winkel direct vanuit &amarok; benaderen +-De MP3-winkel van Amazon moet weten in welk land u verblijft omdat het afhankelijk van de locatie andere items aanbiedt. De volgende landen zijn toegestaan: +- +-Frankrijk +-Oostenrijk, Duitsland, Zwitserland +-Japan +-Verenigd Koninkrijk +-Verenigde Staten (standaard) +- +-LET OP: het wijzigen van het land maakt het winkelmandje ongeldig. In landen die niet voorkomen in de lijst kunt u de MP3-winkel van Amazon niet gebruiken. +- + Configuratie van mp3tunesPlug-ins. +- +- +- +- +- +- +- +- +- klik op het pictogram Gereedschap om het instellingenvenster te openen +- +- +- klik op het pictogram Gereedschap om het instellingenvenster te openen +- +- +- +- + Server toevoegen + Loja de Músicas MP3 +- +- +- Connects with Amazon MP3 Store an online music store. +- +- +- +- +- Pasta de 'Podcasts' + +@@ -5281,22 +5267,6 @@ + + Loja de Músicas MP3 +- +- +- Aceder à loja de MP da Amazon directamente do Amarok +- +- +- Sim +- +- +- +- +- Pasta de 'Podcasts' + +@@ -5374,39 +5344,6 @@ + >Fontes Multimédia, seleccione a secção da Internet e carregue na Loja Magnatune. Irá então transferir o catálogo, para que possa procurar e seleccionar a música que deseja comprar. + +-Configuração da Loja de MP3 +-Acede directamente à Loja de MP3 da Amazon directamente a partir do &amarok;. +-A Loja de MP3 da Amazon necessita de saber em que país você se localiza, dado que apresenta diferentes itens de acordo com a sua localização. São permitidos os seguintes países: +- +-França +-Áustria, Alemanha, Suíça +-Japão +-Reino Unido +-Estados Unidos (por omissão) +- +-NOTA: Se modificar o país, irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, não poderá usar a Loja de MP3 da Amazon, dado não ser suportada pela Amazon. +- + + Serviços Internet</emphasis + > que você tiver ativado. Aqui você pode navegar por listas de estações de rádio e podcasts; ouvir e/ou inscrever-se a eles, interagir com sua conta do <ulink url="http://www.last.fm" + >last.fm</ulink +->, comprar músicas de lojas on-line, como a nova loja Amazon MP3 ou a <ulink url="http://www.magnatune.com/" ++>, comprar músicas de lojas on-line ou a <ulink url="http://www.magnatune.com/" + >Magnatune</ulink + > e baixar músicas de artistas independentes a partir da <ulink url="http://www.jamendo.com/" + >Jamendo</ulink +@@ -2793,20 +2793,6 @@ + <entry> + <para + ><guilabel +->MP3 Music Store</guilabel +-></para> +- </entry> +- <entry> +- <para +->Conecta com a <guilabel +->Loja Amazon MP3</guilabel +->, uma grande loja de músicas online.</para> +- </entry> +- </row> +- <row> +- <entry> +- <para +-><guilabel + >Pasta de Podcast</guilabel + ></para> + </entry> +@@ -4961,25 +4947,6 @@ + ><title + >Plugins +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + A configuração dos plugins controla as Coleções + MP3 Music Store +- +- +- Acessa a loja Amazon MP3 diretamente do Amarok +- +- +- Sim +- +- +- +- +- MP3tunes + +@@ -5362,39 +5313,6 @@ + >Fontes multimídia, selecione a seção Internet e clique na loja Magnatune. Irá então baixar o catálogo, para que você possa procurar e selecionar a música que deseja comprar. + +-Configuração da loja de MP3 +-Acessa a loja Amazon MP3 diretamente do &amarok;. +-A loja Amazon MP3 precisa saber o país em que você está, pois ela oferece diferentes itens de acordo com a sua localização. São permitidos os seguintes países: +- +-França +-Áustria, Alemanha, Suíça +-Japão +-Reino Unido +-Estados Unidos (padrão) +- +-NOTA: Se modificar o país irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, você não poderá usar a loja Amazon MP3 porque não há suporte. +- + Configuração do mp3tunesInternettjänster som du har aktiverat. Här kan du bläddra bland listor över radiostationer och podsändningar, lyssna på eller prenumerera på dem, interagera med ditt konto på last.fm, köpa musik från Internetbutiker som vår nya Amazon MP3-butik, , Magnatune och ladda ner oberoende artisters musik från Jamendo + MP3-musikbutik +- +- +- Ansluter till Amazons MP3-butik, en musikaffär på Internet. +- +- +- +- +- Podsändningskatalog + +@@ -4947,25 +4933,6 @@ + >Insticksprogram +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + Anpassning av insticksprogram styr nu Samlingar + MP3-musikbutik +- +- +- Kom åt Amazons MP3-butik direkt från Amarok +- +- +- Ja +- +- +- +- +- mp3tunes + +@@ -5348,39 +5299,6 @@ + >Mediakällor, väljer Internetavdelningen, och klickar på Magnatunes butik. Det kommer då ladda ner katalogen där du kan söka och välja musiken du vill köpa. + +-Inställning av MP3-butik +-Kom åt Amazons MP3-butik direkt från &amarok;. +-Amazons MP3-butik måste veta vilket land du finns i, eftersom den erbjuder olika varor beroende på var du bor. Följande länder är tillåtna: +- +-Frankrike +-Österrike, Tyskland, Schweiz +-Japan +-Storbritannien +-Förenta staterna (förval) +- +-Observera: Att ändra land gör att kundvagnen inte gäller längre. Om landet du bor i inte finns i listan kan du inte använda Amazons MP3-butik eftersom det inte stöds av Amazon. +- + Inställning av mp3tunesІнтернет-служб. За допомогою цього розділу ви можете переглядати списки радіостанцій та трансляцій (подкастів); прослуховувати і/або підписуватися на них, працювати з вашим обліковим записом last.fm, купувати музику у мережевих магазинах, зокрема нашої нової крамниці MP3 у Amazon, , купувати музику у мережевих магазинах, Magnatune і отримувати музику від незалежних виконавців з Jamendo + Музична крамниця з продажу MP3 +- +- +- З’єднує ваш комп’ютер з Amazon MP3 Store, музичною крамницею у інтернеті. +- +- +- +- +- Каталог трансляцій + +@@ -5138,25 +5124,6 @@ + >Додатки +- +- +- +- +- +- +- +- +- Діалогове вікно налаштовування додатків +- +- +- Діалогове вікно налаштовування додатків +- +- +- +- + За допомогою налаштування додатків можна керувати Збірками + Музична крамниця з продажу MP3 +- +- +- Доступ до крамниці з продажу MP3 Amazon безпосередньо з Amarok +- +- +- Так +- +- +- +- +- mp3tunes + +@@ -5540,39 +5491,6 @@ + >Джерела даних, виберіть розділ «Інтернет» і натисніть пункт крамниці Magnatune. Програма виконає звантаження каталогу, у якому ви зможете знайти і вибрати музичні твори, записи яких ви хотіли б придбати. + +-Налаштовування доступу до крамниці MP3 +-Доступ до крамниці з продажу MP3 Amazon безпосередньо з &amarok;. +-Для користування музичною крамницею MP3 Amazon програмі потрібно знати, у якій країні ви користуєтеся цією крамницею, оскільки список пропозицій залежатиме від вашого розташування. Передбачено роботу у таких країнах: +- +-Франція +-Австрія, Німеччина, Швейцарія +-Японія +-Великобританія +-США (типова країна) +- +-Зауваження: після зміни країни втрачає чинність кошик з придбаннями. Якщо вашої країни немає у списку, ви не зможете скористатися музичною крамницею MP3 Amazon, оскільки таке користування не передбачено правилами Amazon. +- + Налаштовування mp3tunes -Date: Wed, 19 Sep 2012 11:34:06 +0200 -Subject: Initial port to GStreamer 1.0 - ---- - build/m4/banshee/gstreamer.m4 | 19 +++--- - data/audio-profiles/wav.xml.in | 5 +- - libbanshee/banshee-bpmdetector.c | 11 ++-- - libbanshee/banshee-gst.h | 4 +- - libbanshee/banshee-player-cdda.c | 5 +- - libbanshee/banshee-player-dvd.c | 4 +- - libbanshee/banshee-player-equalizer.c | 4 +- - libbanshee/banshee-player-missing-elements.c | 2 +- - libbanshee/banshee-player-pipeline.c | 37 ++++++----- - libbanshee/banshee-player-private.h | 13 ++-- - libbanshee/banshee-player-replaygain.c | 29 ++++----- - libbanshee/banshee-player-video.c | 89 +++++++++++++------------- - libbanshee/banshee-player-vis.c | 88 ++++++++----------------- - libbanshee/banshee-player.c | 11 ++-- - libbanshee/banshee-ripper.c | 16 ++--- - libbanshee/banshee-tagger.c | 2 +- - libbanshee/banshee-transcoder.c | 19 +++--- - 17 files changed, 156 insertions(+), 202 deletions(-) - -diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 -index 6267cce..917cf58 100644 ---- a/build/m4/banshee/gstreamer.m4 -+++ b/build/m4/banshee/gstreamer.m4 -@@ -1,17 +1,18 @@ - AC_DEFUN([BANSHEE_CHECK_GSTREAMER], - [ -- GSTREAMER_REQUIRED_VERSION=0.10.26 -+ GSTREAMER_REQUIRED_VERSION=0.11.99 - AC_SUBST(GSTREAMER_REQUIRED_VERSION) - - PKG_CHECK_MODULES(GST, -- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) -- -- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" -+ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) - - AC_SUBST(GST_CFLAGS) - AC_SUBST(GST_LIBS) -diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in -index 35cd1d2..6dc1bab 100644 ---- a/data/audio-profiles/wav.xml.in -+++ b/data/audio-profiles/wav.xml.in -@@ -14,10 +14,7 @@ - "audioresample" - "audioconvert" - (+ "audio/x-raw-int, " -- "endianness=(int)1234, " -- "width=(int)16, " -- "depth=(int)16, " -- "signed=(boolean)true, " -+ "format=(string)S16LE, " - "rate=(int)44100, " - "channels=(int)2" ) - "wavenc") -diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c -index c06ffcb..68b0419 100644 ---- a/libbanshee/banshee-bpmdetector.c -+++ b/libbanshee/banshee-bpmdetector.c -@@ -30,6 +30,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - -@@ -50,7 +51,7 @@ struct BansheeBpmDetector { - - /* - * You can run this pipeline on the cmd line with: -- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ -+ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ - * audioconvert ! bpmdetect ! fakesink - */ - -@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(detector != NULL); - -- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); -+ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) - return FALSE; - } - -- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); -+ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); - if (detector->decodebin == NULL) { -- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); -+ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h -index 85662cf..332f356 100644 ---- a/libbanshee/banshee-gst.h -+++ b/libbanshee/banshee-gst.h -@@ -41,9 +41,11 @@ - #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ - gboolean iter##_done = FALSE; \ - while (!iter##_done) { \ -+ GValue child_value = {0, }; \ - child_type child_name; \ -- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ -+ switch (gst_iterator_next (iter, &child_value)) { \ - case GST_ITERATOR_OK: { \ -+ child_name = (child_type) g_value_get_object(&child_value); \ - { block; } \ - break; \ - } \ -diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c -index 8be2bdd..401edf0 100644 ---- a/libbanshee/banshee-player-cdda.c -+++ b/libbanshee/banshee-player-cdda.c -@@ -28,7 +28,8 @@ - // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - // - --#include -+#include -+#include - #include "banshee-player-cdda.h" - - // --------------------------------------------------------------------------- -@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) - - g_object_get (playbin, "source", &source, NULL); - -- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { -+ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { - if (source != NULL) { - g_object_unref (source); - } -diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c -index 55d499c..991b506 100644 ---- a/libbanshee/banshee-player-dvd.c -+++ b/libbanshee/banshee-player-dvd.c -@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); - } -@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); - } -diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c -index a496ada..0cbb3b7 100644 ---- a/libbanshee/banshee-player-equalizer.c -+++ b/libbanshee/banshee-player-equalizer.c -@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - if (player->equalizer != NULL) { -- GstObject *band; -+ GObject *band; - - g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); - -@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) - count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); - - for (i = 0; i < count; i++) { -- GstObject *band; -+ GObject *band; - - band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); - g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); -diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c -index 20804c4..30118c5 100644 ---- a/libbanshee/banshee-player-missing-elements.c -+++ b/libbanshee/banshee-player-missing-elements.c -@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, - } - #endif - -- install_return = gst_install_plugins_async (details, player->install_plugins_context, -+ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, - bp_missing_elements_handle_install_result, player); - - if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { -diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c -index ed845f3..6c2af35 100644 ---- a/libbanshee/banshee-player-pipeline.c -+++ b/libbanshee/banshee-player-pipeline.c -@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) - GstMessage *msg; - - // We're being called from the streaming thread, so don't do anything here -- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); -+ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); - gst_element_post_message (player->playbin, msg); - } - -@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) - break; - } - -+ case GST_MESSAGE_STREAM_START: { -+ bp_next_track_starting (player); -+ break; -+ } -+ - case GST_MESSAGE_APPLICATION: { - const gchar * name; - const GstStructure * s = gst_message_get_structure (message); -@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) - - // Playbin is the core element that handles autoplugging (finding the right - // source and decoder elements) based on source URI and stream content -- player->playbin = gst_element_factory_make ("playbin2", "playbin"); -+ player->playbin = gst_element_factory_make ("playbin", "playbin"); - - #ifdef ENABLE_GAPLESS - // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. -- // This can be removed once playbin2 generates its own next-track signal. -+ // This can be removed once playbin generates its own next-track signal. - // bgo#584987 - this is included in >= 0.10.26 - g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); - #endif //ENABLE_GAPLESS -@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) - g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); - g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); - -- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, -- // fall back on auto, which should work on windows, and as a last ditch, try alsa -- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -- if (audiosink != NULL) { -- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -- } else { -- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("alsasink", "audiosink"); -- } -+ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -+ if (audiosink != NULL) { -+ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -+ } else { -+ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -+ if (audiosink == NULL) { -+ audiosink = gst_element_factory_make ("alsasink", "audiosink"); - } - } - -@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) - GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); - BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { - player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; -- gst_object_unref (element); - }); - } - bp_debug ("Audiosink has volume: %s", -@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) - } - - // Ghost pad the audio bin so audio is passed from the bin into the tee -- teepad = gst_element_get_pad (player->audiotee, "sink"); -+ teepad = gst_element_get_static_pad (player->audiotee, "sink"); - gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); - gst_object_unref (teepad); - -@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) - gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); - - // Link the first tee pad to the primary audio sink queue -- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); -- pad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); - g_object_set(player->audiotee, "alloc-pad", pad, NULL); - gst_pad_link (pad, sinkpad); - gst_object_unref (GST_OBJECT (pad)); -diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h -index 9fed356..9346911 100644 ---- a/libbanshee/banshee-player-private.h -+++ b/libbanshee/banshee-player-private.h -@@ -42,14 +42,14 @@ - #include - #include - #include --#include -+#include - - #if defined(GDK_WINDOWING_X11) - # include --# include -+# include - #elif defined(GDK_WINDOWING_WIN32) - # include --# include -+# include - #endif - - #include "banshee-gst.h" -@@ -155,11 +155,11 @@ struct BansheePlayer { - // Video State - BpVideoDisplayContextType video_display_context_type; - #if defined(GDK_WINDOWING_X11) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - XID video_window_xid; - #elif defined(GDK_WINDOWING_WIN32) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - HWND video_window_xid; - #endif -@@ -179,6 +179,8 @@ struct BansheePlayer { - GstFFTF32 *vis_fft; - GstFFTF32Complex *vis_fft_buffer; - gfloat *vis_fft_sample_buffer; -+ GstPad *vis_event_probe_pad; -+ gulong vis_event_probe_id; - - // Plugin Installer State - GdkWindow *window; -@@ -197,6 +199,7 @@ struct BansheePlayer { - // http://replaygain.hydrogenaudio.org/player_scale.html - gdouble rg_gain_history[10]; - gint history_size; -+ gulong rg_pad_block_id; - - //dvd navigation - GstNavigation *navigation; -diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c -index a479d4a..e42b197 100644 ---- a/libbanshee/banshee-player-replaygain.c -+++ b/libbanshee/banshee-player-replaygain.c -@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban - _bp_rgvolume_print_volume (player); - } - --static void --pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) -+static GstPadProbeReturn -+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) - { - BansheePlayer* player; - -- if (!blocked) { -- return; -- } -- - player = (BansheePlayer*) user_data; -- g_return_if_fail (IS_BANSHEE_PLAYER (player)); -+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); - - // The pad_block_cb can get triggered multiple times, on different threads. - // Lock around the link/unlink code, so we don't end up going through here -@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || - (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { - // The pipeline is already in the correct state. Unblock the pad, and return. -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- return; -+ return GST_PAD_PROBE_REMOVE; - } - - if (player->rgvolume_in_pipeline) { -@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - } - - // Our state is now consistent -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); - -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- - _bp_rgvolume_print_volume (player); -+ -+ return GST_PAD_PROBE_REMOVE; - } - - // --------------------------------------------------------------------------- -@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) - srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); - - if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); -- } else if (srcPad->block_callback == NULL) { -- pad_block_cb (srcPad, TRUE, player); -+ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); -+ } else if (!player->rg_pad_block_id) { -+ pad_block_cb (srcPad, NULL, player); - } - } - -diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c -index b901354..eb95c3f 100644 ---- a/libbanshee/banshee-player-video.c -+++ b/libbanshee/banshee-player-video.c -@@ -37,54 +37,54 @@ - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - - static gboolean --bp_video_find_xoverlay (BansheePlayer *player) -+bp_video_find_video_overlay (BansheePlayer *player) - { - GstElement *video_sink = NULL; -- GstElement *xoverlay; -- GstXOverlay *previous_xoverlay; -- gboolean found_xoverlay; -+ GstElement *video_overlay; -+ GstVideoOverlay *previous_video_overlay; -+ gboolean found_video_overlay; - - g_object_get (player->playbin, "video-sink", &video_sink, NULL); - - g_mutex_lock (player->video_mutex); -- previous_xoverlay = player->xoverlay; -+ previous_video_overlay = player->video_overlay; - - if (video_sink == NULL) { -- player->xoverlay = NULL; -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ player->video_overlay = NULL; -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - g_mutex_unlock (player->video_mutex); - return FALSE; - } - -- xoverlay = GST_IS_BIN (video_sink) -- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) -+ video_overlay = GST_IS_BIN (video_sink) -+ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) - : video_sink; - -- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; -+ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; - -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - - #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { -- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { -+ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); - } - #endif - -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { -- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { -+ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); - } - - gst_object_unref (video_sink); -- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; -+ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; - - g_mutex_unlock (player->video_mutex); -- return found_xoverlay; -+ return found_video_overlay; - } - - #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ -@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) -- bp_video_find_xoverlay (player); -+ bp_video_find_video_overlay (player); - #endif - } - - static void - bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) - { -- gboolean found_xoverlay; -+ gboolean found_video_overlay; - - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - -- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { -+ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { - return; - } - -- found_xoverlay = bp_video_find_xoverlay (player); -+ found_video_overlay = bp_video_find_video_overlay (player); - -- if (found_xoverlay) { -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -+ if (found_video_overlay) { -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); - } - - #endif -@@ -164,7 +164,7 @@ static void - cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) - { - GstStructure * s = NULL; -- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); -+ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); - - if (G_UNLIKELY (!caps)) { - return; -@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) - } - - if (G_LIKELY (vpad)) { -- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); -+ GstCaps *caps = gst_pad_get_current_caps (vpad); - if (G_LIKELY (caps)) { - cb_caps_set (G_OBJECT (vpad), NULL, player); - gst_caps_unref (caps); -@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) - - player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; - -- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); -+ videosink = gst_element_factory_make ("autovideosink", "videosink"); - if (videosink == NULL) { -- videosink = gst_element_factory_make ("autovideosink", "videosink"); -- if (videosink == NULL) { -- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -- videosink = gst_element_factory_make ("fakesink", "videosink"); -- if (videosink != NULL) { -- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); -- } -+ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -+ videosink = gst_element_factory_make ("fakesink", "videosink"); -+ if (videosink != NULL) { -+ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); - } - } - - g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); - -- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); -+ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); - g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); - - if (GST_IS_BIN (videosink)) { -@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc - { - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - -- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { -- gst_x_overlay_expose (player->xoverlay); -+ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { -+ gst_video_overlay_expose (player->video_overlay); - return; - } - -- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { -+ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { - return; - } - -- gst_object_ref (player->xoverlay); -+ gst_object_ref (player->video_overlay); - -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -- gst_x_overlay_expose (player->xoverlay); -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); -+ gst_video_overlay_expose (player->video_overlay); - -- gst_object_unref (player->xoverlay); -+ gst_object_unref (player->video_overlay); - } - - // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. -@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) - // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this - // //function anyway, but this way we can raise a more useful message should it fail. - // if (!gdk_window_ensure_native (window)) { --// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); -+// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); - // } - //#endif - -diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c -index 5787c87..7e7dc78 100644 ---- a/libbanshee/banshee-player-vis.c -+++ b/libbanshee/banshee-player-vis.c -@@ -27,17 +27,17 @@ - // - - #include -+#include - - #include "banshee-player-vis.h" - - #define SLICE_SIZE 735 - - static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( -- "audio/x-raw-float, " -+ "audio/x-raw, " -+ "format = (string) " GST_AUDIO_NE(F32) ", " - "rate = (int) 44100, " -- "channels = (int) 2, " -- "endianness = (int) BYTE_ORDER, " -- "width = (int) 32" -+ "channels = (int) 2" - ); - - // --------------------------------------------------------------------------- -@@ -48,6 +48,7 @@ static void - bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) - { - BansheePlayer *player = (BansheePlayer*)userdata; -+ GstCaps *caps; - GstStructure *structure; - gint channels, wanted_size; - gfloat *data; -@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - player->vis_thawing = FALSE; - } - -- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); -+ caps = gst_pad_get_current_caps (pad); -+ structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "channels", &channels); -+ gst_caps_unref (caps); - - wanted_size = channels * SLICE_SIZE * sizeof (gfloat); - -- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); -+ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); - -- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { -+ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { - gfloat *deinterlaced = g_malloc (wanted_size); - gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); - -@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - g_free (deinterlaced); - g_free (specbuf); - -+ gst_adapter_unmap (player->vis_buffer); - gst_adapter_flush (player->vis_buffer, wanted_size); - } - } -@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - // Internal Functions - // --------------------------------------------------------------------------- - --static void --_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) -+static GstPadProbeReturn -+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) - { - BansheePlayer *player = (BansheePlayer *) data; -+ GstEvent *event; - -- if (!blocked) { -- // Set thawing mode (discards buffers that are too old from the queue). -- player->vis_thawing = TRUE; -- } --} -- --static void --_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) --{ -- GstPad *queue_sink; -- -- if (player->vis_resampler == NULL) -- return; -- -- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); -- -- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); -- -- gst_object_unref (GST_OBJECT (queue_sink)); --} -- --static gboolean --_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) --{ -- BansheePlayer *player = (BansheePlayer *) data; -+ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) -+ return GST_PAD_PROBE_PASS; - -+ event = GST_EVENT (info->data); - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_FLUSH_START: - case GST_EVENT_FLUSH_STOP: - case GST_EVENT_SEEK: -- case GST_EVENT_NEWSEGMENT: -+ case GST_EVENT_SEGMENT: - case GST_EVENT_CUSTOM_DOWNSTREAM: - player->vis_thawing = TRUE; - - default: break; - } - -- if (player->vis_enabled) -- return TRUE; -- -- switch (GST_EVENT_TYPE (event)) { -- case GST_EVENT_EOS: -- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: -- _bp_vis_pipeline_set_blocked (player, FALSE); -- break; -- case GST_EVENT_CUSTOM_DOWNSTREAM: -- case GST_EVENT_NEWSEGMENT: -- _bp_vis_pipeline_set_blocked (player, TRUE); -- break; -- -- default: break; -- } -- -- return TRUE; -+ return GST_PAD_PROBE_PASS; - } - - void -@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - // Core elements, if something fails here, it's the end of the world - audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); - -- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); -- gst_object_unref (GST_OBJECT (pad)); -+ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); - - resampler = gst_element_factory_make ("audioresample", "vis-resample"); - converter = gst_element_factory_make ("audioconvert", "vis-convert"); -@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - converter, fakesink, NULL); - - pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); - gst_pad_link (teepad, pad); - gst_object_unref (GST_OBJECT (teepad)); - gst_object_unref (GST_OBJECT (pad)); -@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - player->vis_resampler = resampler; - player->vis_thawing = FALSE; - player->vis_enabled = FALSE; -- -- // Disable the pipeline till we hear otherwise from managed land. -- _bp_vis_pipeline_set_blocked (player, TRUE); - } - - void - _bp_vis_pipeline_destroy (BansheePlayer *player) - { -+ if (player->vis_event_probe_pad) { -+ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); -+ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); -+ player->vis_event_probe_pad = NULL; -+ } -+ - if (player->vis_buffer != NULL) { - gst_object_unref (player->vis_buffer); - player->vis_buffer = NULL; -@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb - - player->vis_data_cb = cb; - -- _bp_vis_pipeline_set_blocked (player, cb == NULL); - player->vis_enabled = cb != NULL; - } -diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c -index c655a72..b8f98b8 100644 ---- a/libbanshee/banshee-player.c -+++ b/libbanshee/banshee-player.c -@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) - P_INVOKE guint64 - bp_get_position (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 position; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { -+ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { - return position / GST_MSECOND; - } - -@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) - P_INVOKE guint64 - bp_get_duration (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 duration; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { -+ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { - return duration / GST_MSECOND; - } - -@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - gint64 pos = -1; - GstState state; -- GstFormat format = GST_FORMAT_BYTES; - gboolean paused = FALSE; - - // Gstreamer playbin do not support to set suburi during playback -@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, 0); - paused = (state == GST_STATE_PAUSED); - if (state >= GST_STATE_PAUSED) { -- gst_element_query_position (player->playbin, &format, &pos); -+ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); - gst_element_set_state (player->playbin, GST_STATE_READY); - // Force to wait asynch operation - gst_element_get_state (player->playbin, &state, NULL, -1); -@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, -1); - - if (pos != -1) { -- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); -+ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); - } - } - -diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c -index e0e8c85..b3f8fed 100644 ---- a/libbanshee/banshee-ripper.c -+++ b/libbanshee/banshee-ripper.c -@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) - static gboolean - br_iterate_timeout (BansheeRipper *ripper) - { -- GstFormat format = GST_FORMAT_TIME; - GstState state; - gint64 position; - -@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) - return TRUE; - } - -- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { -+ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) - GstIterator *pad_iter = gst_element_iterate_src_pads (element); - - BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { -- GstStructure *str = GST_PAD_CAPS (pad) != NULL -- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) -+ GstCaps *caps = gst_pad_get_current_caps (pad); -+ GstStructure *str = caps != NULL -+ ? gst_caps_get_structure (caps, 0) - : NULL; - - if (str != NULL) { -@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) - preferred_mimetype = mimetype; - } - } -- -- gst_object_unref (pad); -+ gst_caps_unref (caps); - }); -- -- gst_object_unref (element); - }); - - return preferred_mimetype; -@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) - return FALSE; - } - -- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); -+ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); - if (ripper->cddasrc == NULL) { - br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); - return FALSE; -@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, - - // We'll warn the user in the UI if we can't tag the encoded audio files - *tagging_supported = TRUE; -- gst_object_unref (element); - } - }); - -diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c -index ca15e8f..762dfa9 100644 ---- a/libbanshee/banshee-tagger.c -+++ b/libbanshee/banshee-tagger.c -@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata - GstTagList * - bt_tag_list_new () - { -- return gst_tag_list_new (); -+ return gst_tag_list_new_empty (); - } - - void -diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c -index 10fc35c..0e241f0 100644 ---- a/libbanshee/banshee-transcoder.c -+++ b/libbanshee/banshee-transcoder.c -@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const - static gboolean - gst_transcoder_iterate_timeout(GstTranscoder *transcoder) - { -- GstFormat format = GST_FORMAT_TIME; - gint64 position; - gint64 duration; - - g_return_val_if_fail(transcoder != NULL, FALSE); - -- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || -- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { -+ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || -+ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(transcoder != NULL); - -- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); -+ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - - transcoder->pipeline = gst_pipeline_new("pipeline"); - -- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); -+ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); - if(source_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); - return FALSE; - } - -- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); -+ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); - if(decoder_elem == NULL) { -- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); -+ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); -+ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); - if(sink_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); - return FALSE; -@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - return FALSE; - } - -- encoder_pad = gst_element_get_pad(conv_elem, "sink"); -+ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); - if(encoder_pad == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); - return FALSE; diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD deleted file mode 100644 index 6d1fc3db0..000000000 --- a/nonprism/banshee-nonprism/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $ -# Maintainer (Arch): Daniel Isenmann -# Contributor (Arch): György Balló -# Maintainer: André Silva - -_pkgname=banshee -pkgname=banshee-nonprism -pkgver=2.6.2 -pkgrel=4 -pkgdesc="Music management and playback for GNOME, without gdata-sharp support" -arch=('i686' 'x86_64' 'mips64el') -url="http://banshee.fm/" -license=('MIT') -depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good) -makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') -optdepends=('gst-plugins-ugly: Extra media codecs' - 'gst-libav: Extra media codecs' - 'brasero: CD burning') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -install=$_pkgname.install -source=(http://download.gnome.org/sources/$_pkgname/2.6/$_pkgname-$pkgver.tar.xz - Initial-port-to-GStreamer-1.0.patch - Remove-build-time-enable-gapless-playback-option.patch) -md5sums=('12dbb8a996783f7081d538062a8589b7' - '16cbe2ef60e6f9b22015585bb3209648' - '0bf7ee4241b12538779c9ecc401d142a') - -prepare() { - cd $_pkgname-$pkgver - patch -p1 -i ../Initial-port-to-GStreamer-1.0.patch - patch -p1 -i ../Remove-build-time-enable-gapless-playback-option.patch -} - -build() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - cd $_pkgname-$pkgver - - # Disable youtube extension because it needs gdata-sharp to works - MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-docs \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-install \ - --disable-boo \ - --disable-youtube \ - --with-vendor-build-id=Parabola - make -} - -package() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING" -} diff --git a/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch b/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch deleted file mode 100644 index dec054b5a..000000000 --- a/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch +++ /dev/null @@ -1,202 +0,0 @@ -From: Chow Loong Jin -Date: Mon, 26 Nov 2012 00:10:19 +0800 -Subject: Remove build-time --enable-gapless-playback option - -This was previously added to check for a new enough playbin, but since we're now -using Gstreamer 1.0, the playbin version should be new enough, and we can drop -the conditionals. ---- - configure.ac | 15 --------- - libbanshee/Makefile.am | 4 --- - libbanshee/banshee-player-pipeline.c | 4 --- - libbanshee/banshee-player.c | 10 ------ - .../Banshee.GStreamer/PlayerEngine.cs | 32 ++++++-------------- - src/Backends/Banshee.GStreamer/Makefile.am | 4 --- - src/Backends/Banshee.GStreamerSharp/Makefile.am | 4 --- - 7 files changed, 10 insertions(+), 63 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ac949c7..5d66fb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU - dnl Ubuntu One Music Store (optional) - BANSHEE_CHECK_UBUNTUONE - --dnl Gapless, if we have a new-enough playbin2 --ENABLE_GAPLESS="no" --AC_ARG_ENABLE(gapless-playback, -- AC_HELP_STRING([--enable-gapless-playback], -- [Enable gapless playback engine (requires gst-plugins-base > 0.10.25.2)]), -- enable_gapless=$enableval, -- enable_gapless=auto) --if test "x$enable_gapless" != "xno" ; then -- PKG_CHECK_MODULES([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10 > 0.10.25.2], ENABLE_GAPLESS=yes, ENABLE_GAPLESS=no) -- if test "x$enable_gapless" == "xyes" -a "x$ENABLE_GAPLESS" == "xno" ; then -- AC_MSG_ERROR([Gapless playback requires gstreamer-plugins-base > 0.10.25.2]) -- fi --fi --AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes") -- - dnl i18n - SHAMROCK_CONFIGURE_I18N($PACKAGE) - -diff --git a/libbanshee/Makefile.am b/libbanshee/Makefile.am -index 6ed369a..a05c492 100644 ---- a/libbanshee/Makefile.am -+++ b/libbanshee/Makefile.am -@@ -6,10 +6,6 @@ INCLUDES = \ - $(LIBBANSHEE_CFLAGS) \ - $(GST_CFLAGS) - --if ENABLE_GAPLESS --INCLUDES += -DENABLE_GAPLESS --endif -- - bansheelibdir = $(pkglibdir) - bansheelib_LTLIBRARIES = libbanshee.la - -diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c -index 6c2af35..d4977e1 100644 ---- a/libbanshee/banshee-player-pipeline.c -+++ b/libbanshee/banshee-player-pipeline.c -@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) - return TRUE; - } - --#ifdef ENABLE_GAPLESS - static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *player) - { - g_return_if_fail (IS_BANSHEE_PLAYER (player)); -@@ -257,7 +256,6 @@ static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *pla - player->about_to_finish_cb (player); - } - } --#endif //ENABLE_GAPLESS - - static void bp_volume_changed_callback (GstElement *playbin, GParamSpec *spec, BansheePlayer *player) - { -@@ -296,12 +294,10 @@ _bp_pipeline_construct (BansheePlayer *player) - // source and decoder elements) based on source URI and stream content - player->playbin = gst_element_factory_make ("playbin", "playbin"); - --#ifdef ENABLE_GAPLESS - // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. - // This can be removed once playbin generates its own next-track signal. - // bgo#584987 - this is included in >= 0.10.26 - g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); --#endif //ENABLE_GAPLESS - - g_return_val_if_fail (player->playbin != NULL, FALSE); - -diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c -index b8f98b8..08c4f94 100644 ---- a/libbanshee/banshee-player.c -+++ b/libbanshee/banshee-player.c -@@ -303,16 +303,6 @@ bp_can_seek (BansheePlayer *player) - } - - P_INVOKE gboolean --bp_supports_gapless (BansheePlayer *player) --{ --#ifdef ENABLE_GAPLESS -- return TRUE; --#else -- return FALSE; --#endif //ENABLE_GAPLESS --} -- --P_INVOKE gboolean - bp_audiosink_has_volume (BansheePlayer *player) - { - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE); -diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs -index 278ff51..05b1905 100644 ---- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs -+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs -@@ -747,16 +747,11 @@ namespace Banshee.GStreamer - get { return gapless_enabled; } - set - { -- if (bp_supports_gapless (handle)) { -- gapless_enabled = value; -- if (value) { -- bp_set_about_to_finish_callback (handle, about_to_finish_callback); -- } else { -- bp_set_about_to_finish_callback (handle, null); -- } -+ gapless_enabled = value; -+ if (value) { -+ bp_set_about_to_finish_callback (handle, about_to_finish_callback); - } else { -- gapless_enabled = false; -- next_track_pending = false; -+ bp_set_about_to_finish_callback (handle, null); - } - } - } -@@ -881,13 +876,11 @@ namespace Banshee.GStreamer - Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"), - delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); } - )); -- if (bp_supports_gapless (handle)) { -- gapless_preference = service["general"]["misc"].Add (new SchemaPreference (GaplessEnabledSchema, -- Catalog.GetString ("Enable _gapless playback"), -- Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), -- delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } -- )); -- } -+ gapless_preference = service["general"]["misc"].Add (new SchemaPreference (GaplessEnabledSchema, -+ Catalog.GetString ("Enable _gapless playback"), -+ Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), -+ delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } -+ )); - } - - private void UninstallPreferences () -@@ -898,9 +891,7 @@ namespace Banshee.GStreamer - } - - service["general"]["misc"].Remove (replaygain_preference); -- if (bp_supports_gapless (handle)) { -- service["general"]["misc"].Remove (gapless_preference); -- } -+ service["general"]["misc"].Remove (gapless_preference); - replaygain_preference = null; - gapless_preference = null; - } -@@ -969,9 +960,6 @@ namespace Banshee.GStreamer - BansheePlayerAboutToFinishCallback cb); - - [DllImport ("libbanshee.dll")] -- private static extern bool bp_supports_gapless (HandleRef player); -- -- [DllImport ("libbanshee.dll")] - private static extern bool bp_open (HandleRef player, IntPtr uri, bool maybeVideo); - - [DllImport ("libbanshee.dll")] -diff --git a/src/Backends/Banshee.GStreamer/Makefile.am b/src/Backends/Banshee.GStreamer/Makefile.am -index 118e525..321b270 100644 ---- a/src/Backends/Banshee.GStreamer/Makefile.am -+++ b/src/Backends/Banshee.GStreamer/Makefile.am -@@ -16,7 +16,3 @@ include $(top_srcdir)/build/build.mk - - EXTRA_DIST += Banshee.GStreamer.dll.config - module_SCRIPTS += Banshee.GStreamer.dll.config -- --if ENABLE_GAPLESS --BUILD_DEFINES="-define:ENABLE_GAPLESS" --endif -\ No newline at end of file -diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.am b/src/Backends/Banshee.GStreamerSharp/Makefile.am -index 69424d7..769b260 100644 ---- a/src/Backends/Banshee.GStreamerSharp/Makefile.am -+++ b/src/Backends/Banshee.GStreamerSharp/Makefile.am -@@ -23,7 +23,3 @@ else - include $(top_srcdir)/build/build.dist.mk - EXTRA_DIST += Banshee.GStreamerSharp.dll.config - endif -- --if ENABLE_GAPLESS --BUILD_DEFINES="-define:ENABLE_GAPLESS" --endif diff --git a/nonprism/banshee-nonprism/banshee.install b/nonprism/banshee-nonprism/banshee.install deleted file mode 100644 index 079ac953d..000000000 --- a/nonprism/banshee-nonprism/banshee.install +++ /dev/null @@ -1,15 +0,0 @@ -pkgname=banshee - -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/nonprism/banshee/Initial-port-to-GStreamer-1.0.patch b/nonprism/banshee/Initial-port-to-GStreamer-1.0.patch new file mode 100644 index 000000000..be6593715 --- /dev/null +++ b/nonprism/banshee/Initial-port-to-GStreamer-1.0.patch @@ -0,0 +1,1022 @@ +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Wed, 19 Sep 2012 11:34:06 +0200 +Subject: Initial port to GStreamer 1.0 + +--- + build/m4/banshee/gstreamer.m4 | 19 +++--- + data/audio-profiles/wav.xml.in | 5 +- + libbanshee/banshee-bpmdetector.c | 11 ++-- + libbanshee/banshee-gst.h | 4 +- + libbanshee/banshee-player-cdda.c | 5 +- + libbanshee/banshee-player-dvd.c | 4 +- + libbanshee/banshee-player-equalizer.c | 4 +- + libbanshee/banshee-player-missing-elements.c | 2 +- + libbanshee/banshee-player-pipeline.c | 37 ++++++----- + libbanshee/banshee-player-private.h | 13 ++-- + libbanshee/banshee-player-replaygain.c | 29 ++++----- + libbanshee/banshee-player-video.c | 89 +++++++++++++------------- + libbanshee/banshee-player-vis.c | 88 ++++++++----------------- + libbanshee/banshee-player.c | 11 ++-- + libbanshee/banshee-ripper.c | 16 ++--- + libbanshee/banshee-tagger.c | 2 +- + libbanshee/banshee-transcoder.c | 19 +++--- + 17 files changed, 156 insertions(+), 202 deletions(-) + +diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 +index 6267cce..917cf58 100644 +--- a/build/m4/banshee/gstreamer.m4 ++++ b/build/m4/banshee/gstreamer.m4 +@@ -1,17 +1,18 @@ + AC_DEFUN([BANSHEE_CHECK_GSTREAMER], + [ +- GSTREAMER_REQUIRED_VERSION=0.10.26 ++ GSTREAMER_REQUIRED_VERSION=0.11.99 + AC_SUBST(GSTREAMER_REQUIRED_VERSION) + + PKG_CHECK_MODULES(GST, +- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) +- +- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" ++ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) + + AC_SUBST(GST_CFLAGS) + AC_SUBST(GST_LIBS) +diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in +index 35cd1d2..6dc1bab 100644 +--- a/data/audio-profiles/wav.xml.in ++++ b/data/audio-profiles/wav.xml.in +@@ -14,10 +14,7 @@ + "audioresample" + "audioconvert" + (+ "audio/x-raw-int, " +- "endianness=(int)1234, " +- "width=(int)16, " +- "depth=(int)16, " +- "signed=(boolean)true, " ++ "format=(string)S16LE, " + "rate=(int)44100, " + "channels=(int)2" ) + "wavenc") +diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c +index c06ffcb..68b0419 100644 +--- a/libbanshee/banshee-bpmdetector.c ++++ b/libbanshee/banshee-bpmdetector.c +@@ -30,6 +30,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + +@@ -50,7 +51,7 @@ struct BansheeBpmDetector { + + /* + * You can run this pipeline on the cmd line with: +- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ ++ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ + * audioconvert ! bpmdetect ! fakesink + */ + +@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(detector != NULL); + +- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); ++ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) + return FALSE; + } + +- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); ++ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); + if (detector->decodebin == NULL) { +- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); ++ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h +index 85662cf..332f356 100644 +--- a/libbanshee/banshee-gst.h ++++ b/libbanshee/banshee-gst.h +@@ -41,9 +41,11 @@ + #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ + gboolean iter##_done = FALSE; \ + while (!iter##_done) { \ ++ GValue child_value = {0, }; \ + child_type child_name; \ +- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ ++ switch (gst_iterator_next (iter, &child_value)) { \ + case GST_ITERATOR_OK: { \ ++ child_name = (child_type) g_value_get_object(&child_value); \ + { block; } \ + break; \ + } \ +diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c +index 8be2bdd..401edf0 100644 +--- a/libbanshee/banshee-player-cdda.c ++++ b/libbanshee/banshee-player-cdda.c +@@ -28,7 +28,8 @@ + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + // + +-#include ++#include ++#include + #include "banshee-player-cdda.h" + + // --------------------------------------------------------------------------- +@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) + + g_object_get (playbin, "source", &source, NULL); + +- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { ++ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { + if (source != NULL) { + g_object_unref (source); + } +diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c +index 55d499c..991b506 100644 +--- a/libbanshee/banshee-player-dvd.c ++++ b/libbanshee/banshee-player-dvd.c +@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); + } +@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); + } +diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c +index a496ada..0cbb3b7 100644 +--- a/libbanshee/banshee-player-equalizer.c ++++ b/libbanshee/banshee-player-equalizer.c +@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + if (player->equalizer != NULL) { +- GstObject *band; ++ GObject *band; + + g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); + +@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) + count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); + + for (i = 0; i < count; i++) { +- GstObject *band; ++ GObject *band; + + band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); + g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); +diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c +index 20804c4..30118c5 100644 +--- a/libbanshee/banshee-player-missing-elements.c ++++ b/libbanshee/banshee-player-missing-elements.c +@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, + } + #endif + +- install_return = gst_install_plugins_async (details, player->install_plugins_context, ++ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, + bp_missing_elements_handle_install_result, player); + + if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { +diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c +index ed845f3..6c2af35 100644 +--- a/libbanshee/banshee-player-pipeline.c ++++ b/libbanshee/banshee-player-pipeline.c +@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) + GstMessage *msg; + + // We're being called from the streaming thread, so don't do anything here +- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); ++ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); + gst_element_post_message (player->playbin, msg); + } + +@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) + break; + } + ++ case GST_MESSAGE_STREAM_START: { ++ bp_next_track_starting (player); ++ break; ++ } ++ + case GST_MESSAGE_APPLICATION: { + const gchar * name; + const GstStructure * s = gst_message_get_structure (message); +@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) + + // Playbin is the core element that handles autoplugging (finding the right + // source and decoder elements) based on source URI and stream content +- player->playbin = gst_element_factory_make ("playbin2", "playbin"); ++ player->playbin = gst_element_factory_make ("playbin", "playbin"); + + #ifdef ENABLE_GAPLESS + // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. +- // This can be removed once playbin2 generates its own next-track signal. ++ // This can be removed once playbin generates its own next-track signal. + // bgo#584987 - this is included in >= 0.10.26 + g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); + #endif //ENABLE_GAPLESS +@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) + g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); + g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); + +- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, +- // fall back on auto, which should work on windows, and as a last ditch, try alsa +- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); +- if (audiosink != NULL) { +- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); +- } else { +- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("alsasink", "audiosink"); +- } ++ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); ++ if (audiosink != NULL) { ++ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); ++ } else { ++ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); ++ if (audiosink == NULL) { ++ audiosink = gst_element_factory_make ("alsasink", "audiosink"); + } + } + +@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) + GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); + BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { + player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; +- gst_object_unref (element); + }); + } + bp_debug ("Audiosink has volume: %s", +@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) + } + + // Ghost pad the audio bin so audio is passed from the bin into the tee +- teepad = gst_element_get_pad (player->audiotee, "sink"); ++ teepad = gst_element_get_static_pad (player->audiotee, "sink"); + gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); + gst_object_unref (teepad); + +@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) + gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); + + // Link the first tee pad to the primary audio sink queue +- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); +- pad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); + g_object_set(player->audiotee, "alloc-pad", pad, NULL); + gst_pad_link (pad, sinkpad); + gst_object_unref (GST_OBJECT (pad)); +diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h +index 9fed356..9346911 100644 +--- a/libbanshee/banshee-player-private.h ++++ b/libbanshee/banshee-player-private.h +@@ -42,14 +42,14 @@ + #include + #include + #include +-#include ++#include + + #if defined(GDK_WINDOWING_X11) + # include +-# include ++# include + #elif defined(GDK_WINDOWING_WIN32) + # include +-# include ++# include + #endif + + #include "banshee-gst.h" +@@ -155,11 +155,11 @@ struct BansheePlayer { + // Video State + BpVideoDisplayContextType video_display_context_type; + #if defined(GDK_WINDOWING_X11) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + XID video_window_xid; + #elif defined(GDK_WINDOWING_WIN32) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + HWND video_window_xid; + #endif +@@ -179,6 +179,8 @@ struct BansheePlayer { + GstFFTF32 *vis_fft; + GstFFTF32Complex *vis_fft_buffer; + gfloat *vis_fft_sample_buffer; ++ GstPad *vis_event_probe_pad; ++ gulong vis_event_probe_id; + + // Plugin Installer State + GdkWindow *window; +@@ -197,6 +199,7 @@ struct BansheePlayer { + // http://replaygain.hydrogenaudio.org/player_scale.html + gdouble rg_gain_history[10]; + gint history_size; ++ gulong rg_pad_block_id; + + //dvd navigation + GstNavigation *navigation; +diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c +index a479d4a..e42b197 100644 +--- a/libbanshee/banshee-player-replaygain.c ++++ b/libbanshee/banshee-player-replaygain.c +@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban + _bp_rgvolume_print_volume (player); + } + +-static void +-pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) ++static GstPadProbeReturn ++pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) + { + BansheePlayer* player; + +- if (!blocked) { +- return; +- } +- + player = (BansheePlayer*) user_data; +- g_return_if_fail (IS_BANSHEE_PLAYER (player)); ++ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); + + // The pad_block_cb can get triggered multiple times, on different threads. + // Lock around the link/unlink code, so we don't end up going through here +@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || + (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { + // The pipeline is already in the correct state. Unblock the pad, and return. ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- return; ++ return GST_PAD_PROBE_REMOVE; + } + + if (player->rgvolume_in_pipeline) { +@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + } + + // Our state is now consistent ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); + +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- + _bp_rgvolume_print_volume (player); ++ ++ return GST_PAD_PROBE_REMOVE; + } + + // --------------------------------------------------------------------------- +@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) + srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); + + if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); +- } else if (srcPad->block_callback == NULL) { +- pad_block_cb (srcPad, TRUE, player); ++ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); ++ } else if (!player->rg_pad_block_id) { ++ pad_block_cb (srcPad, NULL, player); + } + } + +diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c +index b901354..eb95c3f 100644 +--- a/libbanshee/banshee-player-video.c ++++ b/libbanshee/banshee-player-video.c +@@ -37,54 +37,54 @@ + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + + static gboolean +-bp_video_find_xoverlay (BansheePlayer *player) ++bp_video_find_video_overlay (BansheePlayer *player) + { + GstElement *video_sink = NULL; +- GstElement *xoverlay; +- GstXOverlay *previous_xoverlay; +- gboolean found_xoverlay; ++ GstElement *video_overlay; ++ GstVideoOverlay *previous_video_overlay; ++ gboolean found_video_overlay; + + g_object_get (player->playbin, "video-sink", &video_sink, NULL); + + g_mutex_lock (player->video_mutex); +- previous_xoverlay = player->xoverlay; ++ previous_video_overlay = player->video_overlay; + + if (video_sink == NULL) { +- player->xoverlay = NULL; +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ player->video_overlay = NULL; ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + g_mutex_unlock (player->video_mutex); + return FALSE; + } + +- xoverlay = GST_IS_BIN (video_sink) +- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) ++ video_overlay = GST_IS_BIN (video_sink) ++ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) + : video_sink; + +- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; ++ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; + +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + + #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { +- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { ++ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); + } + #endif + +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { +- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { ++ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); + } + + gst_object_unref (video_sink); +- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; ++ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; + + g_mutex_unlock (player->video_mutex); +- return found_xoverlay; ++ return found_video_overlay; + } + + #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ +@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) +- bp_video_find_xoverlay (player); ++ bp_video_find_video_overlay (player); + #endif + } + + static void + bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) + { +- gboolean found_xoverlay; ++ gboolean found_video_overlay; + + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + +- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { ++ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { + return; + } + +- found_xoverlay = bp_video_find_xoverlay (player); ++ found_video_overlay = bp_video_find_video_overlay (player); + +- if (found_xoverlay) { +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); ++ if (found_video_overlay) { ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); + } + + #endif +@@ -164,7 +164,7 @@ static void + cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) + { + GstStructure * s = NULL; +- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); ++ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); + + if (G_UNLIKELY (!caps)) { + return; +@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) + } + + if (G_LIKELY (vpad)) { +- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); ++ GstCaps *caps = gst_pad_get_current_caps (vpad); + if (G_LIKELY (caps)) { + cb_caps_set (G_OBJECT (vpad), NULL, player); + gst_caps_unref (caps); +@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) + + player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; + +- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); ++ videosink = gst_element_factory_make ("autovideosink", "videosink"); + if (videosink == NULL) { +- videosink = gst_element_factory_make ("autovideosink", "videosink"); +- if (videosink == NULL) { +- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; +- videosink = gst_element_factory_make ("fakesink", "videosink"); +- if (videosink != NULL) { +- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); +- } ++ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; ++ videosink = gst_element_factory_make ("fakesink", "videosink"); ++ if (videosink != NULL) { ++ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); + } + } + + g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); + +- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); ++ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); + g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); + + if (GST_IS_BIN (videosink)) { +@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc + { + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + +- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { +- gst_x_overlay_expose (player->xoverlay); ++ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { ++ gst_video_overlay_expose (player->video_overlay); + return; + } + +- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { ++ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { + return; + } + +- gst_object_ref (player->xoverlay); ++ gst_object_ref (player->video_overlay); + +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); +- gst_x_overlay_expose (player->xoverlay); ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); ++ gst_video_overlay_expose (player->video_overlay); + +- gst_object_unref (player->xoverlay); ++ gst_object_unref (player->video_overlay); + } + + // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. +@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) + // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this + // //function anyway, but this way we can raise a more useful message should it fail. + // if (!gdk_window_ensure_native (window)) { +-// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); ++// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); + // } + //#endif + +diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c +index 5787c87..7e7dc78 100644 +--- a/libbanshee/banshee-player-vis.c ++++ b/libbanshee/banshee-player-vis.c +@@ -27,17 +27,17 @@ + // + + #include ++#include + + #include "banshee-player-vis.h" + + #define SLICE_SIZE 735 + + static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( +- "audio/x-raw-float, " ++ "audio/x-raw, " ++ "format = (string) " GST_AUDIO_NE(F32) ", " + "rate = (int) 44100, " +- "channels = (int) 2, " +- "endianness = (int) BYTE_ORDER, " +- "width = (int) 32" ++ "channels = (int) 2" + ); + + // --------------------------------------------------------------------------- +@@ -48,6 +48,7 @@ static void + bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) + { + BansheePlayer *player = (BansheePlayer*)userdata; ++ GstCaps *caps; + GstStructure *structure; + gint channels, wanted_size; + gfloat *data; +@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + player->vis_thawing = FALSE; + } + +- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); ++ caps = gst_pad_get_current_caps (pad); ++ structure = gst_caps_get_structure (caps, 0); + gst_structure_get_int (structure, "channels", &channels); ++ gst_caps_unref (caps); + + wanted_size = channels * SLICE_SIZE * sizeof (gfloat); + +- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); ++ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); + +- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { ++ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { + gfloat *deinterlaced = g_malloc (wanted_size); + gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); + +@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + g_free (deinterlaced); + g_free (specbuf); + ++ gst_adapter_unmap (player->vis_buffer); + gst_adapter_flush (player->vis_buffer, wanted_size); + } + } +@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + // Internal Functions + // --------------------------------------------------------------------------- + +-static void +-_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) ++static GstPadProbeReturn ++_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) + { + BansheePlayer *player = (BansheePlayer *) data; ++ GstEvent *event; + +- if (!blocked) { +- // Set thawing mode (discards buffers that are too old from the queue). +- player->vis_thawing = TRUE; +- } +-} +- +-static void +-_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) +-{ +- GstPad *queue_sink; +- +- if (player->vis_resampler == NULL) +- return; +- +- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); +- +- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); +- +- gst_object_unref (GST_OBJECT (queue_sink)); +-} +- +-static gboolean +-_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) +-{ +- BansheePlayer *player = (BansheePlayer *) data; ++ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) ++ return GST_PAD_PROBE_PASS; + ++ event = GST_EVENT (info->data); + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_FLUSH_START: + case GST_EVENT_FLUSH_STOP: + case GST_EVENT_SEEK: +- case GST_EVENT_NEWSEGMENT: ++ case GST_EVENT_SEGMENT: + case GST_EVENT_CUSTOM_DOWNSTREAM: + player->vis_thawing = TRUE; + + default: break; + } + +- if (player->vis_enabled) +- return TRUE; +- +- switch (GST_EVENT_TYPE (event)) { +- case GST_EVENT_EOS: +- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: +- _bp_vis_pipeline_set_blocked (player, FALSE); +- break; +- case GST_EVENT_CUSTOM_DOWNSTREAM: +- case GST_EVENT_NEWSEGMENT: +- _bp_vis_pipeline_set_blocked (player, TRUE); +- break; +- +- default: break; +- } +- +- return TRUE; ++ return GST_PAD_PROBE_PASS; + } + + void +@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + // Core elements, if something fails here, it's the end of the world + audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); + +- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); +- gst_object_unref (GST_OBJECT (pad)); ++ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); + + resampler = gst_element_factory_make ("audioresample", "vis-resample"); + converter = gst_element_factory_make ("audioconvert", "vis-convert"); +@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + converter, fakesink, NULL); + + pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); + gst_pad_link (teepad, pad); + gst_object_unref (GST_OBJECT (teepad)); + gst_object_unref (GST_OBJECT (pad)); +@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + player->vis_resampler = resampler; + player->vis_thawing = FALSE; + player->vis_enabled = FALSE; +- +- // Disable the pipeline till we hear otherwise from managed land. +- _bp_vis_pipeline_set_blocked (player, TRUE); + } + + void + _bp_vis_pipeline_destroy (BansheePlayer *player) + { ++ if (player->vis_event_probe_pad) { ++ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); ++ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); ++ player->vis_event_probe_pad = NULL; ++ } ++ + if (player->vis_buffer != NULL) { + gst_object_unref (player->vis_buffer); + player->vis_buffer = NULL; +@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb + + player->vis_data_cb = cb; + +- _bp_vis_pipeline_set_blocked (player, cb == NULL); + player->vis_enabled = cb != NULL; + } +diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c +index c655a72..b8f98b8 100644 +--- a/libbanshee/banshee-player.c ++++ b/libbanshee/banshee-player.c +@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) + P_INVOKE guint64 + bp_get_position (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 position; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { ++ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { + return position / GST_MSECOND; + } + +@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) + P_INVOKE guint64 + bp_get_duration (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 duration; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { ++ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { + return duration / GST_MSECOND; + } + +@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + gint64 pos = -1; + GstState state; +- GstFormat format = GST_FORMAT_BYTES; + gboolean paused = FALSE; + + // Gstreamer playbin do not support to set suburi during playback +@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, 0); + paused = (state == GST_STATE_PAUSED); + if (state >= GST_STATE_PAUSED) { +- gst_element_query_position (player->playbin, &format, &pos); ++ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); + gst_element_set_state (player->playbin, GST_STATE_READY); + // Force to wait asynch operation + gst_element_get_state (player->playbin, &state, NULL, -1); +@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, -1); + + if (pos != -1) { +- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); ++ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); + } + } + +diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c +index e0e8c85..b3f8fed 100644 +--- a/libbanshee/banshee-ripper.c ++++ b/libbanshee/banshee-ripper.c +@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) + static gboolean + br_iterate_timeout (BansheeRipper *ripper) + { +- GstFormat format = GST_FORMAT_TIME; + GstState state; + gint64 position; + +@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) + return TRUE; + } + +- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { ++ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) + GstIterator *pad_iter = gst_element_iterate_src_pads (element); + + BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { +- GstStructure *str = GST_PAD_CAPS (pad) != NULL +- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) ++ GstCaps *caps = gst_pad_get_current_caps (pad); ++ GstStructure *str = caps != NULL ++ ? gst_caps_get_structure (caps, 0) + : NULL; + + if (str != NULL) { +@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) + preferred_mimetype = mimetype; + } + } +- +- gst_object_unref (pad); ++ gst_caps_unref (caps); + }); +- +- gst_object_unref (element); + }); + + return preferred_mimetype; +@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) + return FALSE; + } + +- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); ++ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); + if (ripper->cddasrc == NULL) { + br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); + return FALSE; +@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, + + // We'll warn the user in the UI if we can't tag the encoded audio files + *tagging_supported = TRUE; +- gst_object_unref (element); + } + }); + +diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c +index ca15e8f..762dfa9 100644 +--- a/libbanshee/banshee-tagger.c ++++ b/libbanshee/banshee-tagger.c +@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata + GstTagList * + bt_tag_list_new () + { +- return gst_tag_list_new (); ++ return gst_tag_list_new_empty (); + } + + void +diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c +index 10fc35c..0e241f0 100644 +--- a/libbanshee/banshee-transcoder.c ++++ b/libbanshee/banshee-transcoder.c +@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const + static gboolean + gst_transcoder_iterate_timeout(GstTranscoder *transcoder) + { +- GstFormat format = GST_FORMAT_TIME; + gint64 position; + gint64 duration; + + g_return_val_if_fail(transcoder != NULL, FALSE); + +- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || +- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { ++ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || ++ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(transcoder != NULL); + +- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); ++ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + + transcoder->pipeline = gst_pipeline_new("pipeline"); + +- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); ++ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); + if(source_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); + return FALSE; + } + +- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); ++ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); + if(decoder_elem == NULL) { +- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); ++ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); ++ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); + if(sink_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); + return FALSE; +@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + return FALSE; + } + +- encoder_pad = gst_element_get_pad(conv_elem, "sink"); ++ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); + if(encoder_pad == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); + return FALSE; diff --git a/nonprism/banshee/PKGBUILD b/nonprism/banshee/PKGBUILD new file mode 100644 index 000000000..f8487407b --- /dev/null +++ b/nonprism/banshee/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $ +# Maintainer (Arch): Daniel Isenmann +# Contributor (Arch): György Balló +# Maintainer: André Silva + +pkgname=banshee +pkgver=2.6.2 +pkgrel=4.nonprism1 +pkgdesc="Music management and playback for GNOME, without gdata-sharp support" +arch=('i686' 'x86_64' 'mips64el') +url="http://banshee.fm/" +license=('MIT') +depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good) +makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') +optdepends=('gst-plugins-ugly: Extra media codecs' + 'gst-libav: Extra media codecs' + 'brasero: CD burning') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz + Initial-port-to-GStreamer-1.0.patch + Remove-build-time-enable-gapless-playback-option.patch) +md5sums=('12dbb8a996783f7081d538062a8589b7' + '16cbe2ef60e6f9b22015585bb3209648' + '0bf7ee4241b12538779c9ecc401d142a') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../Initial-port-to-GStreamer-1.0.patch + patch -p1 -i ../Remove-build-time-enable-gapless-playback-option.patch +} + +build() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd $pkgname-$pkgver + + # Disable youtube extension because it needs gdata-sharp to works + MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-docs \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-install \ + --disable-boo \ + --disable-youtube \ + --with-vendor-build-id=Parabola + make +} + +package() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch b/nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch new file mode 100644 index 000000000..dec054b5a --- /dev/null +++ b/nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch @@ -0,0 +1,202 @@ +From: Chow Loong Jin +Date: Mon, 26 Nov 2012 00:10:19 +0800 +Subject: Remove build-time --enable-gapless-playback option + +This was previously added to check for a new enough playbin, but since we're now +using Gstreamer 1.0, the playbin version should be new enough, and we can drop +the conditionals. +--- + configure.ac | 15 --------- + libbanshee/Makefile.am | 4 --- + libbanshee/banshee-player-pipeline.c | 4 --- + libbanshee/banshee-player.c | 10 ------ + .../Banshee.GStreamer/PlayerEngine.cs | 32 ++++++-------------- + src/Backends/Banshee.GStreamer/Makefile.am | 4 --- + src/Backends/Banshee.GStreamerSharp/Makefile.am | 4 --- + 7 files changed, 10 insertions(+), 63 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ac949c7..5d66fb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU + dnl Ubuntu One Music Store (optional) + BANSHEE_CHECK_UBUNTUONE + +-dnl Gapless, if we have a new-enough playbin2 +-ENABLE_GAPLESS="no" +-AC_ARG_ENABLE(gapless-playback, +- AC_HELP_STRING([--enable-gapless-playback], +- [Enable gapless playback engine (requires gst-plugins-base > 0.10.25.2)]), +- enable_gapless=$enableval, +- enable_gapless=auto) +-if test "x$enable_gapless" != "xno" ; then +- PKG_CHECK_MODULES([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10 > 0.10.25.2], ENABLE_GAPLESS=yes, ENABLE_GAPLESS=no) +- if test "x$enable_gapless" == "xyes" -a "x$ENABLE_GAPLESS" == "xno" ; then +- AC_MSG_ERROR([Gapless playback requires gstreamer-plugins-base > 0.10.25.2]) +- fi +-fi +-AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes") +- + dnl i18n + SHAMROCK_CONFIGURE_I18N($PACKAGE) + +diff --git a/libbanshee/Makefile.am b/libbanshee/Makefile.am +index 6ed369a..a05c492 100644 +--- a/libbanshee/Makefile.am ++++ b/libbanshee/Makefile.am +@@ -6,10 +6,6 @@ INCLUDES = \ + $(LIBBANSHEE_CFLAGS) \ + $(GST_CFLAGS) + +-if ENABLE_GAPLESS +-INCLUDES += -DENABLE_GAPLESS +-endif +- + bansheelibdir = $(pkglibdir) + bansheelib_LTLIBRARIES = libbanshee.la + +diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c +index 6c2af35..d4977e1 100644 +--- a/libbanshee/banshee-player-pipeline.c ++++ b/libbanshee/banshee-player-pipeline.c +@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) + return TRUE; + } + +-#ifdef ENABLE_GAPLESS + static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *player) + { + g_return_if_fail (IS_BANSHEE_PLAYER (player)); +@@ -257,7 +256,6 @@ static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *pla + player->about_to_finish_cb (player); + } + } +-#endif //ENABLE_GAPLESS + + static void bp_volume_changed_callback (GstElement *playbin, GParamSpec *spec, BansheePlayer *player) + { +@@ -296,12 +294,10 @@ _bp_pipeline_construct (BansheePlayer *player) + // source and decoder elements) based on source URI and stream content + player->playbin = gst_element_factory_make ("playbin", "playbin"); + +-#ifdef ENABLE_GAPLESS + // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. + // This can be removed once playbin generates its own next-track signal. + // bgo#584987 - this is included in >= 0.10.26 + g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); +-#endif //ENABLE_GAPLESS + + g_return_val_if_fail (player->playbin != NULL, FALSE); + +diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c +index b8f98b8..08c4f94 100644 +--- a/libbanshee/banshee-player.c ++++ b/libbanshee/banshee-player.c +@@ -303,16 +303,6 @@ bp_can_seek (BansheePlayer *player) + } + + P_INVOKE gboolean +-bp_supports_gapless (BansheePlayer *player) +-{ +-#ifdef ENABLE_GAPLESS +- return TRUE; +-#else +- return FALSE; +-#endif //ENABLE_GAPLESS +-} +- +-P_INVOKE gboolean + bp_audiosink_has_volume (BansheePlayer *player) + { + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE); +diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs +index 278ff51..05b1905 100644 +--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs ++++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs +@@ -747,16 +747,11 @@ namespace Banshee.GStreamer + get { return gapless_enabled; } + set + { +- if (bp_supports_gapless (handle)) { +- gapless_enabled = value; +- if (value) { +- bp_set_about_to_finish_callback (handle, about_to_finish_callback); +- } else { +- bp_set_about_to_finish_callback (handle, null); +- } ++ gapless_enabled = value; ++ if (value) { ++ bp_set_about_to_finish_callback (handle, about_to_finish_callback); + } else { +- gapless_enabled = false; +- next_track_pending = false; ++ bp_set_about_to_finish_callback (handle, null); + } + } + } +@@ -881,13 +876,11 @@ namespace Banshee.GStreamer + Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"), + delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); } + )); +- if (bp_supports_gapless (handle)) { +- gapless_preference = service["general"]["misc"].Add (new SchemaPreference (GaplessEnabledSchema, +- Catalog.GetString ("Enable _gapless playback"), +- Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), +- delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } +- )); +- } ++ gapless_preference = service["general"]["misc"].Add (new SchemaPreference (GaplessEnabledSchema, ++ Catalog.GetString ("Enable _gapless playback"), ++ Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), ++ delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } ++ )); + } + + private void UninstallPreferences () +@@ -898,9 +891,7 @@ namespace Banshee.GStreamer + } + + service["general"]["misc"].Remove (replaygain_preference); +- if (bp_supports_gapless (handle)) { +- service["general"]["misc"].Remove (gapless_preference); +- } ++ service["general"]["misc"].Remove (gapless_preference); + replaygain_preference = null; + gapless_preference = null; + } +@@ -969,9 +960,6 @@ namespace Banshee.GStreamer + BansheePlayerAboutToFinishCallback cb); + + [DllImport ("libbanshee.dll")] +- private static extern bool bp_supports_gapless (HandleRef player); +- +- [DllImport ("libbanshee.dll")] + private static extern bool bp_open (HandleRef player, IntPtr uri, bool maybeVideo); + + [DllImport ("libbanshee.dll")] +diff --git a/src/Backends/Banshee.GStreamer/Makefile.am b/src/Backends/Banshee.GStreamer/Makefile.am +index 118e525..321b270 100644 +--- a/src/Backends/Banshee.GStreamer/Makefile.am ++++ b/src/Backends/Banshee.GStreamer/Makefile.am +@@ -16,7 +16,3 @@ include $(top_srcdir)/build/build.mk + + EXTRA_DIST += Banshee.GStreamer.dll.config + module_SCRIPTS += Banshee.GStreamer.dll.config +- +-if ENABLE_GAPLESS +-BUILD_DEFINES="-define:ENABLE_GAPLESS" +-endif +\ No newline at end of file +diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.am b/src/Backends/Banshee.GStreamerSharp/Makefile.am +index 69424d7..769b260 100644 +--- a/src/Backends/Banshee.GStreamerSharp/Makefile.am ++++ b/src/Backends/Banshee.GStreamerSharp/Makefile.am +@@ -23,7 +23,3 @@ else + include $(top_srcdir)/build/build.dist.mk + EXTRA_DIST += Banshee.GStreamerSharp.dll.config + endif +- +-if ENABLE_GAPLESS +-BUILD_DEFINES="-define:ENABLE_GAPLESS" +-endif diff --git a/nonprism/banshee/banshee.install b/nonprism/banshee/banshee.install new file mode 100644 index 000000000..079ac953d --- /dev/null +++ b/nonprism/banshee/banshee.install @@ -0,0 +1,15 @@ +pkgname=banshee + +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-nonprism/PKGBUILD deleted file mode 100644 index 8ea7706a7..000000000 --- a/nonprism/bitlbee-nonprism/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $ - -# Contributor (Arch): FUBAR -# Contributor (Arch): simo -# Contributor (Arch): Jeff 'codemac' Mickey -# Contributor (Arch): Daniel J Griffiths -# Contributor (Arch): Gaetan Bisson -# Maintainer (Arch): Dave Reisner -# Maintainer: Márcio Silva - -_pkgname=bitlbee -pkgname=bitlbee-nonprism -pkgver=3.2.2 -pkgrel=1 -pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' -url='http://www.bitlbee.org/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('gnutls' 'glib2') -makedepends=('asciidoc' 'libotr') -optdepends=('libotr: for OTR encryption support') -provides=(${_pkgname}=$pkgver) -conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola") -replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola") -source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz" - 'bitlbee.tmpfiles') -sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c' - '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') -backup=('etc/bitlbee/bitlbee.conf' - 'etc/bitlbee/motd.txt') -install=bitlbee.install - -build() { - cd "$_pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --sbindir=/usr/bin \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --jabber=1 \ - --msn=0 \ - --oscar=0 \ - --yahoo=0 \ - --twitter=0 \ - --ssl=gnutls \ - --strip=0 \ - --otr=plugin \ - --skype=0 - - make -} - -package() { - make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd} - - install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" -} diff --git a/nonprism/bitlbee-nonprism/bitlbee.install b/nonprism/bitlbee-nonprism/bitlbee.install deleted file mode 100644 index c8a8f93a1..000000000 --- a/nonprism/bitlbee-nonprism/bitlbee.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - if ! getent group bitlbee &>/dev/null; then - groupadd -r -g 65 bitlbee >/dev/null - fi - if ! getent passwd bitlbee &>/dev/null; then - useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null - fi - systemd-tmpfiles --create bitlbee.conf -} - -post_upgrade() { - post_install -} - -post_remove() { - if getent passwd bitlbee &>/dev/null; then - userdel bitlbee >/dev/null - fi - if getent group bitlbee &>/dev/null; then - groupdel bitlbee >/dev/null - fi -} diff --git a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-nonprism/bitlbee.tmpfiles deleted file mode 100644 index da72a0a79..000000000 --- a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/nonprism/bitlbee/PKGBUILD b/nonprism/bitlbee/PKGBUILD new file mode 100644 index 000000000..dc271e9cc --- /dev/null +++ b/nonprism/bitlbee/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $ + +# Contributor (Arch): FUBAR +# Contributor (Arch): simo +# Contributor (Arch): Jeff 'codemac' Mickey +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Gaetan Bisson +# Maintainer (Arch): Dave Reisner +# Maintainer: Márcio Silva + +pkgname=bitlbee +pkgver=3.2.2 +pkgrel=1.parabola1.nonprism1 +pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' +url='http://www.bitlbee.org/' +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +depends=('gnutls' 'glib2') +makedepends=('asciidoc' 'libotr') +optdepends=('libotr: for OTR encryption support') +replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-coherence" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") +conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-coherence" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") +source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz" + 'bitlbee.tmpfiles') +sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c' + '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') +backup=('etc/bitlbee/bitlbee.conf' + 'etc/bitlbee/motd.txt') +install=bitlbee.install + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --sbindir=/usr/bin \ + --pidfile=/run/bitlbee/bitlbee.pid \ + --ipcsocket=/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/usr/lib/systemd/system \ + --jabber=1 \ + --msn=0 \ + --oscar=0 \ + --yahoo=0 \ + --twitter=0 \ + --ssl=gnutls \ + --strip=0 \ + --otr=plugin \ + --skype=0 + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd} + + install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" + install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" +} diff --git a/nonprism/bitlbee/bitlbee.install b/nonprism/bitlbee/bitlbee.install new file mode 100644 index 000000000..c8a8f93a1 --- /dev/null +++ b/nonprism/bitlbee/bitlbee.install @@ -0,0 +1,22 @@ +post_install() { + if ! getent group bitlbee &>/dev/null; then + groupadd -r -g 65 bitlbee >/dev/null + fi + if ! getent passwd bitlbee &>/dev/null; then + useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null + fi + systemd-tmpfiles --create bitlbee.conf +} + +post_upgrade() { + post_install +} + +post_remove() { + if getent passwd bitlbee &>/dev/null; then + userdel bitlbee >/dev/null + fi + if getent group bitlbee &>/dev/null; then + groupdel bitlbee >/dev/null + fi +} diff --git a/nonprism/bitlbee/bitlbee.tmpfiles b/nonprism/bitlbee/bitlbee.tmpfiles new file mode 100644 index 000000000..da72a0a79 --- /dev/null +++ b/nonprism/bitlbee/bitlbee.tmpfiles @@ -0,0 +1 @@ +d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD deleted file mode 100644 index b7df4c6a2..000000000 --- a/nonprism/bti-nonprism/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $ -# Maintainer (Arch): Jaroslav Lichtblau -# Contributor (Arch): Kaiting Chen -# Contributor (Arch): uvok -# Contributor (Arch): Urist <9362773 at gmail.com> - -_pkgname=bti -pkgname=bti-nonprism -pkgver=034 -pkgrel=1 -pkgdesc='Console client for status.net, without Twitter support' -arch=('i686' 'x86_64' 'mips64el') -url='http://gregkh.github.com/bti/' -license=('GPL') -depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c') -provides=($_pkgname=$pkgver) -conflicts=($_pkgname) -replaces=($_pkgname) -source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz - nonprism.patch) -sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83' - '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c') - -prepare() { - cd "${srcdir}"/$_pkgname-$pkgver - patch -Np1 -i ${srcdir}/nonprism.patch -} - -build() { - cd "${srcdir}"/$_pkgname-$pkgver - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}"/$_pkgname-$pkgver - - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch deleted file mode 100644 index 9423d03a7..000000000 --- a/nonprism/bti-nonprism/nonprism.patch +++ /dev/null @@ -1,407 +0,0 @@ -diff --git a/bti-bashcompletion b/bti-bashcompletion -index fa55d75..f957b32 100644 ---- a/bti-bashcompletion -+++ b/bti-bashcompletion -@@ -12,7 +12,7 @@ _bti() - fi - - if [[ "${prev}" == "--host" ]] ; then -- COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) ) -+ COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) ) - fi - - if [[ "${prev}" == "--action" ]] ; then -diff --git a/bti.1 b/bti.1 -index bdd6c76..3577e98 100644 ---- a/bti.1 -+++ b/bti.1 -@@ -28,23 +28,23 @@ - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- - .SH "NAME" --bti \- send a tweet to twitter\&.com from the command line -+bti \- send a tweet to status\&.net from the command line - .SH "SYNOPSIS" - .HP \w'\fBbti\fR\ 'u - \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR] - .SH "DESCRIPTION" - .PP --bti sends a tweet message to twitter\&.com\&. -+bti sends a tweet message to status\&.net\&. - .SH "OPTIONS" - .PP - \fB\-\-account account\fR - .RS 4 --Specify the twitter\&.com account name\&. -+Specify the status\&.net account name\&. - .RE - .PP - \fB\-\-password password\fR - .RS 4 --Specify the password of your twitter\&.com account\&. -+Specify the password of your status\&.net account\&. - .RE - .PP - \fB\-\-action action\fR -@@ -59,9 +59,9 @@ Specify the user whose messages you want to see when the action is "user", and t - .PP - \fB\-\-host HOST_NAME\fR - .RS 4 --Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com\&. -+Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. - .sp --If no host is specified, the default is to send to twitter\&.com\&. -+If no host is specified, the default is to send to status\&.net\&. - .RE - .PP - \fB\-\-proxy PROXY:PORT\fR -@@ -85,8 +85,6 @@ Specify a config file for bti to read from\&. By default, bti looks in the ~/\&. - .RS 4 - Status ID of a single post to which you want to create a threaded reply to\&. - .sp --For twitter, this is ignored unless the message starts with the @name of the owner of the post with the status ID\&. --.sp - For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&. - .RE - .PP -@@ -167,12 +165,12 @@ The account and password can be stored in a configuration file in the users home - .PP - \fBaccount\fR - .RS 4 --The twitter\&.com account name you wish to use to send this message with\&. -+The status\&.net account name you wish to use to send this message with\&. - .RE - .PP - \fBpassword\fR - .RS 4 --The twitter\&.com password for the account you wish to use to send this message with\&. -+The status\&.net password for the account you wish to use to send this message with\&. - .RE - .PP - \fB\-\-action action\fR -@@ -187,7 +185,7 @@ Specify the user you want to see his/her messages while the action is "user"\&. - .PP - \fBhost\fR - .RS 4 --The host you want to use to send the message to\&. Valid options is "twitter" or "custom" to specify your own server\&. -+The host you want to use to send the message to\&. Valid options is "statusnet" or "custom" to specify your own server\&. - .RE - .PP - \fBproxy\fR -diff --git a/bti.c b/bti.c -index f4b2c4d..226e111 100644 ---- a/bti.c -+++ b/bti.c -@@ -53,7 +53,7 @@ int debug; - - static void display_help(void) - { -- fprintf(stdout, "bti - send tweet to twitter or identi.ca\n" -+ fprintf(stdout, "bti - send tweet to status.net\n" - "Version: %s\n" - "Usage:\n" - " bti [options]\n" -@@ -258,14 +258,12 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer) - free(buffer); - } - --const char twitter_host[] = "https://api.twitter.com/1.1/statuses"; --const char twitter_host_stream[] = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */ --const char twitter_host_simple[] = "https://api.twitter.com/1.1"; --const char twitter_name[] = "twitter"; -+const char statusnet_host[] = "https://status.net/api/statuses"; -+const char statusnet_name[] = "statusnet"; - --static const char twitter_request_token_uri[] = "https://twitter.com/oauth/request_token"; --static const char twitter_access_token_uri[] = "https://twitter.com/oauth/access_token"; --static const char twitter_authorize_uri[] = "https://twitter.com/oauth/authorize?oauth_token="; -+static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob"; -+static const char statusnet_access_token_uri[] = "https://status.net/api/oauth/access_token"; -+static const char statusnet_authorize_uri[] = "https://status.net/api/oauth/authorize?oauth_token="; - static const char custom_request_token_uri[] = "/../oauth/request_token?oauth_callback=oob"; - static const char custom_access_token_uri[] = "/../oauth/access_token"; - static const char custom_authorize_uri[] = "/../oauth/authorize?oauth_token="; -@@ -792,9 +790,9 @@ static int request_access_token(struct session *session) - if (!session) - return -EINVAL; - -- if (session->host == HOST_TWITTER) -+ if (session->host == HOST_STATUSNET) - request_url = oauth_sign_url2( -- twitter_request_token_uri, NULL, -+ statusnet_request_token_uri, NULL, - OA_HMAC, NULL, session->consumer_key, - session->consumer_secret, NULL, NULL); - else { -@@ -825,11 +823,11 @@ static int request_access_token(struct session *session) - "Please open the following link in your browser, and " - "allow 'bti' to access your account. Then paste " - "back the provided PIN in here.\n"); -- if (session->host == HOST_TWITTER) { -- fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key); -+ if (session->host == HOST_STATUSNET) { -+ fprintf(stdout, "%s%s\nPIN: ", statusnet_authorize_uri, at_key); - verifier = session->readline(NULL); - sprintf(at_uri, "%s?oauth_verifier=%s", -- twitter_access_token_uri, verifier); -+ statusnet_access_token_uri, verifier); - } else { - fprintf(stdout, "%s%s%s\nPIN: ", - session->hosturl, custom_authorize_uri, at_key); -@@ -883,7 +881,7 @@ static int send_request(struct session *session) - return -EINVAL; - - if (!session->hosturl) -- session->hosturl = strdup(twitter_host); -+ session->hosturl = strdup(statusnet_host); - - if (session->no_oauth || session->guest) { - curl_buf = bti_curl_buffer_alloc(session->action); -@@ -898,7 +896,7 @@ static int send_request(struct session *session) - } - - if (!session->hosturl) -- session->hosturl = strdup(twitter_host); -+ session->hosturl = strdup(statusnet_host); - - switch (session->action) { - case ACTION_UPDATE: -@@ -959,7 +957,7 @@ static int send_request(struct session *session) - - case ACTION_PUBLIC: - /*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/ -- snprintf(endpoint, endpoint_size, "%s%s", twitter_host_stream, -+ snprintf(endpoint, endpoint_size, "%s%s", statusnet_host, - public_uri); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - break; -@@ -972,7 +970,6 @@ static int send_request(struct session *session) - break; - - case ACTION_DIRECT: -- /* NOT IMPLEMENTED - twitter requires authentication anyway */ - break; - - default: -@@ -1052,7 +1049,6 @@ static int send_request(struct session *session) - } else { - switch (session->action) { - case ACTION_UPDATE: -- /* dont test it here, let twitter return an error that we show */ - if (strlen_utf8(session->tweet) > 140 + 1000 ) { - printf("E: tweet is too long!\n"); - goto skip_tweet; -@@ -1083,7 +1079,7 @@ static int send_request(struct session *session) - mentions_uri, session->page); - break; - case ACTION_PUBLIC: -- sprintf(endpoint, "%s%s", twitter_host_stream, -+ sprintf(endpoint, "%s%s", statusnet_host, - public_uri); - break; - case ACTION_GROUP: -@@ -1102,7 +1098,7 @@ static int send_request(struct session *session) - break; - case ACTION_DIRECT: - escaped_tweet = oauth_url_escape(session->tweet); -- sprintf(endpoint, "%s%s?user=%s&text=%s", twitter_host_simple, -+ sprintf(endpoint, "%s%s?user=%s&text=%s", statusnet_host, - direct_uri, session->user, escaped_tweet); - is_post = 1; - break; -@@ -1691,10 +1687,10 @@ int main(int argc, char *argv[], char *envp[]) - free(session->hosturl); - if (session->hostname) - free(session->hostname); -- if (strcasecmp(optarg, "twitter") == 0) { -- session->host = HOST_TWITTER; -- session->hosturl = strdup(twitter_host); -- session->hostname = strdup(twitter_name); -+ if (strcasecmp(optarg, "statusnet") == 0) { -+ session->host = HOST_STATUSNET; -+ session->hosturl = strdup(statusnet_host); -+ session->hostname = strdup(statusnet_name); - } else { - session->host = HOST_CUSTOM; - session->hosturl = strdup(optarg); -@@ -1750,31 +1746,8 @@ int main(int argc, char *argv[], char *envp[]) - if (debug) - display_version(); - -- if (session->host == HOST_TWITTER) { -- if (!session->consumer_key || !session->consumer_secret) { -- if (session->action == ACTION_USER || -- session->action == ACTION_PUBLIC) { -- /* -- * Some actions may still work without -- * authentication -- */ -- session->guest = 1; -- } else { -- fprintf(stderr, -- "Twitter no longer supports HTTP basic authentication.\n" -- "Both consumer key, and consumer secret are required" -- " for bti in order to behave as an OAuth consumer.\n"); -- goto exit; -- } -- } -- if (session->action == ACTION_GROUP) { -- fprintf(stderr, "Groups only work in Identi.ca.\n"); -- goto exit; -- } -- } else { -- if (!session->consumer_key || !session->consumer_secret) -- session->no_oauth = 1; -- } -+ if (!session->consumer_key || !session->consumer_secret) -+ session->no_oauth = 1; - - if (session->no_oauth) { - if (!session->account) { -diff --git a/bti.example b/bti.example -index 57c55c9..29afa11 100644 ---- a/bti.example -+++ b/bti.example -@@ -5,7 +5,7 @@ - # a message. - account=twitmaster - password=icanhascheezburger --host=identica -+host=statusnet - # Example of a custom StatusNet installation - #host=http://army.twit.tv/api/statuses - logfile=.bti.log -diff --git a/bti.h b/bti.h -index 3d5ed9c..e466c2a 100644 ---- a/bti.h -+++ b/bti.h -@@ -17,7 +17,7 @@ - #define __BTI_H - - enum host { -- HOST_TWITTER = 0, -+ HOST_STATUSNET = 1, - HOST_CUSTOM = 2 - }; - -@@ -75,8 +75,8 @@ struct bti_curl_buffer { - int length; - }; - --extern const char twitter_host[]; --extern const char twitter_name[]; -+extern const char statusnet_host[]; -+extern const char statusnet_name[]; - extern int debug; - - extern void bti_parse_configfile(struct session *session); -diff --git a/bti.xml b/bti.xml -index c0b89ee..00ad9a8 100644 ---- a/bti.xml -+++ b/bti.xml -@@ -21,7 +21,7 @@ - - - bti -- send a tweet to twitter.com from the command line -+ send a tweet to status.net from the command line - - - -@@ -49,7 +49,7 @@ - - - DESCRIPTION -- bti sends a tweet message to twitter.com. -+ bti sends a tweet message to status.net. - - - -@@ -59,7 +59,7 @@ - - - -- Specify the twitter.com account name. -+ Specify the status.net account name. - - - -@@ -67,7 +67,7 @@ - - - -- Specify the password of your twitter.com account. -+ Specify the password of your status.net account. - - - -@@ -100,10 +100,10 @@ - - - Specify the host which you want to send your message to. Valid -- options are "twitter" to send to twitter.com. -+ options are "statusnet" to send to status.net. - - -- If no host is specified, the default is to send to twitter.com. -+ If no host is specified, the default is to send to status.net. - - - -@@ -149,10 +149,6 @@ - reply to. - - -- For twitter, this is ignored unless the message starts with the -- @name of the owner of the post with the status ID. -- -- - For status.net, this can link any two messages into context with - each other. Status.net will also link a message that contains an - @name without this without regard to context. -@@ -301,7 +297,7 @@ - - - -- The twitter.com account name you wish to use to send this -+ The status.net account name you wish to use to send this - message with. - - -@@ -310,7 +306,7 @@ - - - -- The twitter.com password for the account you wish to use -+ The status.net password for the account you wish to use - to send this message with. - - -@@ -341,7 +337,7 @@ - - - The host you want to use to send the message to. Valid -- options is "twitter" or "custom" to specify your own server. -+ options is "statusnet" or "custom" to specify your own server. - - - -diff --git a/config.c b/config.c -index e6fecc1..0bbc186 100644 ---- a/config.c -+++ b/config.c -@@ -219,10 +219,10 @@ static int retweet_callback(struct session *session, char *value) - - static int host_callback(struct session *session, char *value) - { -- if (strcasecmp(value, "twitter") == 0) { -- session->host = HOST_TWITTER; -- session->hosturl = strdup(twitter_host); -- session->hostname = strdup(twitter_name); -+ if (strcasecmp(value, "statusnet") == 0) { -+ session->host = HOST_STATUSNET; -+ session->hosturl = strdup(statusnet_host); -+ session->hostname = strdup(statusnet_name); - } else { - session->host = HOST_CUSTOM; - session->hosturl = strdup(value); diff --git a/nonprism/bti/PKGBUILD b/nonprism/bti/PKGBUILD new file mode 100644 index 000000000..24a45223b --- /dev/null +++ b/nonprism/bti/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $ +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Kaiting Chen +# Contributor (Arch): uvok +# Contributor (Arch): Urist <9362773 at gmail.com> + +pkgname=bti +pkgver=034 +pkgrel=1.nonprism1 +pkgdesc='Console client for status.net, without Twitter support' +arch=('i686' 'x86_64' 'mips64el') +url='http://gregkh.github.com/bti/' +license=('GPL') +depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c') +conflicts=(${pkgname}-nonprism) +replaces=(${pkgname}-nonprism) +source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz + nonprism.patch) +sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83' + '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c') + +prepare() { + cd "${srcdir}"/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/nonprism.patch +} + +build() { + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr + + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/bti/nonprism.patch b/nonprism/bti/nonprism.patch new file mode 100644 index 000000000..9423d03a7 --- /dev/null +++ b/nonprism/bti/nonprism.patch @@ -0,0 +1,407 @@ +diff --git a/bti-bashcompletion b/bti-bashcompletion +index fa55d75..f957b32 100644 +--- a/bti-bashcompletion ++++ b/bti-bashcompletion +@@ -12,7 +12,7 @@ _bti() + fi + + if [[ "${prev}" == "--host" ]] ; then +- COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) ) ++ COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) ) + fi + + if [[ "${prev}" == "--action" ]] ; then +diff --git a/bti.1 b/bti.1 +index bdd6c76..3577e98 100644 +--- a/bti.1 ++++ b/bti.1 +@@ -28,23 +28,23 @@ + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- + .SH "NAME" +-bti \- send a tweet to twitter\&.com from the command line ++bti \- send a tweet to status\&.net from the command line + .SH "SYNOPSIS" + .HP \w'\fBbti\fR\ 'u + \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR] + .SH "DESCRIPTION" + .PP +-bti sends a tweet message to twitter\&.com\&. ++bti sends a tweet message to status\&.net\&. + .SH "OPTIONS" + .PP + \fB\-\-account account\fR + .RS 4 +-Specify the twitter\&.com account name\&. ++Specify the status\&.net account name\&. + .RE + .PP + \fB\-\-password password\fR + .RS 4 +-Specify the password of your twitter\&.com account\&. ++Specify the password of your status\&.net account\&. + .RE + .PP + \fB\-\-action action\fR +@@ -59,9 +59,9 @@ Specify the user whose messages you want to see when the action is "user", and t + .PP + \fB\-\-host HOST_NAME\fR + .RS 4 +-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com\&. ++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. + .sp +-If no host is specified, the default is to send to twitter\&.com\&. ++If no host is specified, the default is to send to status\&.net\&. + .RE + .PP + \fB\-\-proxy PROXY:PORT\fR +@@ -85,8 +85,6 @@ Specify a config file for bti to read from\&. By default, bti looks in the ~/\&. + .RS 4 + Status ID of a single post to which you want to create a threaded reply to\&. + .sp +-For twitter, this is ignored unless the message starts with the @name of the owner of the post with the status ID\&. +-.sp + For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&. + .RE + .PP +@@ -167,12 +165,12 @@ The account and password can be stored in a configuration file in the users home + .PP + \fBaccount\fR + .RS 4 +-The twitter\&.com account name you wish to use to send this message with\&. ++The status\&.net account name you wish to use to send this message with\&. + .RE + .PP + \fBpassword\fR + .RS 4 +-The twitter\&.com password for the account you wish to use to send this message with\&. ++The status\&.net password for the account you wish to use to send this message with\&. + .RE + .PP + \fB\-\-action action\fR +@@ -187,7 +185,7 @@ Specify the user you want to see his/her messages while the action is "user"\&. + .PP + \fBhost\fR + .RS 4 +-The host you want to use to send the message to\&. Valid options is "twitter" or "custom" to specify your own server\&. ++The host you want to use to send the message to\&. Valid options is "statusnet" or "custom" to specify your own server\&. + .RE + .PP + \fBproxy\fR +diff --git a/bti.c b/bti.c +index f4b2c4d..226e111 100644 +--- a/bti.c ++++ b/bti.c +@@ -53,7 +53,7 @@ int debug; + + static void display_help(void) + { +- fprintf(stdout, "bti - send tweet to twitter or identi.ca\n" ++ fprintf(stdout, "bti - send tweet to status.net\n" + "Version: %s\n" + "Usage:\n" + " bti [options]\n" +@@ -258,14 +258,12 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer) + free(buffer); + } + +-const char twitter_host[] = "https://api.twitter.com/1.1/statuses"; +-const char twitter_host_stream[] = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */ +-const char twitter_host_simple[] = "https://api.twitter.com/1.1"; +-const char twitter_name[] = "twitter"; ++const char statusnet_host[] = "https://status.net/api/statuses"; ++const char statusnet_name[] = "statusnet"; + +-static const char twitter_request_token_uri[] = "https://twitter.com/oauth/request_token"; +-static const char twitter_access_token_uri[] = "https://twitter.com/oauth/access_token"; +-static const char twitter_authorize_uri[] = "https://twitter.com/oauth/authorize?oauth_token="; ++static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob"; ++static const char statusnet_access_token_uri[] = "https://status.net/api/oauth/access_token"; ++static const char statusnet_authorize_uri[] = "https://status.net/api/oauth/authorize?oauth_token="; + static const char custom_request_token_uri[] = "/../oauth/request_token?oauth_callback=oob"; + static const char custom_access_token_uri[] = "/../oauth/access_token"; + static const char custom_authorize_uri[] = "/../oauth/authorize?oauth_token="; +@@ -792,9 +790,9 @@ static int request_access_token(struct session *session) + if (!session) + return -EINVAL; + +- if (session->host == HOST_TWITTER) ++ if (session->host == HOST_STATUSNET) + request_url = oauth_sign_url2( +- twitter_request_token_uri, NULL, ++ statusnet_request_token_uri, NULL, + OA_HMAC, NULL, session->consumer_key, + session->consumer_secret, NULL, NULL); + else { +@@ -825,11 +823,11 @@ static int request_access_token(struct session *session) + "Please open the following link in your browser, and " + "allow 'bti' to access your account. Then paste " + "back the provided PIN in here.\n"); +- if (session->host == HOST_TWITTER) { +- fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key); ++ if (session->host == HOST_STATUSNET) { ++ fprintf(stdout, "%s%s\nPIN: ", statusnet_authorize_uri, at_key); + verifier = session->readline(NULL); + sprintf(at_uri, "%s?oauth_verifier=%s", +- twitter_access_token_uri, verifier); ++ statusnet_access_token_uri, verifier); + } else { + fprintf(stdout, "%s%s%s\nPIN: ", + session->hosturl, custom_authorize_uri, at_key); +@@ -883,7 +881,7 @@ static int send_request(struct session *session) + return -EINVAL; + + if (!session->hosturl) +- session->hosturl = strdup(twitter_host); ++ session->hosturl = strdup(statusnet_host); + + if (session->no_oauth || session->guest) { + curl_buf = bti_curl_buffer_alloc(session->action); +@@ -898,7 +896,7 @@ static int send_request(struct session *session) + } + + if (!session->hosturl) +- session->hosturl = strdup(twitter_host); ++ session->hosturl = strdup(statusnet_host); + + switch (session->action) { + case ACTION_UPDATE: +@@ -959,7 +957,7 @@ static int send_request(struct session *session) + + case ACTION_PUBLIC: + /*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/ +- snprintf(endpoint, endpoint_size, "%s%s", twitter_host_stream, ++ snprintf(endpoint, endpoint_size, "%s%s", statusnet_host, + public_uri); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + break; +@@ -972,7 +970,6 @@ static int send_request(struct session *session) + break; + + case ACTION_DIRECT: +- /* NOT IMPLEMENTED - twitter requires authentication anyway */ + break; + + default: +@@ -1052,7 +1049,6 @@ static int send_request(struct session *session) + } else { + switch (session->action) { + case ACTION_UPDATE: +- /* dont test it here, let twitter return an error that we show */ + if (strlen_utf8(session->tweet) > 140 + 1000 ) { + printf("E: tweet is too long!\n"); + goto skip_tweet; +@@ -1083,7 +1079,7 @@ static int send_request(struct session *session) + mentions_uri, session->page); + break; + case ACTION_PUBLIC: +- sprintf(endpoint, "%s%s", twitter_host_stream, ++ sprintf(endpoint, "%s%s", statusnet_host, + public_uri); + break; + case ACTION_GROUP: +@@ -1102,7 +1098,7 @@ static int send_request(struct session *session) + break; + case ACTION_DIRECT: + escaped_tweet = oauth_url_escape(session->tweet); +- sprintf(endpoint, "%s%s?user=%s&text=%s", twitter_host_simple, ++ sprintf(endpoint, "%s%s?user=%s&text=%s", statusnet_host, + direct_uri, session->user, escaped_tweet); + is_post = 1; + break; +@@ -1691,10 +1687,10 @@ int main(int argc, char *argv[], char *envp[]) + free(session->hosturl); + if (session->hostname) + free(session->hostname); +- if (strcasecmp(optarg, "twitter") == 0) { +- session->host = HOST_TWITTER; +- session->hosturl = strdup(twitter_host); +- session->hostname = strdup(twitter_name); ++ if (strcasecmp(optarg, "statusnet") == 0) { ++ session->host = HOST_STATUSNET; ++ session->hosturl = strdup(statusnet_host); ++ session->hostname = strdup(statusnet_name); + } else { + session->host = HOST_CUSTOM; + session->hosturl = strdup(optarg); +@@ -1750,31 +1746,8 @@ int main(int argc, char *argv[], char *envp[]) + if (debug) + display_version(); + +- if (session->host == HOST_TWITTER) { +- if (!session->consumer_key || !session->consumer_secret) { +- if (session->action == ACTION_USER || +- session->action == ACTION_PUBLIC) { +- /* +- * Some actions may still work without +- * authentication +- */ +- session->guest = 1; +- } else { +- fprintf(stderr, +- "Twitter no longer supports HTTP basic authentication.\n" +- "Both consumer key, and consumer secret are required" +- " for bti in order to behave as an OAuth consumer.\n"); +- goto exit; +- } +- } +- if (session->action == ACTION_GROUP) { +- fprintf(stderr, "Groups only work in Identi.ca.\n"); +- goto exit; +- } +- } else { +- if (!session->consumer_key || !session->consumer_secret) +- session->no_oauth = 1; +- } ++ if (!session->consumer_key || !session->consumer_secret) ++ session->no_oauth = 1; + + if (session->no_oauth) { + if (!session->account) { +diff --git a/bti.example b/bti.example +index 57c55c9..29afa11 100644 +--- a/bti.example ++++ b/bti.example +@@ -5,7 +5,7 @@ + # a message. + account=twitmaster + password=icanhascheezburger +-host=identica ++host=statusnet + # Example of a custom StatusNet installation + #host=http://army.twit.tv/api/statuses + logfile=.bti.log +diff --git a/bti.h b/bti.h +index 3d5ed9c..e466c2a 100644 +--- a/bti.h ++++ b/bti.h +@@ -17,7 +17,7 @@ + #define __BTI_H + + enum host { +- HOST_TWITTER = 0, ++ HOST_STATUSNET = 1, + HOST_CUSTOM = 2 + }; + +@@ -75,8 +75,8 @@ struct bti_curl_buffer { + int length; + }; + +-extern const char twitter_host[]; +-extern const char twitter_name[]; ++extern const char statusnet_host[]; ++extern const char statusnet_name[]; + extern int debug; + + extern void bti_parse_configfile(struct session *session); +diff --git a/bti.xml b/bti.xml +index c0b89ee..00ad9a8 100644 +--- a/bti.xml ++++ b/bti.xml +@@ -21,7 +21,7 @@ + + + bti +- send a tweet to twitter.com from the command line ++ send a tweet to status.net from the command line + + + +@@ -49,7 +49,7 @@ + + + DESCRIPTION +- bti sends a tweet message to twitter.com. ++ bti sends a tweet message to status.net. + + + +@@ -59,7 +59,7 @@ + + + +- Specify the twitter.com account name. ++ Specify the status.net account name. + + + +@@ -67,7 +67,7 @@ + + + +- Specify the password of your twitter.com account. ++ Specify the password of your status.net account. + + + +@@ -100,10 +100,10 @@ + + + Specify the host which you want to send your message to. Valid +- options are "twitter" to send to twitter.com. ++ options are "statusnet" to send to status.net. + + +- If no host is specified, the default is to send to twitter.com. ++ If no host is specified, the default is to send to status.net. + + + +@@ -149,10 +149,6 @@ + reply to. + + +- For twitter, this is ignored unless the message starts with the +- @name of the owner of the post with the status ID. +- +- + For status.net, this can link any two messages into context with + each other. Status.net will also link a message that contains an + @name without this without regard to context. +@@ -301,7 +297,7 @@ + + + +- The twitter.com account name you wish to use to send this ++ The status.net account name you wish to use to send this + message with. + + +@@ -310,7 +306,7 @@ + + + +- The twitter.com password for the account you wish to use ++ The status.net password for the account you wish to use + to send this message with. + + +@@ -341,7 +337,7 @@ + + + The host you want to use to send the message to. Valid +- options is "twitter" or "custom" to specify your own server. ++ options is "statusnet" or "custom" to specify your own server. + + + +diff --git a/config.c b/config.c +index e6fecc1..0bbc186 100644 +--- a/config.c ++++ b/config.c +@@ -219,10 +219,10 @@ static int retweet_callback(struct session *session, char *value) + + static int host_callback(struct session *session, char *value) + { +- if (strcasecmp(value, "twitter") == 0) { +- session->host = HOST_TWITTER; +- session->hosturl = strdup(twitter_host); +- session->hostname = strdup(twitter_name); ++ if (strcasecmp(value, "statusnet") == 0) { ++ session->host = HOST_STATUSNET; ++ session->hosturl = strdup(statusnet_host); ++ session->hostname = strdup(statusnet_name); + } else { + session->host = HOST_CUSTOM; + session->hosturl = strdup(value); diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD deleted file mode 100644 index 58f77e1aa..000000000 --- a/nonprism/centerim-nonprism/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 113946 2014-07-01 10:19:48Z spupykin $ -# Maintainer (Arch): Sergej Pupykin -# Contributor (Arch): Aaron Griffin -# Contributor (Arch): shild - -_pkgname=centerim -pkgname=centerim-nonprism -pkgver=4.22.10 -pkgrel=3 -pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.centerim.org" -license=('GPL') -depends=('python2' 'libjpeg' 'gpgme') -replaces=("$_pkgname" 'centericq') -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz" - 'nonprism.patch') -md5sums=('7565c3c8cac98a4e2d8524076a44676f' - '74887744683b68ea37d4d020c80fb675') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # add patch to remove more protocols - patch -Np1 -i "${srcdir}/nonprism.patch" -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - sed -i 's#python#python2#' misc/CenterIMLog2HTML.py - sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h - ./configure --prefix=/usr \ - --with-ssl \ - --with-openssl \ - --enable-locales-fix \ - --disable-icq \ - --disable-yahoo \ - --disable-aim \ - --disable-gg \ - --disable-msn - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/centerim-nonprism/nonprism.patch b/nonprism/centerim-nonprism/nonprism.patch deleted file mode 100644 index 43c732966..000000000 --- a/nonprism/centerim-nonprism/nonprism.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/firetalk/Makefile.am b/firetalk/Makefile.am -index cf14403..dab773d 100644 ---- a/firetalk/Makefile.am -+++ b/firetalk/Makefile.am -@@ -1,7 +1,7 @@ - noinst_LIBRARIES = libfiretalk.a --EXTRA_DIST = aim.c irc.c toc.c firetalk.c safestring.c oscar.c aim.h toc.h firetalk-int.h firetalk.h safestring.h oscar.h toc2_uuids.h -+EXTRA_DIST = irc.c firetalk.c safestring.c firetalk-int.h firetalk.h safestring.h - AUTOMAKE_OPTIONS = foreign --libfiretalk_a_SOURCES = aim.c irc.c toc.c firetalk.c safestring.c oscar.c -+libfiretalk_a_SOURCES = irc.c firetalk.c safestring.c - - SUBDIRS = - AM_CPPFLAGS = -I$(top_srcdir)/../connwrap -I$(top_srcdir)/../connwrap diff --git a/nonprism/centerim/PKGBUILD b/nonprism/centerim/PKGBUILD new file mode 100644 index 000000000..6813a7bdf --- /dev/null +++ b/nonprism/centerim/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 113946 2014-07-01 10:19:48Z spupykin $ +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Aaron Griffin +# Contributor (Arch): shild + +pkgname=centerim +pkgver=4.22.10 +pkgrel=3.nonprism1 +pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.centerim.org" +license=('GPL') +depends=('python2' 'libjpeg' 'gpgme') +replaces=('centericq' "${pkgname}-nonprism") +conflicts=(${pkgname}-nonprism) +source=("http://www.centerim.org/download/releases/$pkgname-$pkgver.tar.gz" + 'nonprism.patch') +md5sums=('7565c3c8cac98a4e2d8524076a44676f' + '74887744683b68ea37d4d020c80fb675') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # add patch to remove more protocols + patch -Np1 -i "${srcdir}/nonprism.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#python#python2#' misc/CenterIMLog2HTML.py + sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h + ./configure --prefix=/usr \ + --with-ssl \ + --with-openssl \ + --enable-locales-fix \ + --disable-icq \ + --disable-yahoo \ + --disable-aim \ + --disable-gg \ + --disable-msn + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/centerim/nonprism.patch b/nonprism/centerim/nonprism.patch new file mode 100644 index 000000000..43c732966 --- /dev/null +++ b/nonprism/centerim/nonprism.patch @@ -0,0 +1,14 @@ +diff --git a/firetalk/Makefile.am b/firetalk/Makefile.am +index cf14403..dab773d 100644 +--- a/firetalk/Makefile.am ++++ b/firetalk/Makefile.am +@@ -1,7 +1,7 @@ + noinst_LIBRARIES = libfiretalk.a +-EXTRA_DIST = aim.c irc.c toc.c firetalk.c safestring.c oscar.c aim.h toc.h firetalk-int.h firetalk.h safestring.h oscar.h toc2_uuids.h ++EXTRA_DIST = irc.c firetalk.c safestring.c firetalk-int.h firetalk.h safestring.h + AUTOMAKE_OPTIONS = foreign +-libfiretalk_a_SOURCES = aim.c irc.c toc.c firetalk.c safestring.c oscar.c ++libfiretalk_a_SOURCES = irc.c firetalk.c safestring.c + + SUBDIRS = + AM_CPPFLAGS = -I$(top_srcdir)/../connwrap -I$(top_srcdir)/../connwrap diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD deleted file mode 100644 index 62d23478c..000000000 --- a/nonprism/choqok-nonprism/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $ -# Maintainer (Arch): Peter Richard Lewis -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Emanuele Rossi -# Contributor (Arch): Bram Schoenmakers -# Maintainer: Márcio Silva - -_pkgname=choqok -pkgname=choqok-nonprism -pkgver=1.4 -pkgrel=1.1 -pkgdesc="A status.net client for KDE, without Twitter support" -url='http://choqok.gnufolks.org/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -provides=("$_pkgname=$pkgver") -conflicts=($_pkgname) -depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') -makedepends=('cmake' 'automoc4') -optdepends=('kdebase-konqueror: proxy support') -install="${_pkgname}.install" -source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz") -md5sums=('2efe34ed903b448a21d9233d8033dbdb') - -prepare() { - mkdir build - - cd "${srcdir}/${_pkgname}-${pkgver}" - - # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services - sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt - sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp - sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp - - # remove uploaders plugin (with only nonprivacy services) - sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt - sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop - - # remove twitter on docbook - sed -i 's| and Twitter.com|| - s| and another with the alias|.| - s|while a post using Twitter is called a tweet|| - \|Twitter|d;\|twitter|d' doc/index.docbook -} - -build() { - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok-nonprism/choqok.install deleted file mode 100644 index e70c054ec..000000000 --- a/nonprism/choqok-nonprism/choqok.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/choqok/PKGBUILD b/nonprism/choqok/PKGBUILD new file mode 100644 index 000000000..6a815e7c6 --- /dev/null +++ b/nonprism/choqok/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $ +# Maintainer (Arch): Peter Richard Lewis +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Emanuele Rossi +# Contributor (Arch): Bram Schoenmakers +# Maintainer: Márcio Silva + +pkgname=choqok +pkgver=1.4 +pkgrel=1.nonprism1 +pkgdesc="A status.net client for KDE, without Twitter support" +url='http://choqok.gnufolks.org/' +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +conflicts=(${pkgname}-nonprism) +replaces=(${pkgname}-nonprism) +depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') +makedepends=('cmake' 'automoc4') +optdepends=('kdebase-konqueror: proxy support') +install="${pkgname}.install" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('2efe34ed903b448a21d9233d8033dbdb') + +prepare() { + mkdir build + + cd "${srcdir}/${pkgname}-${pkgver}" + + # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services + sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt + sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp + sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp + + # remove uploaders plugin (with only nonprivacy services) + sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt + sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop + + # remove twitter on docbook + sed -i 's| and Twitter.com|| + s| and another with the alias|.| + s|while a post using Twitter is called a tweet|| + \|Twitter|d;\|twitter|d' doc/index.docbook +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/choqok/choqok.install b/nonprism/choqok/choqok.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/nonprism/choqok/choqok.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD deleted file mode 100644 index 7dcfb61d0..000000000 --- a/nonprism/claws-mail-nonprism/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 214747 2014-06-09 09:54:05Z andyrtr $ -# Maintainer (Arch): Andreas Radke -# Maintainer: Márcio Silva - -_pkgname=claws-mail -pkgname=$_pkgname-nonprism -pkgver=3.10.1 -pkgrel=1 -pkgdesc="A GTK+ based e-mail client, without libgdata support" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') -url="http://www.$_pkgname.org" -depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface' - 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('spamassassin' 'bogofilter' 'valgrind' - # dependencies for plugins - 'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') - #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases -optdepends=('python2: needed for some tools and python plugin' - 'perl: needed for some tools and perl plugin' - 'spamassassin: adds support for spamfiltering' - 'bogofilter: adds support for spamfiltering' - 'libnotify: for notification plugin' - 'libcanberra: for notification plugin' - 'dbus: for notification plugin' - 'libxml2: for gtkhtml2_viewer and rssyl plugins' - 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' - 'libarchive: for archive plugin and various other plugins' - 'libytnef: for tnef_parse plugin' - 'webkitgtk2: for the fancy webkit html plugin' - 'libsoup: for the fancy webkit html plugin' - 'poppler-glib: for pdf viewer plugin' - 'ghostscript: for pdf viewer plugin') -replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism") -conflicts=("$_pkgname" "$_pkgname-extra-plugins") -provides=("$_pkgname=$pkgver" 'claws') -install=$_pkgname.install -source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$_pkgname-$pkgver.tar.xz{,.asc}) -sha1sums=('fff74eabee65b78dc842abf34819cc5dd9e7feca' - 'SKIP') - -build() { - cd $_pkgname-$pkgver - - # fixes for python2 - export PYTHON="/usr/bin/python2" - sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py - sed -i 's:python -c:python2 -c:g' configure - - setarch $CARCH ./configure --prefix=/usr --disable-static \ - --enable-enchant \ - --enable-gnutls \ - --enable-ldap \ - --enable-crash-dialog \ - --enable-pgpmime-plugin \ - --enable-spamassassin-plugin \ - --enable-bogofilter-plugin \ - --disable-gdata-plugin - #--help - setarch $CARCH make -} - -package() { - cd $_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - # build and install extra tools - cd tools - setarch $CARCH make - # all executables and .conf files ; only top directory - find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 $i \ - $pkgdir/usr/lib/$_pkgname/tools/$i - done -} diff --git a/nonprism/claws-mail-nonprism/claws-mail.install b/nonprism/claws-mail-nonprism/claws-mail.install deleted file mode 100644 index 4d2f155d4..000000000 --- a/nonprism/claws-mail-nonprism/claws-mail.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - diff --git a/nonprism/claws-mail/PKGBUILD b/nonprism/claws-mail/PKGBUILD new file mode 100644 index 000000000..016c2a385 --- /dev/null +++ b/nonprism/claws-mail/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 214747 2014-06-09 09:54:05Z andyrtr $ +# Maintainer (Arch): Andreas Radke +# Maintainer: Márcio Silva + +pkgname=claws-mail +pkgver=3.10.1 +pkgrel=1.nonprism1 +pkgdesc="A GTK+ based e-mail client, without libgdata support" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +url="http://www.$pkgname.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface' + 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('spamassassin' 'bogofilter' 'valgrind' + # dependencies for plugins + 'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=("sylpheed-claws" "$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism") +conflicts=("$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism") +provides=('claws') +install=$pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$pkgname-$pkgver.tar.xz{,.asc}) +sha1sums=('fff74eabee65b78dc842abf34819cc5dd9e7feca' + 'SKIP') + +build() { + cd $pkgname-$pkgver + + # fixes for python2 + export PYTHON="/usr/bin/python2" + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure + + setarch $CARCH ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --disable-gdata-plugin + #--help + setarch $CARCH make +} + +package() { + cd $pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + # build and install extra tools + cd tools + setarch $CARCH make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 $i \ + $pkgdir/usr/lib/$pkgname/tools/$i + done +} diff --git a/nonprism/claws-mail/claws-mail.install b/nonprism/claws-mail/claws-mail.install new file mode 100644 index 000000000..4d2f155d4 --- /dev/null +++ b/nonprism/claws-mail/claws-mail.install @@ -0,0 +1,16 @@ +post_install() { + echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + diff --git a/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable-nonprism/PKGBUILD deleted file mode 100644 index 6ec07aba4..000000000 --- a/nonprism/darktable-nonprism/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 111322 2014-05-16 15:51:54Z spupykin $ -# Maintainer (Arch): Sergej Pupykin -# Maintainer (Arch): Christian Himpel -# Contributor (Arch): Johannes Hanika - -_pkgname=darktable -pkgname=darktable-nonprism -pkgver=1.4.2 -_pkgver=1.4 -pkgrel=3 -pkgdesc="Utility to organize and develop raw images, without flickcurl support" -arch=('i686' 'x86_64' 'mips64el') -url=http://darktable.sf.net/ -license=('GPL3') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt' - 'libsoup' 'gtk-engines' 'json-glib') -makedepends=('intltool>=0.40' 'cmake' 'librsvg') -optdepends=('librsvg') -install=darktable.install -source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('f86554329c2c809ffb009244a6f1d643') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - mkdir -p build - cd build - CXXFLAGS+=" -fpermissive" - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DDONT_INSTALL_GCONF_SCHEMAS=True \ - -DBINARY_PACKAGE_BUILD=1 \ - -DUSE_GCONF_BACKEND=Off \ - -DBUILD_USERMANUAL=False \ - .. - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver/build" - make DESTDIR="$pkgdir" install - mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${_pkgname}-${pkgver}" -} diff --git a/nonprism/darktable-nonprism/darktable.install b/nonprism/darktable-nonprism/darktable.install deleted file mode 100644 index 24b15a4f5..000000000 --- a/nonprism/darktable-nonprism/darktable.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q -} - -post_upgrade() { - [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q -} - -post_remove() { - [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q -} diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD new file mode 100644 index 000000000..0c25441c7 --- /dev/null +++ b/nonprism/darktable/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 111322 2014-05-16 15:51:54Z spupykin $ +# Maintainer (Arch): Sergej Pupykin +# Maintainer (Arch): Christian Himpel +# Contributor (Arch): Johannes Hanika + +pkgname=darktable +pkgver=1.4.2 +_pkgver=1.4 +pkgrel=3.nonprism1 +pkgdesc="Utility to organize and develop raw images, without flickcurl support" +arch=('i686' 'x86_64' 'mips64el') +url=http://darktable.sf.net/ +license=('GPL3') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' + 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt' + 'libsoup' 'gtk-engines' 'json-glib') +makedepends=('intltool>=0.40' 'cmake' 'librsvg') +optdepends=('librsvg') +install=darktable.install +source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) +md5sums=('f86554329c2c809ffb009244a6f1d643') + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p build + cd build + CXXFLAGS+=" -fpermissive" + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DDONT_INSTALL_GCONF_SCHEMAS=True \ + -DBINARY_PACKAGE_BUILD=1 \ + -DUSE_GCONF_BACKEND=Off \ + -DBUILD_USERMANUAL=False \ + .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install + mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" +} diff --git a/nonprism/darktable/darktable.install b/nonprism/darktable/darktable.install new file mode 100644 index 000000000..24b15a4f5 --- /dev/null +++ b/nonprism/darktable/darktable.install @@ -0,0 +1,11 @@ +post_install() { + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q +} + +post_upgrade() { + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q +} + +post_remove() { + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q +} diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD deleted file mode 100644 index a145c4165..000000000 --- a/nonprism/duplicity-nonprism/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 110919 2014-05-09 15:34:16Z lfleischer $ -# Maintainer (Arch): Lukas Fleischer -# Contributor (Arch): Kaiting Chen -# Contributor (Arch): Aaron Schaefer -# Maintainer: André Silva - -_pkgname=duplicity -pkgname=duplicity-nonprism -pkgver=0.6.24 -pkgrel=1 -pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.nongnu.org/duplicity/' -license=('GPL') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile') -makedepends=('python2-setuptools') -optdepends=('lftp: FTPS backend' - 'python2-boto: Amazon S3 backend' - 'python2-gobject: GIO backend' - 'gvfs: GIO backend' - 'python2-httplib2: Ubuntu One backend' - 'python2-oauthlib: Ubuntu One backend' - 'rsync: rsync backend') -source=("https://launchpad.net/$_pkgname/0.6-series/$pkgver/+download/$_pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('5d4e9329a6d793880909d18b0736ff06' - 'SKIP') - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python$_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file - done -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - python2 setup.py install --root="$pkgdir" --optimize=1 - - # fix broken documentation permissions until upstream does (FS#27301) - chmod 644 "$pkgdir/usr/share/man/man1/$_pkgname.1" - chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" - chmod 644 "$pkgdir/usr/share/doc/$_pkgname-$pkgver"/* -} diff --git a/nonprism/duplicity-nonprism/gpg-encode.patch b/nonprism/duplicity-nonprism/gpg-encode.patch deleted file mode 100644 index f9159a3ca..000000000 --- a/nonprism/duplicity-nonprism/gpg-encode.patch +++ /dev/null @@ -1,216 +0,0 @@ -=== modified file 'bin/duplicity' ---- bin/duplicity 2014-01-21 21:04:27 +0000 -+++ bin/duplicity 2014-02-05 02:57:13 +0000 -@@ -27,7 +27,7 @@ - # Please send mail to me or the mailing list if you find bugs or have - # any suggestions. - --import getpass, gzip, os, sys, time, types -+import gzip, os, sys, time, types - import traceback, platform, statvfs, resource, re - import threading - from datetime import datetime -@@ -37,9 +37,6 @@ - if os.path.exists(os.path.join(pwd, "../duplicity")): - sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../."))) - --import gettext --gettext.install('duplicity', codeset='utf8') -- - from duplicity import log - log.setup() - -@@ -65,6 +62,13 @@ - # If exit_val is not None, exit with given value at end. - exit_val = None - -+def getpass_safe(message): -+ # getpass() in Python 2.x will call str() on our prompt. So we can't pass -+ # in non-ascii characters. -+ import getpass, locale -+ message = message.encode(locale.getpreferredencoding(), 'replace') -+ return getpass.getpass(message) -+ - def get_passphrase(n, action, for_signing = False): - """ - Check to make sure passphrase is indeed needed, then get -@@ -160,19 +164,19 @@ - if use_cache and globals.gpg_profile.signing_passphrase: - pass1 = globals.gpg_profile.signing_passphrase - else: -- pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ") -+ pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ") - else: - if use_cache and globals.gpg_profile.passphrase: - pass1 = globals.gpg_profile.passphrase - else: -- pass1 = getpass.getpass(_("GnuPG passphrase:")+" ") -+ pass1 = getpass_safe(_("GnuPG passphrase:")+" ") - - if n == 1: - pass2 = pass1 - elif for_signing: -- pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: ")) -+ pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: ")) - else: -- pass2 = getpass.getpass(_("Retype passphrase to confirm: ")) -+ pass2 = getpass_safe(_("Retype passphrase to confirm: ")) - - if not pass1 == pass2: - print _("First and second passphrases do not match! Please try again.") - -=== modified file 'bin/rdiffdir' ---- bin/rdiffdir 2013-12-27 06:39:00 +0000 -+++ bin/rdiffdir 2014-02-05 02:57:13 +0000 -@@ -27,9 +27,6 @@ - - import sys, getopt, gzip, os - --import gettext --gettext.install('duplicity', codeset='utf8') -- - from duplicity import diffdir - from duplicity import patchdir - from duplicity import log - -=== added directory 'testing/overrides' -=== added file 'testing/overrides/gettext.py' ---- testing/overrides/gettext.py 1970-01-01 00:00:00 +0000 -+++ testing/overrides/gettext.py 2014-02-05 02:57:13 +0000 -@@ -0,0 +1,34 @@ -+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*- -+# -+# Copyright 2014 Michael Terry -+# -+# This file is part of duplicity. -+# -+# Duplicity is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation; either version 2 of the License, or (at your -+# option) any later version. -+# -+# Duplicity is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with duplicity; if not, write to the Free Software Foundation, -+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+# This is just a small override to the system gettext.py which allows us to -+# always return a string with fancy unicode characters, which will notify us -+# if we ever get a unicode->ascii translation by accident. -+ -+def translation(*args, **kwargs): -+ class Translation: -+ ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator -+ def install(self, **kwargs): -+ import __builtin__ -+ __builtin__.__dict__['_'] = lambda x: x + self.ZWSP -+ def ungettext(self, one, more, n): -+ if n == 1: return one + self.ZWSP -+ else: return more + self.ZWSP -+ return Translation() - -=== modified file 'testing/run-tests' ---- testing/run-tests 2011-11-24 01:49:53 +0000 -+++ testing/run-tests 2014-02-05 02:57:13 +0000 -@@ -25,9 +25,9 @@ - - THISDIR=$(pwd) - export TZ=US/Central --export LANG= -+export LANG=en_US.UTF-8 - # up for 'duplicity' module and here for 'helper.py' --export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers" -+export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers" - export GNUPGHOME="$THISDIR/gnupg" - export PATH="$(dirname $THISDIR)/bin:$PATH" - - -=== modified file 'testing/tests/finaltest.py' ---- testing/tests/finaltest.py 2012-11-24 19:45:09 +0000 -+++ testing/tests/finaltest.py 2014-02-05 02:57:13 +0000 -@@ -20,6 +20,7 @@ - # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - import helper -+import pexpect - import sys, os, unittest - - import duplicity.backend -@@ -50,7 +51,8 @@ - """ - Test backup/restore using duplicity binary - """ -- def run_duplicity(self, arglist, options = [], current_time = None): -+ def run_duplicity(self, arglist, options = [], current_time = None, -+ passphrase_input = None): - """Run duplicity binary with given arguments and options""" - options.append("--archive-dir testfiles/cache") - cmd_list = ["duplicity"] -@@ -62,22 +64,23 @@ - cmd_list.extend(arglist) - cmdline = " ".join(cmd_list) - #print "Running '%s'." % cmdline -- if not os.environ.has_key('PASSPHRASE'): -+ if passphrase_input is None and not os.environ.has_key('PASSPHRASE'): - os.environ['PASSPHRASE'] = 'foobar' -- return_val = os.system(cmdline) -+ (output, return_val) = pexpect.run(cmdline, withexitstatus=True, -+ events={'passphrase.*:': passphrase_input}) - if return_val: - raise CmdError(return_val) - -- def backup(self, type, input_dir, options = [], current_time = None): -+ def backup(self, type, input_dir, options = [], **kwargs): - """Run duplicity backup to default directory""" - options = options[:] - if type == "full": - options.insert(0, 'full') - args = [input_dir, "'%s'" % backend_url] -- self.run_duplicity(args, options, current_time) -+ self.run_duplicity(args, options, **kwargs) - - def restore(self, file_to_restore = None, time = None, options = [], -- current_time = None): -+ **kwargs): - options = options[:] # just nip any mutability problems in bud - assert not os.system("rm -rf testfiles/restore_out") - args = ["'%s'" % backend_url, "testfiles/restore_out"] -@@ -85,17 +88,17 @@ - options.extend(['--file-to-restore', file_to_restore]) - if time: - options.extend(['--restore-time', str(time)]) -- self.run_duplicity(args, options, current_time) -+ self.run_duplicity(args, options, **kwargs) - - def verify(self, dirname, file_to_verify = None, time = None, options = [], -- current_time = None): -+ **kwargs): - options = ["verify"] + options[:] - args = ["'%s'" % backend_url, dirname] - if file_to_verify: - options.extend(['--file-to-restore', file_to_verify]) - if time: - options.extend(['--restore-time', str(time)]) -- self.run_duplicity(args, options, current_time) -+ self.run_duplicity(args, options, **kwargs) - - def deltmp(self): - """Delete temporary directories""" -@@ -255,6 +258,12 @@ - assert chain.start_time == 30000, chain.start_time - assert chain.end_time == 40000, chain.end_time - -+ def test_piped_password(self): -+ """Make sure that prompting for a password works""" -+ self.backup("full", "testfiles/empty_dir", -+ passphrase_input="foobar\nfoobar\n") -+ self.restore(passphrase_input="foobar\n") -+ - class FinalTest1(FinalTest, unittest.TestCase): - def setUp(self): - assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1") - diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD new file mode 100644 index 000000000..f1fb1feef --- /dev/null +++ b/nonprism/duplicity/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 110919 2014-05-09 15:34:16Z lfleischer $ +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): Kaiting Chen +# Contributor (Arch): Aaron Schaefer +# Maintainer: André Silva + +pkgname=duplicity +pkgver=0.6.24 +pkgrel=1.nonprism1 +pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation' +arch=('i686' 'x86_64' 'mips64el') +url='http://www.nongnu.org/duplicity/' +license=('GPL') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile') +makedepends=('python2-setuptools') +optdepends=('lftp: FTPS backend' + 'python2-boto: Amazon S3 backend' + 'python2-gobject: GIO backend' + 'gvfs: GIO backend' + 'python2-httplib2: Ubuntu One backend' + 'python2-oauthlib: Ubuntu One backend' + 'rsync: rsync backend') +source=("https://launchpad.net/$pkgname/0.6-series/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('5d4e9329a6d793880909d18b0736ff06' + 'SKIP') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python$_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file + done +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + python2 setup.py install --root="$pkgdir" --optimize=1 + + # fix broken documentation permissions until upstream does (FS#27301) + chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" + chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" + chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/* +} diff --git a/nonprism/duplicity/gpg-encode.patch b/nonprism/duplicity/gpg-encode.patch new file mode 100644 index 000000000..f9159a3ca --- /dev/null +++ b/nonprism/duplicity/gpg-encode.patch @@ -0,0 +1,216 @@ +=== modified file 'bin/duplicity' +--- bin/duplicity 2014-01-21 21:04:27 +0000 ++++ bin/duplicity 2014-02-05 02:57:13 +0000 +@@ -27,7 +27,7 @@ + # Please send mail to me or the mailing list if you find bugs or have + # any suggestions. + +-import getpass, gzip, os, sys, time, types ++import gzip, os, sys, time, types + import traceback, platform, statvfs, resource, re + import threading + from datetime import datetime +@@ -37,9 +37,6 @@ + if os.path.exists(os.path.join(pwd, "../duplicity")): + sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../."))) + +-import gettext +-gettext.install('duplicity', codeset='utf8') +- + from duplicity import log + log.setup() + +@@ -65,6 +62,13 @@ + # If exit_val is not None, exit with given value at end. + exit_val = None + ++def getpass_safe(message): ++ # getpass() in Python 2.x will call str() on our prompt. So we can't pass ++ # in non-ascii characters. ++ import getpass, locale ++ message = message.encode(locale.getpreferredencoding(), 'replace') ++ return getpass.getpass(message) ++ + def get_passphrase(n, action, for_signing = False): + """ + Check to make sure passphrase is indeed needed, then get +@@ -160,19 +164,19 @@ + if use_cache and globals.gpg_profile.signing_passphrase: + pass1 = globals.gpg_profile.signing_passphrase + else: +- pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ") ++ pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ") + else: + if use_cache and globals.gpg_profile.passphrase: + pass1 = globals.gpg_profile.passphrase + else: +- pass1 = getpass.getpass(_("GnuPG passphrase:")+" ") ++ pass1 = getpass_safe(_("GnuPG passphrase:")+" ") + + if n == 1: + pass2 = pass1 + elif for_signing: +- pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: ")) ++ pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: ")) + else: +- pass2 = getpass.getpass(_("Retype passphrase to confirm: ")) ++ pass2 = getpass_safe(_("Retype passphrase to confirm: ")) + + if not pass1 == pass2: + print _("First and second passphrases do not match! Please try again.") + +=== modified file 'bin/rdiffdir' +--- bin/rdiffdir 2013-12-27 06:39:00 +0000 ++++ bin/rdiffdir 2014-02-05 02:57:13 +0000 +@@ -27,9 +27,6 @@ + + import sys, getopt, gzip, os + +-import gettext +-gettext.install('duplicity', codeset='utf8') +- + from duplicity import diffdir + from duplicity import patchdir + from duplicity import log + +=== added directory 'testing/overrides' +=== added file 'testing/overrides/gettext.py' +--- testing/overrides/gettext.py 1970-01-01 00:00:00 +0000 ++++ testing/overrides/gettext.py 2014-02-05 02:57:13 +0000 +@@ -0,0 +1,34 @@ ++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*- ++# ++# Copyright 2014 Michael Terry ++# ++# This file is part of duplicity. ++# ++# Duplicity is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation; either version 2 of the License, or (at your ++# option) any later version. ++# ++# Duplicity is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with duplicity; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++# This is just a small override to the system gettext.py which allows us to ++# always return a string with fancy unicode characters, which will notify us ++# if we ever get a unicode->ascii translation by accident. ++ ++def translation(*args, **kwargs): ++ class Translation: ++ ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator ++ def install(self, **kwargs): ++ import __builtin__ ++ __builtin__.__dict__['_'] = lambda x: x + self.ZWSP ++ def ungettext(self, one, more, n): ++ if n == 1: return one + self.ZWSP ++ else: return more + self.ZWSP ++ return Translation() + +=== modified file 'testing/run-tests' +--- testing/run-tests 2011-11-24 01:49:53 +0000 ++++ testing/run-tests 2014-02-05 02:57:13 +0000 +@@ -25,9 +25,9 @@ + + THISDIR=$(pwd) + export TZ=US/Central +-export LANG= ++export LANG=en_US.UTF-8 + # up for 'duplicity' module and here for 'helper.py' +-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers" ++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers" + export GNUPGHOME="$THISDIR/gnupg" + export PATH="$(dirname $THISDIR)/bin:$PATH" + + +=== modified file 'testing/tests/finaltest.py' +--- testing/tests/finaltest.py 2012-11-24 19:45:09 +0000 ++++ testing/tests/finaltest.py 2014-02-05 02:57:13 +0000 +@@ -20,6 +20,7 @@ + # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + import helper ++import pexpect + import sys, os, unittest + + import duplicity.backend +@@ -50,7 +51,8 @@ + """ + Test backup/restore using duplicity binary + """ +- def run_duplicity(self, arglist, options = [], current_time = None): ++ def run_duplicity(self, arglist, options = [], current_time = None, ++ passphrase_input = None): + """Run duplicity binary with given arguments and options""" + options.append("--archive-dir testfiles/cache") + cmd_list = ["duplicity"] +@@ -62,22 +64,23 @@ + cmd_list.extend(arglist) + cmdline = " ".join(cmd_list) + #print "Running '%s'." % cmdline +- if not os.environ.has_key('PASSPHRASE'): ++ if passphrase_input is None and not os.environ.has_key('PASSPHRASE'): + os.environ['PASSPHRASE'] = 'foobar' +- return_val = os.system(cmdline) ++ (output, return_val) = pexpect.run(cmdline, withexitstatus=True, ++ events={'passphrase.*:': passphrase_input}) + if return_val: + raise CmdError(return_val) + +- def backup(self, type, input_dir, options = [], current_time = None): ++ def backup(self, type, input_dir, options = [], **kwargs): + """Run duplicity backup to default directory""" + options = options[:] + if type == "full": + options.insert(0, 'full') + args = [input_dir, "'%s'" % backend_url] +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def restore(self, file_to_restore = None, time = None, options = [], +- current_time = None): ++ **kwargs): + options = options[:] # just nip any mutability problems in bud + assert not os.system("rm -rf testfiles/restore_out") + args = ["'%s'" % backend_url, "testfiles/restore_out"] +@@ -85,17 +88,17 @@ + options.extend(['--file-to-restore', file_to_restore]) + if time: + options.extend(['--restore-time', str(time)]) +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def verify(self, dirname, file_to_verify = None, time = None, options = [], +- current_time = None): ++ **kwargs): + options = ["verify"] + options[:] + args = ["'%s'" % backend_url, dirname] + if file_to_verify: + options.extend(['--file-to-restore', file_to_verify]) + if time: + options.extend(['--restore-time', str(time)]) +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def deltmp(self): + """Delete temporary directories""" +@@ -255,6 +258,12 @@ + assert chain.start_time == 30000, chain.start_time + assert chain.end_time == 40000, chain.end_time + ++ def test_piped_password(self): ++ """Make sure that prompting for a password works""" ++ self.backup("full", "testfiles/empty_dir", ++ passphrase_input="foobar\nfoobar\n") ++ self.restore(passphrase_input="foobar\n") ++ + class FinalTest1(FinalTest, unittest.TestCase): + def setUp(self): + assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1") + diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD deleted file mode 100644 index 513284441..000000000 --- a/nonprism/eog-plugins-nonprism/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 210576 2014-04-15 08:00:45Z jgc $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Maintainer: Márcio Silva - -_pkgname=eog-plugins -pkgname=eog-plugins-nonprism -pkgver=3.12.1 -pkgrel=1 -pkgdesc="Plugins for Eye of Gnome, without libgdata support" -arch=('i686' 'x86_64' 'mips64el') -url="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" -license=('GPL2') -depends=('eog' 'libchamplain') -makedepends=('intltool') -provides=("$_pkgname=$pkgver") -conflicts=($_pkgname) -replaces=($_pkgname) -install=eog-plugins.install -source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/nonprism/eog-plugins-nonprism/eog-plugins.install b/nonprism/eog-plugins-nonprism/eog-plugins.install deleted file mode 100644 index 24072f316..000000000 --- a/nonprism/eog-plugins-nonprism/eog-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/eog-plugins/PKGBUILD b/nonprism/eog-plugins/PKGBUILD new file mode 100644 index 000000000..78ff2bd78 --- /dev/null +++ b/nonprism/eog-plugins/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 210576 2014-04-15 08:00:45Z jgc $ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Maintainer: Márcio Silva + +pkgname=eog-plugins +pkgver=3.12.1 +pkgrel=1.nonprism1 +pkgdesc="Plugins for Eye of Gnome, without libgdata support" +arch=('i686' 'x86_64' 'mips64el') +url="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" +license=('GPL2') +depends=('eog' 'libchamplain') +makedepends=('intltool') +conflicts=(${pkgname}-nonprism) +replaces=(${pkgname}-nonprism) +install=eog-plugins.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/nonprism/eog-plugins/eog-plugins.install b/nonprism/eog-plugins/eog-plugins.install new file mode 100644 index 000000000..24072f316 --- /dev/null +++ b/nonprism/eog-plugins/eog-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD deleted file mode 100644 index 346eba000..000000000 --- a/nonprism/evolution-data-server-nonprism/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 220453 2014-08-20 20:13:44Z heftig $ -# Maintainer (Arch): Jan de Groot - -_pkgname=evolution-data-server -pkgname=evolution-data-server-nonprism -pkgver=3.12.5 -pkgrel=1 -pkgdesc="Centralized access to appointments and contacts, without libgdata support" -arch=(i686 x86_64) -depends=(gnome-online-accounts nss krb5 libgweather libical db) -makedepends=(intltool gperf gobject-introspection vala python2) -install=$_pkgname.install -url="https://wiki.gnome.org/Apps/Evolution" -license=(GPL) -replaces=("$_pkgname" 'evolution-data-server-coherence') -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811') - -build() { - cd "$_pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr \ - --without-libgdata \ - --disable-google \ - --enable-vala-bindings --disable-uoa - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/nonprism/evolution-data-server-nonprism/evolution-data-server.install b/nonprism/evolution-data-server-nonprism/evolution-data-server.install deleted file mode 100644 index e75920e11..000000000 --- a/nonprism/evolution-data-server-nonprism/evolution-data-server.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade () { - post_install -} - -post_remove () { - post_install -} \ No newline at end of file diff --git a/nonprism/evolution-data-server-nonprism/git-fixes.patch b/nonprism/evolution-data-server-nonprism/git-fixes.patch deleted file mode 100644 index 88c0a1fb6..000000000 --- a/nonprism/evolution-data-server-nonprism/git-fixes.patch +++ /dev/null @@ -1,7856 +0,0 @@ -diff --git a/addressbook/backends/google/e-gdata-oauth2-authorizer.c b/addressbook/backends/google/e-gdata-oauth2-authorizer.c -index 8b1bca5..9bd5c38 100644 ---- a/addressbook/backends/google/e-gdata-oauth2-authorizer.c -+++ b/addressbook/backends/google/e-gdata-oauth2-authorizer.c -@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) - GList *domains; - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); - - priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); - -diff --git a/addressbook/backends/ldap/e-source-ldap.c b/addressbook/backends/ldap/e-source-ldap.c -index 24f4a1e..fe6c349 100644 ---- a/addressbook/backends/ldap/e-source-ldap.c -+++ b/addressbook/backends/ldap/e-source-ldap.c -@@ -241,6 +241,9 @@ source_ldap_constructed (GObject *object) - ESourceExtension *other_extension; - const gchar *extension_name; - -+ /* Chain up to parent's method. */ -+ G_OBJECT_CLASS (e_source_ldap_parent_class)->constructed (object); -+ - this_extension = E_SOURCE_EXTENSION (object); - source = e_source_extension_ref_source (this_extension); - -diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c -index dce1e0e..7a59169 100644 ---- a/addressbook/libebook-contacts/e-contact.c -+++ b/addressbook/libebook-contacts/e-contact.c -@@ -1457,6 +1457,25 @@ e_contact_vcard_attribute (EContactField field_id) - } - - /** -+ * e_contact_field_is_string: -+ * @field_id: an #EContactField -+ * -+ * Returns whether the @field_id is of a string type, -+ * thus it can be used with e_contact_get_const(). -+ * -+ * Returns: Whether the @field_id is of a string type. -+ * -+ * Since: 3.14 -+ **/ -+gboolean -+e_contact_field_is_string (EContactField field_id) -+{ -+ g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, FALSE); -+ -+ return (field_info[field_id].t & E_CONTACT_FIELD_TYPE_STRING) != 0; -+} -+ -+/** - * e_contact_field_id: - * @field_name: a string representing a contact field - * -@@ -1711,7 +1730,8 @@ e_contact_get (EContact *contact, - * @field_id: an #EContactField - * - * Gets the value of @contact's field specified by @field_id, caching -- * the result so it can be freed later. -+ * the result so it can be freed later. Use e_contact_field_is_string() -+ * to check whether the field can be used here. - * - * Returns: (transfer none): Depends on the field's type, owned by the - * #EContact. -diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h -index dbd9778..22ac45c 100644 ---- a/addressbook/libebook-contacts/e-contact.h -+++ b/addressbook/libebook-contacts/e-contact.h -@@ -421,6 +421,7 @@ GType e_contact_field_type (EContactField field_id); - const gchar * e_contact_field_name (EContactField field_id); - const gchar * e_contact_pretty_name (EContactField field_id); - const gchar * e_contact_vcard_attribute (EContactField field_id); -+gboolean e_contact_field_is_string (EContactField field_id); - EContactField e_contact_field_id (const gchar *field_name); - EContactField e_contact_field_id_from_vcard (const gchar *vcard_field); - -diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c -index e0bf16c..c99ef09 100644 ---- a/addressbook/libedata-book/e-book-backend-sexp.c -+++ b/addressbook/libedata-book/e-book-backend-sexp.c -@@ -962,7 +962,7 @@ func_exists (struct _ESExp *f, - - if (argc == 1 - && argv[0]->type == ESEXP_RES_STRING) { -- gchar *propname; -+ const gchar *propname; - struct prop_info *info = NULL; - gint i; - gboolean saw_any = FALSE; -@@ -1013,15 +1013,22 @@ func_exists (struct _ESExp *f, - * against value in this field only */ - EContactField fid = e_contact_field_id (propname); - -- if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) { -+ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST && -+ e_contact_field_is_string (fid)) { - const gchar *prop = e_contact_get_const (ctx->contact, fid); - - if (prop && *prop) - truth = TRUE; - } else { - /* is is not a known EContact field, try with EVCard attributes */ -- EVCardAttribute *attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); -- GList *l, *values = attr ? e_vcard_attribute_get_values (attr) : NULL; -+ EVCardAttribute *attr; -+ GList *l, *values; -+ -+ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) -+ propname = e_contact_vcard_attribute (fid); -+ -+ attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); -+ values = attr ? e_vcard_attribute_get_values (attr) : NULL; - - for (l = values; l && !truth; l = l->next) { - const gchar *value = l->data; -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index b7c07b9..f189126 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -5239,14 +5239,6 @@ e_cal_backend_caldav_finalize (GObject *object) - } - - static void --cal_backend_caldav_constructed (GObject *object) --{ -- /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_cal_backend_caldav_parent_class)-> -- constructed (object); --} -- --static void - e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) - { - SoupSessionFeature *feature; -@@ -5325,7 +5317,6 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class) - - object_class->dispose = e_cal_backend_caldav_dispose; - object_class->finalize = e_cal_backend_caldav_finalize; -- object_class->constructed = cal_backend_caldav_constructed; - - backend_class->get_backend_property = caldav_get_backend_property; - backend_class->shutdown = caldav_shutdown; -diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c -index d5fca99..4c2b67e 100644 ---- a/calendar/backends/contacts/e-cal-backend-contacts.c -+++ b/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1290,8 +1290,7 @@ e_cal_backend_contacts_constructed (GObject *object) - (GDestroyNotify) g_object_unref); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->constructed (object); - } - - /* Object initialization function for the contacts backend */ -diff --git a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c -index d65b934..c1c5632 100644 ---- a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c -+++ b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c -@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) - GList *domains; - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); - - priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); - -diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c -index e84cea7..b0a47dd 100644 ---- a/calendar/libedata-cal/e-cal-backend-store.c -+++ b/calendar/libedata-cal/e-cal-backend-store.c -@@ -619,8 +619,7 @@ cal_backend_store_constructed (GObject *object) - g_object_unref (timezone_cache); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_cal_backend_store_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_cal_backend_store_parent_class)->constructed (object); - } - - static gboolean -diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c -index 4faa992..983682f 100644 ---- a/camel/camel-folder-search.c -+++ b/camel/camel-folder-search.c -@@ -754,8 +754,7 @@ folder_search_constructed (GObject *object) - gint ii; - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (camel_folder_search_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (camel_folder_search_parent_class)->constructed (object); - - search = CAMEL_FOLDER_SEARCH (object); - class = CAMEL_FOLDER_SEARCH_GET_CLASS (search); -diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c -index fbaafcb..c56ed94 100644 ---- a/camel/camel-offline-store.c -+++ b/camel/camel-offline-store.c -@@ -61,8 +61,7 @@ offline_store_constructed (GObject *object) - priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (object); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (camel_offline_store_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (camel_offline_store_parent_class)->constructed (object); - - session = camel_service_ref_session (CAMEL_SERVICE (object)); - priv->online = camel_session_get_online (session); -diff --git a/camel/providers/imapx/camel-imapx-input-stream.c b/camel/providers/imapx/camel-imapx-input-stream.c -index 2a383c7..02983f3 100644 ---- a/camel/providers/imapx/camel-imapx-input-stream.c -+++ b/camel/providers/imapx/camel-imapx-input-stream.c -@@ -679,6 +679,7 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, - guchar *o, *p, *e; - guint literal; - gint digits; -+ gboolean is_literal8 = FALSE; - - g_return_val_if_fail (CAMEL_IS_IMAPX_INPUT_STREAM (is), IMAPX_TOK_ERROR); - g_return_val_if_fail (data != NULL, IMAPX_TOK_ERROR); -@@ -711,6 +712,21 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, - c = *p++; - } while (c == ' ' || c == '\r'); - -+ if (c == '~') { -+ if (p >= e) { -+ is->priv->ptr = p; -+ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) -+ return IMAPX_TOK_ERROR; -+ p = is->priv->ptr; -+ e = is->priv->end; -+ } -+ -+ if (*p == '{') { -+ c = *p++; -+ is_literal8 = TRUE; -+ } -+ } -+ - /*strchr("\n*()[]+", c)*/ - if (imapx_is_token_char (c)) { - is->priv->ptr = p; -@@ -723,6 +739,18 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, - c = *p++; - if (isdigit (c) && literal < (UINT_MAX / 10)) { - literal = literal * 10 + (c - '0'); -+ } else if (is_literal8 && c == '+') { -+ if (p >= e) { -+ is->priv->ptr = p; -+ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) -+ return IMAPX_TOK_ERROR; -+ p = is->priv->ptr; -+ e = is->priv->end; -+ } -+ -+ /* The '+' can be only at the end of the literal8 token */ -+ if (*p != '}') -+ goto protocol_error; - } else if (c == '}') { - while (1) { - while (p < e) { -diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c -index 63b6f65..cfff143 100644 ---- a/camel/providers/imapx/camel-imapx-server.c -+++ b/camel/providers/imapx/camel-imapx-server.c -@@ -320,6 +320,7 @@ typedef enum { - IMAPX_IDLE_STARTED, /* IDLE continuation received; IDLE active */ - IMAPX_IDLE_CANCEL, /* Cancelled from ISSUED state; need to send - DONE as soon as we receive continuation */ -+ IMAPX_IDLE_WAIT_DONE /* DONE was issued, waiting for a confirmation response */ - } CamelIMAPXIdleState; - - #define IMAPX_IDLE_DWELL_TIME 2 /* Number of seconds to remain in PENDING -@@ -390,7 +391,7 @@ struct _CamelIMAPXServerPrivate { - gchar inbox_separator; - - /* IDLE support */ -- GMutex idle_lock; -+ GRecMutex idle_lock; - GThread *idle_thread; - GMainLoop *idle_main_loop; - GMainContext *idle_main_context; -@@ -1472,7 +1473,7 @@ imapx_command_start_next (CamelIMAPXServer *is) - "waiting for idle to stop \n"); - /* if there are more pending commands, - * then they should be processed too */ -- break; -+ return; - - case IMAPX_IDLE_STOP_ERROR: - return; -@@ -3054,25 +3055,27 @@ imapx_continuation (CamelIMAPXServer *is, - return FALSE; - - c (is->tagprefix, "Got continuation response for IDLE \n"); -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - /* We might have actually sent the DONE already! */ -- if (is->priv->idle_state == IMAPX_IDLE_ISSUED) -+ if (is->priv->idle_state == IMAPX_IDLE_ISSUED) { - is->priv->idle_state = IMAPX_IDLE_STARTED; -- else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { -+ } else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { - /* IDLE got cancelled after we sent the command, while - * we were waiting for this continuation. Send DONE - * immediately. */ - if (!imapx_command_idle_stop (is, error)) { -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - return FALSE; - } -- is->priv->idle_state = IMAPX_IDLE_OFF; -+ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; -+ } else if (is->priv->idle_state == IMAPX_IDLE_WAIT_DONE) { -+ /* Do nothing, just wait */ - } else { - c ( - is->tagprefix, "idle starts in wrong state %d\n", - is->priv->idle_state); - } -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - QUEUE_LOCK (is); - is->literal = NULL; -@@ -3548,9 +3551,9 @@ imapx_command_idle_done (CamelIMAPXServer *is, - camel_imapx_job_take_error (job, local_error); - } - -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - is->priv->idle_state = IMAPX_IDLE_OFF; -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - imapx_unregister_job (is, job); - } -@@ -3579,29 +3582,23 @@ imapx_job_idle_start (CamelIMAPXJob *job, - cp = g_queue_peek_head (&ic->parts); - cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION; - -- g_mutex_lock (&is->priv->idle_lock); -+ QUEUE_LOCK (is); -+ g_rec_mutex_lock (&is->priv->idle_lock); - /* Don't issue it if the idle was cancelled already */ - if (is->priv->idle_state == IMAPX_IDLE_PENDING) { - is->priv->idle_state = IMAPX_IDLE_ISSUED; -- g_mutex_unlock (&is->priv->idle_lock); - -- QUEUE_LOCK (is); -- /* It can be that another thread started a command between -- the two locks above had been interchanged, thus also test -- whether the active command queue is empty, before starting -- the IDLE command. */ - if (camel_imapx_command_queue_is_empty (is->active)) { - imapx_command_start (is, ic); - } else { - c (is->tagprefix, "finally cancelling IDLE, other command was quicker\n"); -+ is->priv->idle_state = IMAPX_IDLE_OFF; - imapx_unregister_job (is, job); - } - } else { -- g_mutex_unlock (&is->priv->idle_lock); -- -- QUEUE_LOCK (is); - imapx_unregister_job (is, job); - } -+ g_rec_mutex_unlock (&is->priv->idle_lock); - QUEUE_UNLOCK (is); - - camel_imapx_command_unref (ic); -@@ -3690,13 +3687,16 @@ imapx_call_idle (gpointer data) - goto exit; - - /* XXX Rename to 'pending_lock'? */ -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - g_source_unref (is->priv->idle_pending); - is->priv->idle_pending = NULL; -- g_mutex_unlock (&is->priv->idle_lock); - -- if (is->priv->idle_state != IMAPX_IDLE_PENDING) -+ if (is->priv->idle_state != IMAPX_IDLE_PENDING) { -+ g_rec_mutex_unlock (&is->priv->idle_lock); - goto exit; -+ } -+ -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - g_mutex_lock (&is->priv->select_lock); - mailbox = g_weak_ref_get (&is->priv->select_mailbox); -@@ -3765,7 +3765,7 @@ imapx_idle_thread (gpointer data) - * regressions. - */ - -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - - g_warn_if_fail (is->priv->idle_pending == NULL); - pending = g_timeout_source_new_seconds (IMAPX_IDLE_DWELL_TIME); -@@ -3778,7 +3778,7 @@ imapx_idle_thread (gpointer data) - is->priv->idle_pending = g_source_ref (pending); - g_source_unref (pending); - -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - g_main_loop_run (is->priv->idle_main_loop); - -@@ -3798,36 +3798,40 @@ imapx_stop_idle (CamelIMAPXServer *is, - - time (&now); - -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - - switch (is->priv->idle_state) { - case IMAPX_IDLE_ISSUED: - is->priv->idle_state = IMAPX_IDLE_CANCEL; -- /* fall through */ -+ result = IMAPX_IDLE_STOP_SUCCESS; -+ break; - - case IMAPX_IDLE_CANCEL: -+ case IMAPX_IDLE_WAIT_DONE: - result = IMAPX_IDLE_STOP_SUCCESS; - break; - - case IMAPX_IDLE_STARTED: - if (imapx_command_idle_stop (is, error)) { - result = IMAPX_IDLE_STOP_SUCCESS; -+ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; - } else { - result = IMAPX_IDLE_STOP_ERROR; -+ is->priv->idle_state = IMAPX_IDLE_OFF; - goto exit; - } -- /* fall through */ -+ break; - - case IMAPX_IDLE_PENDING: - is->priv->idle_state = IMAPX_IDLE_OFF; -- /* fall through */ -+ break; - - case IMAPX_IDLE_OFF: - break; - } - - exit: -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - return result; - } -@@ -3838,9 +3842,14 @@ imapx_start_idle (CamelIMAPXServer *is) - if (camel_application_is_exiting) - return; - -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); -+ -+ if (is->priv->idle_state != IMAPX_IDLE_OFF) { -+ g_warn_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); -+ g_rec_mutex_unlock (&is->priv->idle_lock); -+ return; -+ } - -- g_return_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); - is->priv->idle_state = IMAPX_IDLE_PENDING; - - if (is->priv->idle_thread == NULL) { -@@ -3861,7 +3870,7 @@ imapx_start_idle (CamelIMAPXServer *is) - g_source_unref (pending); - } - -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - } - - static gboolean -@@ -3869,12 +3878,12 @@ imapx_in_idle (CamelIMAPXServer *is) - { - gboolean in_idle = FALSE; - -- g_mutex_lock (&is->priv->idle_lock); -+ g_rec_mutex_lock (&is->priv->idle_lock); - - if (is->priv->idle_thread != NULL) - in_idle = (is->priv->idle_state > IMAPX_IDLE_OFF); - -- g_mutex_unlock (&is->priv->idle_lock); -+ g_rec_mutex_unlock (&is->priv->idle_lock); - - return in_idle; - } -@@ -3918,7 +3927,7 @@ imapx_command_select_done (CamelIMAPXServer *is, - GQueue trash = G_QUEUE_INIT; - GList *list, *link; - -- c (is->tagprefix, "Select failed\n"); -+ c (is->tagprefix, "Select failed: %s\n", local_error ? local_error->message : "Unknown error"); - - g_mutex_lock (&is->priv->select_lock); - select_closing = g_weak_ref_get (&is->priv->select_closing); -@@ -4192,7 +4201,7 @@ imapx_server_set_streams (CamelIMAPXServer *is, - } - - #if GLIB_CHECK_VERSION(2,39,0) --#ifndef G_OS_WIN32 -+#ifdef G_OS_UNIX - static void - imapx_server_child_process_setup (gpointer user_data) - { -@@ -4210,7 +4219,7 @@ imapx_server_child_process_setup (gpointer user_data) - } - #endif /* TIOCNOTTY */ - } --#endif /* G_OS_WIN32 */ -+#endif /* G_OS_UNIX */ - #endif - - static gboolean -@@ -4242,7 +4251,7 @@ connect_to_server_process (CamelIMAPXServer *is, - G_SUBPROCESS_FLAGS_STDOUT_PIPE | - G_SUBPROCESS_FLAGS_STDERR_SILENCE); - --#ifndef G_OS_WIN32 -+#ifdef G_OS_UNIX - g_subprocess_launcher_set_child_setup ( - launcher, imapx_server_child_process_setup, - NULL, (GDestroyNotify) NULL); -@@ -7809,7 +7818,7 @@ imapx_server_finalize (GObject *object) - g_hash_table_destroy (is->priv->known_alerts); - g_mutex_clear (&is->priv->known_alerts_lock); - -- g_mutex_clear (&is->priv->idle_lock); -+ g_rec_mutex_clear (&is->priv->idle_lock); - g_main_loop_unref (is->priv->idle_main_loop); - g_main_context_unref (is->priv->idle_main_context); - -@@ -7835,6 +7844,9 @@ imapx_server_constructed (GObject *object) - CamelIMAPXServer *server; - CamelIMAPXServerClass *class; - -+ /* Chain up to parent's method. */ -+ G_OBJECT_CLASS (camel_imapx_server_parent_class)->constructed (object); -+ - server = CAMEL_IMAPX_SERVER (object); - class = CAMEL_IMAPX_SERVER_GET_CLASS (server); - -@@ -7993,7 +8005,7 @@ camel_imapx_server_init (CamelIMAPXServer *is) - - main_context = g_main_context_new (); - -- g_mutex_init (&is->priv->idle_lock); -+ g_rec_mutex_init (&is->priv->idle_lock); - is->priv->idle_main_loop = g_main_loop_new (main_context, FALSE); - is->priv->idle_main_context = g_main_context_ref (main_context); - -diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c -index 373f27d..482983d 100644 ---- a/camel/providers/local/camel-local-folder.c -+++ b/camel/providers/local/camel-local-folder.c -@@ -164,6 +164,9 @@ local_folder_constructed (GObject *object) - gchar *root_path; - gchar *path; - -+ /* Chain up to parent's method. */ -+ G_OBJECT_CLASS (camel_local_folder_parent_class)->constructed (object); -+ - folder = CAMEL_FOLDER (object); - full_name = camel_folder_get_full_name (folder); - parent_store = camel_folder_get_parent_store (folder); -diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c -index 9d36933..b6f2e3b 100644 ---- a/libebackend/e-authentication-mediator.c -+++ b/libebackend/e-authentication-mediator.c -@@ -718,8 +718,7 @@ authentication_mediator_constructed (GObject *object) - mediator, (GDestroyNotify) NULL); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_authentication_mediator_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_authentication_mediator_parent_class)->constructed (object); - } - - static gboolean -diff --git a/libebackend/e-authentication-session.c b/libebackend/e-authentication-session.c -index bfec0e3..f664a30 100644 ---- a/libebackend/e-authentication-session.c -+++ b/libebackend/e-authentication-session.c -@@ -322,8 +322,7 @@ authentication_session_constructed (GObject *object) - session = E_AUTHENTICATION_SESSION (object); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_authentication_session_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_authentication_session_parent_class)->constructed (object); - - /* If the server knows about the data source UID we've been - * given, then we can auto-configure our own prompt strings. */ -diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c -index 66c836c..d41998d 100644 ---- a/libebackend/e-collection-backend.c -+++ b/libebackend/e-collection-backend.c -@@ -680,8 +680,7 @@ collection_backend_constructed (GObject *object) - backend = E_COLLECTION_BACKEND (object); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_collection_backend_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_collection_backend_parent_class)->constructed (object); - - server = e_collection_backend_ref_server (backend); - source = e_backend_get_source (E_BACKEND (backend)); -diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c -index 9b74a0c..5348327 100644 ---- a/libebackend/e-user-prompter-server.c -+++ b/libebackend/e-user-prompter-server.c -@@ -326,8 +326,7 @@ static void - user_prompter_server_constructed (GObject *object) - { - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_user_prompter_server_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_user_prompter_server_parent_class)->constructed (object); - - e_extensible_load_extensions (E_EXTENSIBLE (object)); - } -diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c -index bb5660a..b040e49 100644 ---- a/libedataserver/e-source-camel.c -+++ b/libedataserver/e-source-camel.c -@@ -369,8 +369,7 @@ source_camel_constructed (GObject *object) - guint array_index = 0; - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_source_camel_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_source_camel_parent_class)->constructed (object); - - class = E_SOURCE_CAMEL_GET_CLASS (object); - priv = E_SOURCE_CAMEL_GET_PRIVATE (object); -diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c -index 39f56a9..3dd4b5b 100644 ---- a/libedataserver/e-source-mail-signature.c -+++ b/libedataserver/e-source-mail-signature.c -@@ -169,8 +169,7 @@ source_mail_signature_constructed (GObject *object) - priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_source_mail_signature_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_source_mail_signature_parent_class)->constructed (object); - - extension = E_SOURCE_EXTENSION (object); - source = e_source_extension_ref_source (extension); -diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c -index 98eede2..0a97fa4 100644 ---- a/modules/gnome-online-accounts/goaewsclient.c -+++ b/modules/gnome-online-accounts/goaewsclient.c -@@ -515,6 +515,7 @@ goa_ews_autodiscover (GoaObject *goa_object, - data->session, data->msgs[1], - ews_autodiscover_response_cb, simple); - } else { -+ g_dbus_error_strip_remote_error (error); - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete_in_idle (simple); - g_object_unref (simple); -diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c -index 973d182..99a6b1e 100644 ---- a/modules/gnome-online-accounts/module-gnome-online-accounts.c -+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c -@@ -1235,8 +1235,7 @@ gnome_online_accounts_constructed (GObject *object) - extension); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)->constructed (object); - } - - static gboolean -@@ -1283,6 +1282,9 @@ gnome_online_accounts_get_access_token_sync (EOAuth2Support *support, - g_object_unref (goa_account); - g_object_unref (goa_object); - -+ if (error && *error) -+ g_dbus_error_strip_remote_error (*error); -+ - g_prefix_error ( - error, - _("Failed to obtain an access token for '%s': "), -diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c -index 3e16146..130951a 100644 ---- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c -+++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c -@@ -899,8 +899,7 @@ ubuntu_online_accounts_constructed (GObject *object) - extension); - - /* Chain up to parent's constructed() method. */ -- G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)-> -- constructed (object); -+ G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)->constructed (object); - } - - static gboolean -diff --git a/po/nb.po b/po/nb.po -index 066e1eb..071a4e3 100644 ---- a/po/nb.po -+++ b/po/nb.po -@@ -6,10 +6,10 @@ - # Torstein Adolf Winterseth , 2010. - msgid "" - msgstr "" --"Project-Id-Version: evolution-data-server 3.11.x\n" -+"Project-Id-Version: evolution-data-server 3.12.x\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2014-03-05 07:35+0100\n" --"PO-Revision-Date: 2014-03-05 17:58+0100\n" -+"POT-Creation-Date: 2014-07-23 14:37+0200\n" -+"PO-Revision-Date: 2014-07-23 14:39+0200\n" - "Last-Translator: Kjartan Maraas \n" - "Language-Team: Norwegian bokmål \n" - "Language: nb\n" -@@ -18,79 +18,79 @@ msgstr "" - "Content-Transfer-Encoding: 8-bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../addressbook/backends/file/e-book-backend-file.c:117 -+#: ../addressbook/backends/file/e-book-backend-file.c:120 - #, c-format - msgid "Failed to remove file '%s': %s" - msgstr "Klarte ikke å fjerne fil «%s»: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:145 -+#: ../addressbook/backends/file/e-book-backend-file.c:148 - #, c-format - msgid "Failed to make directory %s: %s" - msgstr "Klarte ikke å opprette katalog %s: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:396 -+#: ../addressbook/backends/file/e-book-backend-file.c:419 - #, c-format - msgid "Failed to create hardlink for resource '%s': %s" - msgstr "Klarte ikke å opprette hard lenke for ressurs «%s»: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:501 --#: ../addressbook/backends/file/e-book-backend-file.c:1230 -+#: ../addressbook/backends/file/e-book-backend-file.c:524 -+#: ../addressbook/backends/file/e-book-backend-file.c:1253 - msgid "No UID in the contact" - msgstr "Ingen UID i kontakten" - --#: ../addressbook/backends/file/e-book-backend-file.c:828 -+#: ../addressbook/backends/file/e-book-backend-file.c:851 - #, c-format - msgid "Conflicting UIDs found in added contacts" - msgstr "UID'er som er i konflikt ble funnet i tillagte kontakter" - --#: ../addressbook/backends/file/e-book-backend-file.c:967 -+#: ../addressbook/backends/file/e-book-backend-file.c:990 - msgid "Loading..." - msgstr "Laster …" - --#: ../addressbook/backends/file/e-book-backend-file.c:969 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 -+#: ../addressbook/backends/file/e-book-backend-file.c:992 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 - msgid "Searching..." - msgstr "Søker …" - --#: ../addressbook/backends/file/e-book-backend-file.c:1258 -+#: ../addressbook/backends/file/e-book-backend-file.c:1281 - #, c-format - msgid "Tried to modify contact '%s' with out of sync revision" - msgstr "Prøvde å endre kontakt «%s» med revisjon som ikke er synkronisert" - --#: ../addressbook/backends/file/e-book-backend-file.c:1449 --#: ../addressbook/backends/file/e-book-backend-file.c:1532 -+#: ../addressbook/backends/file/e-book-backend-file.c:1472 -+#: ../addressbook/backends/file/e-book-backend-file.c:1555 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 --#: ../addressbook/libedata-book/e-book-sqlite.c:6706 -+#: ../addressbook/libedata-book/e-book-sqlite.c:6711 - #, c-format - msgid "Contact '%s' not found" - msgstr "Kontakt «%s» ble ikke funnet" - --#: ../addressbook/backends/file/e-book-backend-file.c:1592 --#: ../addressbook/backends/file/e-book-backend-file.c:1673 -+#: ../addressbook/backends/file/e-book-backend-file.c:1615 -+#: ../addressbook/backends/file/e-book-backend-file.c:1696 - #, c-format - msgid "Query '%s' not supported" - msgstr "Spørring «%s» er ikke støttet" - --#: ../addressbook/backends/file/e-book-backend-file.c:1601 --#: ../addressbook/backends/file/e-book-backend-file.c:1682 -+#: ../addressbook/backends/file/e-book-backend-file.c:1624 -+#: ../addressbook/backends/file/e-book-backend-file.c:1705 - #, c-format - msgid "Invalid Query '%s'" - msgstr "Ugyldig spørring «%s»" - --#: ../addressbook/backends/file/e-book-backend-file.c:1947 -+#: ../addressbook/backends/file/e-book-backend-file.c:1970 - msgid "Requested to delete an unrelated cursor" - msgstr "Forespørsel om å slette en ikke-relatert markør" - --#: ../addressbook/backends/file/e-book-backend-file.c:2014 -+#: ../addressbook/backends/file/e-book-backend-file.c:2041 - #, c-format - msgid "Failed to rename old database from '%s' to '%s': %s" - msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" - --#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 -+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 - #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 - #: ../addressbook/libebook-contacts/e-phone-number.c:56 - #: ../addressbook/libebook/e-book.c:1078 -@@ -105,67 +105,69 @@ msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" - #: ../addressbook/libebook/e-book-client.c:3175 - #: ../addressbook/libebook/e-book-client.c:3393 - #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 - #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 - #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 - #: ../calendar/libecal/e-cal-client.c:3239 - #: ../calendar/libecal/e-cal-client.c:3412 - #: ../calendar/libecal/e-cal-client.c:3676 - #: ../calendar/libecal/e-cal-client.c:3917 --#: ../calendar/libecal/e-cal-client.c:4105 --#: ../calendar/libecal/e-cal-client.c:4297 --#: ../calendar/libecal/e-cal-client.c:4467 --#: ../calendar/libecal/e-cal-client.c:4636 --#: ../calendar/libecal/e-cal-client.c:4839 --#: ../calendar/libecal/e-cal-client.c:4989 --#: ../calendar/libecal/e-cal-client.c:5183 --#: ../calendar/libecal/e-cal-client.c:5336 --#: ../calendar/libecal/e-cal-client.c:5553 --#: ../calendar/libecal/e-cal-client.c:5707 --#: ../calendar/libecal/e-cal-client.c:5933 --#: ../calendar/libecal/e-cal-client.c:6129 --#: ../calendar/libecal/e-cal-client.c:6492 --#: ../calendar/libecal/e-cal-client.c:6706 --#: ../camel/providers/imapx/camel-imapx-command.c:642 -+#: ../calendar/libecal/e-cal-client.c:4107 -+#: ../calendar/libecal/e-cal-client.c:4299 -+#: ../calendar/libecal/e-cal-client.c:4469 -+#: ../calendar/libecal/e-cal-client.c:4638 -+#: ../calendar/libecal/e-cal-client.c:4841 -+#: ../calendar/libecal/e-cal-client.c:4991 -+#: ../calendar/libecal/e-cal-client.c:5185 -+#: ../calendar/libecal/e-cal-client.c:5338 -+#: ../calendar/libecal/e-cal-client.c:5555 -+#: ../calendar/libecal/e-cal-client.c:5709 -+#: ../calendar/libecal/e-cal-client.c:5935 -+#: ../calendar/libecal/e-cal-client.c:6131 -+#: ../calendar/libecal/e-cal-client.c:6494 -+#: ../calendar/libecal/e-cal-client.c:6708 -+#: ../camel/providers/imapx/camel-imapx-command.c:645 -+#: ../camel/providers/imapx/camel-imapx-server.c:4769 -+#: ../camel/providers/imapx/camel-imapx-server.c:4778 - #: ../libedataserver/e-client.c:185 - msgid "Unknown error" - msgstr "Ukjent feil" - - #. Query for new contacts asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:836 -+#: ../addressbook/backends/google/e-book-backend-google.c:828 - msgid "Querying for updated contacts…" - msgstr "Spør etter oppdaterte kontakter …" - - #. Run the query asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:988 -+#: ../addressbook/backends/google/e-book-backend-google.c:1010 - msgid "Querying for updated groups…" - msgstr "Spør etter oppdaterte grupper …" - --#: ../addressbook/backends/google/e-book-backend-google.c:1705 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1273 -+#: ../addressbook/backends/google/e-book-backend-google.c:1757 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 - msgid "The backend does not support bulk additions" - msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" - --#: ../addressbook/backends/google/e-book-backend-google.c:1854 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1375 -+#: ../addressbook/backends/google/e-book-backend-google.c:1912 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 - msgid "The backend does not support bulk modifications" - msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" - --#: ../addressbook/backends/google/e-book-backend-google.c:2054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1467 -+#: ../addressbook/backends/google/e-book-backend-google.c:2119 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 - msgid "The backend does not support bulk removals" - msgstr "Kalender støtter ikke fjerning av mange oppføringer" - --#: ../addressbook/backends/google/e-book-backend-google.c:2180 -+#: ../addressbook/backends/google/e-book-backend-google.c:2239 - msgid "Loading…" - msgstr "Laster …" - - #. System Group: My Contacts --#: ../addressbook/backends/google/e-book-google-utils.c:1618 -+#: ../addressbook/backends/google/e-book-google-utils.c:1631 - #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 -@@ -174,129 +176,130 @@ msgid "Personal" - msgstr "Personlig" - - #. System Group: Friends --#: ../addressbook/backends/google/e-book-google-utils.c:1620 -+#: ../addressbook/backends/google/e-book-google-utils.c:1633 - msgid "Friends" - msgstr "Venner" - - #. System Group: Family --#: ../addressbook/backends/google/e-book-google-utils.c:1622 -+#: ../addressbook/backends/google/e-book-google-utils.c:1635 - msgid "Family" - msgstr "Familie" - - #. System Group: Coworkers --#: ../addressbook/backends/google/e-book-google-utils.c:1624 -+#: ../addressbook/backends/google/e-book-google-utils.c:1637 - msgid "Coworkers" - msgstr "Kolleger" - - #. Translators: An error message shown to a user when trying to do an - #. * operation on the LDAP address book which is not connected to the server --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 - msgid "Not connected" - msgstr "Ikke tilkoblet" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 - msgid "Failed to bind using either v3 or v2 binds" - msgstr "Klarte ikke å koble til med hverken v3 eller v2 binding" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 - msgid "Reconnecting to LDAP server..." - msgstr "Kobler til LDAP-tjener på nytt …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 - msgid "Invalid DN syntax" - msgstr "Ugyldig DN-syntaks" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 - #, c-format - msgid "LDAP error 0x%x (%s)" - msgstr "LDAP-feil 0x%x (%s)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 - #, c-format - msgid "%s: NULL returned from ldap_first_entry" - msgstr "%s: NULL returnert fra ldap_first_entry" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 - #, c-format - msgid "%s: Unhandled result type %d returned" - msgstr "%s: Uhåndtert resultat type %d returnert" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 - #, c-format - msgid "%s: Unhandled search result type %d returned" - msgstr "%s: Ikke håndtert søkeresultat av type %d ble returnert" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 - msgid "Receiving LDAP search results..." - msgstr "Mottar søkeresultater fra LDAP-tjener …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 - msgid "Error performing search" - msgstr "Feil ved utføring av søk" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 - #, c-format - msgid "Downloading contacts (%d)..." - msgstr "Laster ned kontakter (%d) …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 - msgid "Adding contact to LDAP server..." - msgstr "Legger til kontakt på LDAP-tjener …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 - msgid "Modifying contact from LDAP server..." - msgstr "Endrer kontakt fra LDAP-tjener …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 - msgid "Removing contact from LDAP server..." - msgstr "Fjerner kontakt fra LDAP-tjener …" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 - #, c-format - msgid "Failed to get the DN for user '%s'" - msgstr "Klarte ikke å hente DN for bruker «%s»" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 - msgid "Loading Addressbook summary..." - msgstr "Laster sammendrag for adressebok …" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 - #, c-format - msgid "PROPFIND on webdav failed with HTTP status %d (%s)" - msgstr "PROPFIND på webdav feilet med HTTP-status: %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 - msgid "No response body in webdav PROPFIND result" - msgstr "Ingen svarkropp i resultat av WebDAV PROPFIND kommando" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 - #, c-format - msgid "Loading Contacts (%d%%)" - msgstr "Laster kontakter (%d%%)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1196 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 - msgid "Cannot transform SoupURI to string" - msgstr "Kan ikke transformere SoupURI til streng" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1306 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 - #, c-format - msgid "Create resource '%s' failed with HTTP status %d (%s)" - msgstr "Oppretting av ressurs «%s» feilet med HTTP-status %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 - msgid "Contact on server changed -> not modifying" - msgstr "Kontakt på tjener endret -> endrer ikke" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1412 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 - #, c-format - msgid "Modify contact failed with HTTP status %d (%s)" - msgstr "Endring av kontakt feilet med HTTP-status %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1488 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 - #, c-format - msgid "DELETE failed with HTTP status %d" - msgstr "DELETE feilet med HTTP-status: %d" -@@ -900,8 +903,8 @@ msgstr "Liste med Google Talk navn" - msgid "Twitter Name List" - msgstr "Liste med Twitter-navn" - --#: ../addressbook/libebook-contacts/e-contact.c:1635 --#: ../addressbook/libebook/e-destination.c:881 -+#: ../addressbook/libebook-contacts/e-contact.c:1654 -+#: ../addressbook/libebook/e-destination.c:920 - msgid "Unnamed List" - msgstr "Liste uten navn" - -@@ -995,7 +998,7 @@ msgstr "Hele search_contacts lagres ikke i buffer. vcard kan ikke returneres." - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 --#: ../addressbook/libedata-book/e-book-sqlite.c:5364 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5369 - #, c-format - msgid "Query contained unsupported elements" - msgstr "Spørringen innehold elementer som ikke støttes" -@@ -1038,7 +1041,7 @@ msgstr "Klarte ikke å fjerne databasefil: errno %d" - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442 - #, c-format - msgid "Only summary queries are supported by EbSdbCursor" --msgstr "" -+msgstr "EbSdbCursor støtter bare spørringer på sammendrag" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049 - #, c-format -@@ -1056,7 +1059,7 @@ msgid "Cannot sort by a field which may have multiple values" - msgstr "Kan ikke sortere på et felt som kan ha flere verdier" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 --#: ../addressbook/libedata-book/e-book-sqlite.c:7376 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7381 - #, c-format - msgid "" - "Tried to step a cursor in reverse, but cursor is already at the beginning of " -@@ -1064,7 +1067,7 @@ msgid "" - msgstr "" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 --#: ../addressbook/libedata-book/e-book-sqlite.c:7384 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7389 - #, c-format - msgid "" - "Tried to step a cursor forwards, but cursor is already at the end of the " -@@ -1082,20 +1085,20 @@ msgid "" - "addressbook. Delete one of the entries in the 'folders' table first." - msgstr "" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5357 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5362 - #, c-format - msgid "Invalid query: %s" - msgstr "Ugyldig spørring: %s" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5532 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5537 - msgid "Invalid query for EbSqlCursor" - msgstr "Ugyldig spørring for EbSqlCursor" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7198 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7203 - msgid "At least one sort field must be specified to use an EbSqlCursor" - msgstr "" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7216 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7221 - msgid "Cannot sort by a field that is not a string type" - msgstr "Kan ikke sortere på et felt som ikke er av type streng" - -@@ -1303,31 +1306,35 @@ msgstr "Mangler UID for kilde" - msgid "No such source for UID '%s'" - msgstr "Kilden eksisterer ikke for UID «%s»" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 - #, c-format - msgid "Server is unreachable (%s)" - msgstr "Tjener kan ikke nås (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 - #, c-format - msgid "Failed to connect to a server using SSL: %s" - msgstr "Klarte ikke å koble til en tjener med SSL: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 - #, c-format - msgid "Unexpected HTTP status code %d returned (%s)" - msgstr "Uventet HTTP-statuskode %d mottatt (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 - msgid "CalDAV backend is not loaded yet" - msgstr "CalDAV-motor er ikke lastet ennå" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 - msgid "Invalid Redirect URL" - msgstr "Ugyldig objekt for omdirigering" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 -+#, c-format -+msgid "Cannot create local cache folder '%s'" -+msgstr "Kan ikke opprette lokal buffermappe «%s»" -+ -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 - #, c-format - msgid "" - "Server is unreachable, calendar is opened in read-only mode.\n" -@@ -1336,32 +1343,27 @@ msgstr "" - "Tjeneren kan ikke nås. Kalender åpnes i skrivebeskyttet modus.\n" - "Feilmelding: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 --#, c-format --msgid "Cannot create local cache folder '%s'" --msgstr "Kan ikke opprette lokal buffermappe «%s»" -- --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 - msgid "CalDAV does not support bulk additions" - msgstr "CalDAV støtter ikke å legge til flere oppføringer samtidig" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 - msgid "CalDAV does not support bulk modifications" - msgstr "CalDAV støtter ikke å endre flere oppføringer samtidig" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 - msgid "CalDAV does not support bulk removals" - msgstr "CalDAV støtter ikke fjerning av flere oppføringer samtidig" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 - msgid "Calendar doesn't support Free/Busy" - msgstr "Kalender støtter ikke ledig/opptatt" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 - msgid "Schedule outbox url not found" - msgstr "URL for kalenderutboks" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 - msgid "Unexpected result in schedule-response" - msgstr "Uventet resultat i schedule-response" - -@@ -1388,27 +1390,27 @@ msgstr "Kan ikke lagre kalenderdata: Feil i URI." - msgid "Cannot save calendar data" - msgstr "Kan ikke lagre kalenderdata" - --#: ../calendar/backends/http/e-cal-backend-http.c:486 -+#: ../calendar/backends/http/e-cal-backend-http.c:491 - #, c-format - msgid "Malformed URI: %s" - msgstr "Feilutformet URI: %s" - --#: ../calendar/backends/http/e-cal-backend-http.c:577 -+#: ../calendar/backends/http/e-cal-backend-http.c:582 - #, c-format - msgid "Redirected to Invalid URI" - msgstr "Omdirigert til ugyldig URI" - --#: ../calendar/backends/http/e-cal-backend-http.c:620 -+#: ../calendar/backends/http/e-cal-backend-http.c:625 - #, c-format - msgid "Bad file format." - msgstr "Ugyldig filformat." - --#: ../calendar/backends/http/e-cal-backend-http.c:630 -+#: ../calendar/backends/http/e-cal-backend-http.c:635 - #, c-format - msgid "Not a calendar." - msgstr "Ikke en kalender." - --#: ../calendar/backends/http/e-cal-backend-http.c:917 -+#: ../calendar/backends/http/e-cal-backend-http.c:925 - #: ../calendar/backends/weather/e-cal-backend-weather.c:536 - msgid "Could not create cache file" - msgstr "Kunne ikke opprette bufferfil" -@@ -1456,25 +1458,25 @@ msgstr "Vær: Tordenvær" - #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN) - #: ../calendar/backends/weather/e-cal-backend-weather.c:329 - #, c-format --msgid "%.1f °F" --msgstr "" -+msgid "%.1f ےF" -+msgstr "%.1f ےF" - - #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN) - #: ../calendar/backends/weather/e-cal-backend-weather.c:332 - #, c-format --msgid "%.1f °C" --msgstr "" -+msgid "%.1f ےC" -+msgstr "%.1f ےC" - - #. TRANSLATOR: This is the temperature in kelvin - #: ../calendar/backends/weather/e-cal-backend-weather.c:335 - #, c-format - msgid "%.1f K" --msgstr "" -+msgstr "%.1f K" - - #: ../calendar/backends/weather/e-cal-backend-weather.c:341 - #, c-format - msgid "%.1f" --msgstr "" -+msgstr "%.1f" - - #: ../calendar/backends/weather/e-cal-backend-weather.c:452 - msgid "Forecast" -@@ -2038,7 +2040,7 @@ msgstr "Ugyldige argumenter til (system-flag)" - msgid "Invalid arguments to (user-tag)" - msgstr "Ugyldige argumenter til (user-tag)" - --#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 -+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 - #, c-format - msgid "Error executing filter search: %s: %s" - msgstr "Feil under lagring av filtersøk: %s: %s" -@@ -2065,7 +2067,7 @@ msgstr[0] "Filtrerer ny melding i «%s»" - msgstr[1] "Filtrerer nye meldinger i «%s»" - - #: ../camel/camel-folder.c:1011 --#: ../camel/providers/local/camel-maildir-folder.c:319 -+#: ../camel/providers/local/camel-maildir-folder.c:330 - msgid "Moving messages" - msgstr "Flytter meldinger" - -@@ -2078,57 +2080,57 @@ msgstr "Kopierer meldinger" - msgid "Quota information not supported for folder '%s'" - msgstr "Kvoteinformasjon er ikke støttet for mappe «%s»" - --#: ../camel/camel-folder.c:2868 -+#: ../camel/camel-folder.c:2862 - #, c-format - msgid "Expunging folder '%s'" - msgstr "Tømmer mappe «%s»" - --#: ../camel/camel-folder.c:2996 -+#: ../camel/camel-folder.c:2990 - #, c-format - msgid "Retrieving message '%s' in %s" - msgstr "Henter melding «%s» i %s" - --#: ../camel/camel-folder.c:3187 -+#: ../camel/camel-folder.c:3181 - #, c-format - msgid "Retrieving quota information for '%s'" - msgstr "Henter kvoteinformasjon for «%s»" - --#: ../camel/camel-folder.c:3487 -+#: ../camel/camel-folder.c:3478 - #, c-format - msgid "Refreshing folder '%s'" - msgstr "Oppdaterer mappe «%s»" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 -+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 - #, c-format - msgid "(%s) requires a single bool result" - msgstr "(%s) krever et enkelt bolsk resultat" - - #. Translators: Each '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:964 -+#: ../camel/camel-folder-search.c:976 - #, c-format - msgid "(%s) not allowed inside %s" - msgstr "(%s) tillates ikke inne i %s" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 -+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 - #, c-format - msgid "(%s) requires a match type string" - msgstr "(%s) krever en streng for trefftype" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1007 -+#: ../camel/camel-folder-search.c:1019 - #, c-format - msgid "(%s) expects an array result" - msgstr "(%s) forventer resultat på tabellform" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1017 -+#: ../camel/camel-folder-search.c:1029 - #, c-format - msgid "(%s) requires the folder set" - msgstr "(%s) krever et mappesett" - --#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 -+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 - #, c-format - msgid "" - "Cannot parse search expression: %s:\n" -@@ -2137,7 +2139,7 @@ msgstr "" - "Kan ikke tolke uttrykket: %s:\n" - "%s" - --#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 -+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 - #, c-format - msgid "" - "Error executing search expression: %s:\n" -@@ -2383,7 +2385,7 @@ msgstr "Ikke noe innhold tilgjengelig" - msgid "No signature available" - msgstr "Ingen signatur tilgjengelig" - --#: ../camel/camel-multipart-signed.c:779 -+#: ../camel/camel-multipart-signed.c:806 - #, c-format - msgid "parse error" - msgstr "lesefeil" -@@ -2407,10 +2409,6 @@ msgstr "Navneoppslag «%s» feilet. Sjekk vertsnavnet for stavefeil." - msgid "Host lookup '%s' failed: %s" - msgstr "Navneoppslag «%s» feilet: %s" - --#: ../camel/camel-network-service.c:1009 --msgid "No host information available" --msgstr "Ingen vertsinformasjon tilgjengelig" -- - #: ../camel/camel-offline-folder.c:90 - msgid "Downloading new messages for offline mode" - msgstr "Laster ned nye meldinger for frakoblet modus" -@@ -2691,7 +2689,7 @@ msgid "Invalid GType registered for protocol '%s'" - msgstr "Ugyldig GType registrert for protokoll «%s»" - - #: ../camel/camel-session.c:502 --#: ../camel/providers/imapx/camel-imapx-server.c:4814 -+#: ../camel/providers/imapx/camel-imapx-server.c:4719 - #: ../camel/providers/pop3/camel-pop3-store.c:311 - #: ../camel/providers/pop3/camel-pop3-store.c:757 - #: ../camel/providers/smtp/camel-smtp-transport.c:515 -@@ -2930,14 +2928,14 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer" - msgid "Creating folder '%s'" - msgstr "Lager mappe «%s»" - --#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 --#: ../camel/providers/local/camel-maildir-store.c:315 -+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 -+#: ../camel/providers/local/camel-maildir-store.c:321 - #, c-format - msgid "Cannot delete folder: %s: Invalid operation" - msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon" - --#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 --#: ../camel/providers/local/camel-maildir-store.c:846 -+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 -+#: ../camel/providers/local/camel-maildir-store.c:872 - #, c-format - msgid "Cannot rename folder: %s: Invalid operation" - msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon" -@@ -3010,17 +3008,17 @@ msgstr "_Oppdater automatisk ved endring i kildemapper" - msgid "Unmatched" - msgstr "Ingen treff" - --#: ../camel/camel-vee-store.c:442 -+#: ../camel/camel-vee-store.c:436 - #, c-format - msgid "Cannot delete folder: %s: No such folder" - msgstr "Kan ikke slette mappe: %s: Ingen slik mappe" - --#: ../camel/camel-vee-store.c:477 -+#: ../camel/camel-vee-store.c:471 - #, c-format - msgid "Cannot rename folder: %s: No such folder" - msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe" - --#: ../camel/camel-vee-store.c:539 -+#: ../camel/camel-vee-store.c:533 - msgid "Enable _Unmatched folder" - msgstr "Slå på _mappe uten treff" - -@@ -3032,46 +3030,46 @@ msgstr "Kan ikke kopiere meldinger til papirkurvmappen" - msgid "Cannot copy messages to the Junk folder" - msgstr "Kan ikke kopiere meldinger til søppelmappen" - --#: ../camel/providers/imapx/camel-imapx-folder.c:687 -+#: ../camel/providers/imapx/camel-imapx-folder.c:796 - #, c-format - msgid "No quota information available for folder '%s'" - msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe «%s»" - --#: ../camel/providers/imapx/camel-imapx-folder.c:801 --#: ../camel/providers/imapx/camel-imapx-folder.c:894 -+#: ../camel/providers/imapx/camel-imapx-folder.c:936 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1029 - #, c-format - msgid "No destination folder specified" - msgstr "Ingen målmappe oppgitt" - --#: ../camel/providers/imapx/camel-imapx-folder.c:829 -+#: ../camel/providers/imapx/camel-imapx-folder.c:964 - msgid "Unable to move junk messages" - msgstr "Kan ikke flytte uønskede meldinger" - --#: ../camel/providers/imapx/camel-imapx-folder.c:922 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1057 - msgid "Unable to move deleted messages" - msgstr "Kan ikke flytte slettede meldinger" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1148 --#: ../camel/providers/nntp/camel-nntp-folder.c:758 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1374 -+#: ../camel/providers/nntp/camel-nntp-folder.c:760 - msgid "Apply message _filters to this folder" - msgstr "Bruk mappe_filter på denne mappen" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1254 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1485 - #, c-format - msgid "Could not create folder summary for %s" - msgstr "Kunne ikke lage sammendrag for mappe %s" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1263 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1494 - #, c-format - msgid "Could not create cache for %s: " - msgstr "Kunne ikke lage mellomlager for %s: " - --#: ../camel/providers/imapx/camel-imapx-folder.c:1448 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1709 - #, c-format - msgid "No IMAP mailbox available for folder '%s'" - msgstr "Ingen IMAP-postboks tilgjengelig for mappe «%s»" - --#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 -+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 - #, c-format - msgid "Source stream returned no data" - msgstr "Kildestrøm returnerte ingen data" -@@ -3097,23 +3095,31 @@ msgid "_Listen for server change notifications" - msgstr "_Lytt etter endringsvarsling fra tjener" - - #: ../camel/providers/imapx/camel-imapx-provider.c:49 -+msgid "Connection to Server" -+msgstr "Tilkobling til tjener" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+msgid "Numbe_r of concurrent connections to use" -+msgstr "Antall samtidige tilkoblinger som skal b_rukes" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:54 - #: ../camel/providers/nntp/camel-nntp-provider.c:44 - msgid "Folders" - msgstr "Mapper" - --#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+#: ../camel/providers/imapx/camel-imapx-provider.c:56 - msgid "_Show only subscribed folders" - msgstr "Vi_s kun abonnerte mapper" - --#: ../camel/providers/imapx/camel-imapx-provider.c:54 -+#: ../camel/providers/imapx/camel-imapx-provider.c:59 - msgid "O_verride server-supplied folder namespace" - msgstr "O_verstyr tjeners navneområde for mapper" - --#: ../camel/providers/imapx/camel-imapx-provider.c:56 -+#: ../camel/providers/imapx/camel-imapx-provider.c:61 - msgid "Namespace:" - msgstr "Navneområde:" - --#: ../camel/providers/imapx/camel-imapx-provider.c:59 -+#: ../camel/providers/imapx/camel-imapx-provider.c:64 - #: ../camel/providers/local/camel-local-provider.c:39 - #: ../camel/providers/local/camel-local-provider.c:79 - #: ../camel/providers/local/camel-local-provider.c:99 -@@ -3121,262 +3127,264 @@ msgstr "Navneområde:" - msgid "Options" - msgstr "Alternativer" - --#: ../camel/providers/imapx/camel-imapx-provider.c:61 -+#: ../camel/providers/imapx/camel-imapx-provider.c:66 - #: ../camel/providers/nntp/camel-nntp-provider.c:41 - msgid "Apply _filters to new messages in all folders" - msgstr "Bruk filtre for nye meldinger i alle mapper" - --#: ../camel/providers/imapx/camel-imapx-provider.c:63 -+#: ../camel/providers/imapx/camel-imapx-provider.c:68 - msgid "_Apply filters to new messages in Inbox on this server" - msgstr "_Bruk filtre for nye meldinger i Innboks på denne tjeneren" - --#: ../camel/providers/imapx/camel-imapx-provider.c:65 -+#: ../camel/providers/imapx/camel-imapx-provider.c:70 - msgid "Check new messages for _Junk contents" - msgstr "Se etter søppelinn_hold i nye meldinger" - --#: ../camel/providers/imapx/camel-imapx-provider.c:67 -+#: ../camel/providers/imapx/camel-imapx-provider.c:72 - msgid "Only check for Junk messages in the IN_BOX folder" - msgstr "Se kun etter søppelinnhold i nye meldinger i inn_boksen" - --#: ../camel/providers/imapx/camel-imapx-provider.c:69 -+#: ../camel/providers/imapx/camel-imapx-provider.c:74 - msgid "Automatically synchroni_ze remote mail locally" - msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk" - --#: ../camel/providers/imapx/camel-imapx-provider.c:75 -+#: ../camel/providers/imapx/camel-imapx-provider.c:80 - msgid "Default IMAP port" - msgstr "Forvalgt port for IMAP" - --#: ../camel/providers/imapx/camel-imapx-provider.c:76 -+#: ../camel/providers/imapx/camel-imapx-provider.c:81 - msgid "IMAP over SSL" - msgstr "IMAP over SSL" - --#: ../camel/providers/imapx/camel-imapx-provider.c:83 -+#: ../camel/providers/imapx/camel-imapx-provider.c:88 - msgid "IMAP+" - msgstr "IMAP+" - --#: ../camel/providers/imapx/camel-imapx-provider.c:85 -+#: ../camel/providers/imapx/camel-imapx-provider.c:90 - msgid "For reading and storing mail on IMAP servers." - msgstr "For lesing og lagring av e-post på IMAP-tjenere." - --#: ../camel/providers/imapx/camel-imapx-server.c:844 -+#: ../camel/providers/imapx/camel-imapx-server.c:1009 -+#: ../camel/providers/imapx/camel-imapx-server.c:1016 - #, c-format - msgid "Not authenticated" - msgstr "Ikke autentisert" - --#: ../camel/providers/imapx/camel-imapx-server.c:1773 -+#: ../camel/providers/imapx/camel-imapx-server.c:1713 - msgid "Server disconnected" - msgstr "Tjener frakoblet" - --#: ../camel/providers/imapx/camel-imapx-server.c:2255 -+#: ../camel/providers/imapx/camel-imapx-server.c:2205 - msgid "Error writing to cache stream" - msgstr "Feil ved skriving til mellomlagerstrøm" - --#: ../camel/providers/imapx/camel-imapx-server.c:3672 -+#: ../camel/providers/imapx/camel-imapx-server.c:3550 - msgid "Error performing IDLE" - msgstr "Feil ved utføring av IDLE" - --#: ../camel/providers/imapx/camel-imapx-server.c:4661 -+#: ../camel/providers/imapx/camel-imapx-server.c:4558 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: %s" - msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:4662 -+#: ../camel/providers/imapx/camel-imapx-server.c:4559 - #: ../camel/providers/smtp/camel-smtp-transport.c:215 - msgid "STARTTLS not supported" - msgstr "STARTTLS er ikke støttet" - --#: ../camel/providers/imapx/camel-imapx-server.c:4722 -+#: ../camel/providers/imapx/camel-imapx-server.c:4619 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: " - msgstr "Klarte ikke å koble til IMAP-tjener %s i sikker modus: " - --#: ../camel/providers/imapx/camel-imapx-server.c:4803 -+#: ../camel/providers/imapx/camel-imapx-server.c:4708 - #, c-format - msgid "IMAP server %s does not support %s authentication" - msgstr "IMAP-tjener %s støtter ikke autentiseringstype %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:4833 -+#: ../camel/providers/imapx/camel-imapx-server.c:4738 - #: ../camel/providers/nntp/camel-nntp-store.c:394 - #: ../camel/providers/nntp/camel-nntp-store.c:531 - msgid "Cannot authenticate without a username" - msgstr "Kan ikke autentisere uten brukernavn" - --#: ../camel/providers/imapx/camel-imapx-server.c:4842 -+#: ../camel/providers/imapx/camel-imapx-server.c:4747 - #: ../camel/providers/nntp/camel-nntp-store.c:540 - #: ../camel/providers/pop3/camel-pop3-store.c:678 - #: ../camel/providers/pop3/camel-pop3-store.c:699 - msgid "Authentication password not available" - msgstr "Passord for autentisering er ikke tilgjengelig" - --#: ../camel/providers/imapx/camel-imapx-server.c:5093 -+#: ../camel/providers/imapx/camel-imapx-server.c:4983 -+#: ../camel/providers/imapx/camel-imapx-server.c:5042 - msgid "Error fetching message" - msgstr "Feil ved henting av melding" - --#: ../camel/providers/imapx/camel-imapx-server.c:5139 -+#: ../camel/providers/imapx/camel-imapx-server.c:5035 - msgid "Failed to close the tmp stream" - msgstr "Klarte ikke å lukke midlertidig strøm" - --#: ../camel/providers/imapx/camel-imapx-server.c:5168 -+#: ../camel/providers/imapx/camel-imapx-server.c:5071 - msgid "Failed to copy the tmp file" - msgstr "Klarte ikke å kopiere midlertidig fil" - --#: ../camel/providers/imapx/camel-imapx-server.c:5294 -+#: ../camel/providers/imapx/camel-imapx-server.c:5212 - msgid "Error moving messages" - msgstr "Feil ved flytting av meldinger" - --#: ../camel/providers/imapx/camel-imapx-server.c:5298 -+#: ../camel/providers/imapx/camel-imapx-server.c:5216 - msgid "Error copying messages" - msgstr "Feil ved kopiering av meldinger" - --#: ../camel/providers/imapx/camel-imapx-server.c:5520 -+#: ../camel/providers/imapx/camel-imapx-server.c:5438 - msgid "Error appending message" - msgstr "Feil ved forsøk på å legge til en melding" - --#: ../camel/providers/imapx/camel-imapx-server.c:5756 -+#: ../camel/providers/imapx/camel-imapx-server.c:5674 - msgid "Error fetching message headers" - msgstr "Feil ved henting av meldingshoder" - --#: ../camel/providers/imapx/camel-imapx-server.c:5921 -+#: ../camel/providers/imapx/camel-imapx-server.c:5841 - msgid "Error retrieving message" - msgstr "Feil ved henting av melding" - --#: ../camel/providers/imapx/camel-imapx-server.c:6051 --#: ../camel/providers/imapx/camel-imapx-server.c:6274 -+#: ../camel/providers/imapx/camel-imapx-server.c:5975 -+#: ../camel/providers/imapx/camel-imapx-server.c:6204 - #, c-format - msgid "Fetching summary information for new messages in '%s'" - msgstr "Henter sammendragsinformasjon for nye meldinger i «%s»" - --#: ../camel/providers/imapx/camel-imapx-server.c:6103 -+#: ../camel/providers/imapx/camel-imapx-server.c:6027 - #, c-format - msgid "Scanning for changed messages in '%s'" - msgstr "Søker etter endrede meldinger i «%s»" - --#: ../camel/providers/imapx/camel-imapx-server.c:6155 -+#: ../camel/providers/imapx/camel-imapx-server.c:6079 - msgid "Error fetching new messages" - msgstr "Feil ved henting av nye meldinger" - --#: ../camel/providers/imapx/camel-imapx-server.c:6423 -+#: ../camel/providers/imapx/camel-imapx-server.c:6352 - msgid "Error refreshing folder" - msgstr "Feil ved oppdatering av mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:6573 -+#: ../camel/providers/imapx/camel-imapx-server.c:6502 - msgid "Error expunging message" - msgstr "Feil ved tømming av melding" - --#: ../camel/providers/imapx/camel-imapx-server.c:6682 --#: ../camel/providers/imapx/camel-imapx-server.c:6707 -+#: ../camel/providers/imapx/camel-imapx-server.c:6617 -+#: ../camel/providers/imapx/camel-imapx-server.c:6642 - msgid "Error fetching folders" - msgstr "Feil ved henting av mapper" - --#: ../camel/providers/imapx/camel-imapx-server.c:6787 -+#: ../camel/providers/imapx/camel-imapx-server.c:6722 - msgid "Error creating folder" - msgstr "Feil ved oppretting av mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:6839 -+#: ../camel/providers/imapx/camel-imapx-server.c:6774 - msgid "Error deleting folder" - msgstr "Feil ved sletting av mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:6906 -+#: ../camel/providers/imapx/camel-imapx-server.c:6850 - msgid "Error renaming folder" - msgstr "Feil ved endring av navn på mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:6993 -+#: ../camel/providers/imapx/camel-imapx-server.c:6924 - msgid "Error subscribing to folder" - msgstr "Feil ved abonnering på mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:7053 -+#: ../camel/providers/imapx/camel-imapx-server.c:6990 - msgid "Error unsubscribing from folder" - msgstr "Feil ved fjerning av abonnement på mappe" - --#: ../camel/providers/imapx/camel-imapx-server.c:7109 -+#: ../camel/providers/imapx/camel-imapx-server.c:7052 - msgid "Error retrieving quota information" - msgstr "Feil ved henting av kvoteinformasjon" - --#: ../camel/providers/imapx/camel-imapx-server.c:7161 -+#: ../camel/providers/imapx/camel-imapx-server.c:7104 - msgid "Search failed" - msgstr "Søk feilet" - --#: ../camel/providers/imapx/camel-imapx-server.c:7223 -+#: ../camel/providers/imapx/camel-imapx-server.c:7166 - msgid "Error performing NOOP" - msgstr "Feil ved utføring av NOOP" - --#: ../camel/providers/imapx/camel-imapx-server.c:7330 -+#: ../camel/providers/imapx/camel-imapx-server.c:7273 - msgid "Error syncing changes" - msgstr "Feil ved synkronisering av endringer" - --#: ../camel/providers/imapx/camel-imapx-server.c:8441 -+#: ../camel/providers/imapx/camel-imapx-server.c:8258 - #, c-format - msgid "Cannot get message with message ID %s: %s" - msgstr "Kan ikke hente melding med meldings-ID %s: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:8442 -+#: ../camel/providers/imapx/camel-imapx-server.c:8259 - msgid "No such message available." - msgstr "Ingen slik melding tilgjengelig." - --#: ../camel/providers/imapx/camel-imapx-server.c:8640 --#: ../camel/providers/imapx/camel-imapx-server.c:8658 -+#: ../camel/providers/imapx/camel-imapx-server.c:8466 -+#: ../camel/providers/imapx/camel-imapx-server.c:8487 - msgid "Cannot create spool file: " - msgstr "Kan ikke spool-fil: " - --#: ../camel/providers/imapx/camel-imapx-server.c:9400 -+#: ../camel/providers/imapx/camel-imapx-server.c:9228 - msgid "IMAP server does not support quotas" - msgstr "IMAP-tjener støtter ikke kvoter" - - #. create a dummy "." parent inbox, use to scan, then put back at the top level --#: ../camel/providers/imapx/camel-imapx-store.c:207 --#: ../camel/providers/local/camel-maildir-folder.c:471 --#: ../camel/providers/local/camel-maildir-store.c:316 --#: ../camel/providers/local/camel-maildir-store.c:758 --#: ../camel/providers/local/camel-maildir-store.c:764 --#: ../camel/providers/local/camel-maildir-store.c:847 -+#: ../camel/providers/imapx/camel-imapx-store.c:223 -+#: ../camel/providers/local/camel-maildir-folder.c:482 -+#: ../camel/providers/local/camel-maildir-store.c:322 -+#: ../camel/providers/local/camel-maildir-store.c:784 -+#: ../camel/providers/local/camel-maildir-store.c:790 -+#: ../camel/providers/local/camel-maildir-store.c:873 - #: ../camel/providers/local/camel-spool-store.c:393 - msgid "Inbox" - msgstr "Innboks" - --#: ../camel/providers/imapx/camel-imapx-store.c:823 -+#: ../camel/providers/imapx/camel-imapx-store.c:758 - #, c-format - msgid "IMAP server %s" - msgstr "IMAP-tjener %s" - --#: ../camel/providers/imapx/camel-imapx-store.c:826 -+#: ../camel/providers/imapx/camel-imapx-store.c:761 - #, c-format - msgid "IMAP service for %s on %s" - msgstr "IMAP-tjeneste for %s på %s" - --#: ../camel/providers/imapx/camel-imapx-store.c:1035 -+#: ../camel/providers/imapx/camel-imapx-store.c:836 - #: ../camel/providers/nntp/camel-nntp-provider.c:93 - #: ../camel/providers/pop3/camel-pop3-provider.c:81 - msgid "Password" - msgstr "Passord" - --#: ../camel/providers/imapx/camel-imapx-store.c:1037 -+#: ../camel/providers/imapx/camel-imapx-store.c:838 - msgid "This option will connect to the IMAP server using a plaintext password." - msgstr "" - "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-" - "passord." - --#: ../camel/providers/imapx/camel-imapx-store.c:1112 -+#: ../camel/providers/imapx/camel-imapx-store.c:913 - #, c-format - msgid "No such folder %s" - msgstr "Mappen %s eksisterer ikke" - --#: ../camel/providers/imapx/camel-imapx-store.c:1507 -+#: ../camel/providers/imapx/camel-imapx-store.c:1324 - #, c-format - msgid "No IMAP namespace for folder path '%s'" --msgstr "" -+msgstr "IMAP-navneområde for mappesti «%s» finnes ikke" - --#: ../camel/providers/imapx/camel-imapx-store.c:1656 -+#: ../camel/providers/imapx/camel-imapx-store.c:1472 - #, c-format - msgid "Retrieving folder list for %s" - msgstr "Henter mappeliste for %s" - --#: ../camel/providers/imapx/camel-imapx-store.c:2094 -+#: ../camel/providers/imapx/camel-imapx-store.c:1924 - #, c-format - msgid "" - "The folder name \"%s\" is invalid because it contains the character \"%c\"" - msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" - --#: ../camel/providers/imapx/camel-imapx-store.c:2615 -+#: ../camel/providers/imapx/camel-imapx-store.c:2689 - #: ../camel/providers/nntp/camel-nntp-store.c:1250 - #: ../camel/providers/pop3/camel-pop3-folder.c:450 - #: ../camel/providers/pop3/camel-pop3-folder.c:593 -@@ -3391,27 +3399,27 @@ msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" - msgid "You must be working online to complete this operation" - msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen" - --#: ../camel/providers/local/camel-local-folder.c:192 -+#: ../camel/providers/local/camel-local-folder.c:195 - #, c-format - msgid "~%s (%s)" - msgstr "~%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:202 --#: ../camel/providers/local/camel-local-folder.c:211 -+#: ../camel/providers/local/camel-local-folder.c:205 -+#: ../camel/providers/local/camel-local-folder.c:214 - #, c-format - msgid "mailbox: %s (%s)" - msgstr "postboks: %s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:220 -+#: ../camel/providers/local/camel-local-folder.c:223 - #, c-format - msgid "%s (%s)" - msgstr "%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:497 -+#: ../camel/providers/local/camel-local-folder.c:500 - msgid "_Index message body data" - msgstr "_Indekser data i meldingskropp" - --#: ../camel/providers/local/camel-local-folder.c:725 -+#: ../camel/providers/local/camel-local-folder.c:730 - #, c-format - msgid "" - "Cannot get message %s from folder %s\n" -@@ -3505,7 +3513,7 @@ msgstr "Lagerrot %s er ikke en vanlig katalog" - #: ../camel/providers/local/camel-local-store.c:242 - #: ../camel/providers/local/camel-local-store.c:252 - #: ../camel/providers/local/camel-local-store.c:394 --#: ../camel/providers/local/camel-maildir-store.c:150 -+#: ../camel/providers/local/camel-maildir-store.c:156 - #, c-format - msgid "Cannot get folder: %s: %s" - msgstr "Finner ikke mappe: %s: %s" -@@ -3532,79 +3540,80 @@ msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s" - msgid "Could not rename '%s': %s" - msgstr "Kunne ikke endre navn på «%s»: %s" - --#: ../camel/providers/local/camel-maildir-folder.c:98 --#: ../camel/providers/local/camel-maildir-folder.c:333 --#: ../camel/providers/local/camel-mbox-folder.c:115 --#: ../camel/providers/local/camel-mbox-folder.c:328 -+#: ../camel/providers/local/camel-maildir-folder.c:109 -+#: ../camel/providers/local/camel-maildir-folder.c:344 -+#: ../camel/providers/local/camel-mbox-folder.c:126 -+#: ../camel/providers/local/camel-mbox-folder.c:339 - #: ../camel/providers/local/camel-mh-folder.c:157 - msgid "No such message" - msgstr "Ingen slik melding" - --#: ../camel/providers/local/camel-maildir-folder.c:223 -+#: ../camel/providers/local/camel-maildir-folder.c:234 - #, c-format - msgid "Cannot append message to maildir folder: %s: " - msgstr "Kan ikke legge til melding i maildir mappe: %s: " - --#: ../camel/providers/local/camel-maildir-folder.c:271 --#: ../camel/providers/local/camel-maildir-folder.c:281 --#: ../camel/providers/local/camel-mbox-folder.c:389 -+#: ../camel/providers/local/camel-maildir-folder.c:282 -+#: ../camel/providers/local/camel-maildir-folder.c:292 -+#: ../camel/providers/local/camel-mbox-folder.c:400 - #: ../camel/providers/local/camel-mh-folder.c:169 - #: ../camel/providers/local/camel-mh-folder.c:179 - #, c-format - msgid "Cannot get message %s from folder %s: " - msgstr "Kan ikke hente melding %s fra mappe %s: " - --#: ../camel/providers/local/camel-maildir-folder.c:351 -+#: ../camel/providers/local/camel-maildir-folder.c:362 - #, c-format - msgid "Cannot transfer message to destination folder: %s" - msgstr "Kan ikke overføre melding til målmappe: %s" - - #: ../camel/providers/local/camel-maildir-store.c:130 --#: ../camel/providers/local/camel-maildir-store.c:855 -+#: ../camel/providers/local/camel-maildir-store.c:149 -+#: ../camel/providers/local/camel-maildir-store.c:881 - #, c-format - msgid "Folder %s already exists" - msgstr "Mappen %s eksisterer allerede" - --#: ../camel/providers/local/camel-maildir-store.c:235 --#: ../camel/providers/local/camel-maildir-store.c:266 -+#: ../camel/providers/local/camel-maildir-store.c:241 -+#: ../camel/providers/local/camel-maildir-store.c:272 - #: ../camel/providers/local/camel-mbox-store.c:401 - #: ../camel/providers/local/camel-mbox-store.c:422 - #, c-format - msgid "Cannot create folder '%s': %s" - msgstr "Kan ikke opprette mappe «%s»: %s" - --#: ../camel/providers/local/camel-maildir-store.c:250 -+#: ../camel/providers/local/camel-maildir-store.c:256 - #: ../camel/providers/local/camel-mbox-store.c:367 - #: ../camel/providers/local/camel-mh-store.c:523 - #, c-format - msgid "Cannot get folder '%s': %s" - msgstr "Finner ikke mappe «%s»: %s" - --#: ../camel/providers/local/camel-maildir-store.c:256 -+#: ../camel/providers/local/camel-maildir-store.c:262 - #: ../camel/providers/local/camel-mbox-store.c:377 - #: ../camel/providers/local/camel-mh-store.c:532 - #, c-format - msgid "Cannot get folder '%s': folder does not exist." - msgstr "Finner ikke mappe «%s»: mappen eksisterer ikke." - --#: ../camel/providers/local/camel-maildir-store.c:283 -+#: ../camel/providers/local/camel-maildir-store.c:289 - #, c-format - msgid "Cannot get folder '%s': not a maildir directory." - msgstr "Kan ikke hente mappe «%s»: ikke en maildir katalog." - --#: ../camel/providers/local/camel-maildir-store.c:347 --#: ../camel/providers/local/camel-maildir-store.c:387 -+#: ../camel/providers/local/camel-maildir-store.c:353 -+#: ../camel/providers/local/camel-maildir-store.c:393 - #: ../camel/providers/local/camel-mh-store.c:676 - #, c-format - msgid "Could not delete folder '%s': %s" - msgstr "Kunne ikke slette mappe «%s»: %s" - --#: ../camel/providers/local/camel-maildir-store.c:349 -+#: ../camel/providers/local/camel-maildir-store.c:355 - msgid "not a maildir directory" - msgstr "ikke en maildir katalog" - --#: ../camel/providers/local/camel-maildir-store.c:630 --#: ../camel/providers/local/camel-maildir-store.c:1069 -+#: ../camel/providers/local/camel-maildir-store.c:637 -+#: ../camel/providers/local/camel-maildir-store.c:1095 - #: ../camel/providers/local/camel-spool-store.c:212 - #: ../camel/providers/local/camel-spool-store.c:231 - #, c-format -@@ -3625,29 +3634,29 @@ msgstr "Sjekker om mappen er konsistent" - msgid "Checking for new messages" - msgstr "Ser etter nye meldinger" - --#: ../camel/providers/local/camel-maildir-summary.c:784 -+#: ../camel/providers/local/camel-maildir-summary.c:791 - #: ../camel/providers/local/camel-mbox-summary.c:466 --#: ../camel/providers/local/camel-mbox-summary.c:682 --#: ../camel/providers/local/camel-mbox-summary.c:831 -+#: ../camel/providers/local/camel-mbox-summary.c:687 -+#: ../camel/providers/local/camel-mbox-summary.c:836 - #: ../camel/providers/local/camel-spool-summary.c:139 - msgid "Storing folder" - msgstr "Lagrer mappe" - --#: ../camel/providers/local/camel-mbox-folder.c:185 -+#: ../camel/providers/local/camel-mbox-folder.c:196 - #, c-format - msgid "Cannot open mailbox: %s: " - msgstr "Kan ikke åpne postboks: %s: " - --#: ../camel/providers/local/camel-mbox-folder.c:251 -+#: ../camel/providers/local/camel-mbox-folder.c:262 - #, c-format - msgid "Cannot append message to mbox file: %s: " - msgstr "Kan ikke legge til melding i mbox-fil: %s: " - --#: ../camel/providers/local/camel-mbox-folder.c:381 -+#: ../camel/providers/local/camel-mbox-folder.c:392 - msgid "The folder appears to be irrecoverably corrupted." - msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres." - --#: ../camel/providers/local/camel-mbox-folder.c:438 -+#: ../camel/providers/local/camel-mbox-folder.c:449 - #: ../camel/providers/local/camel-spool-folder.c:67 - #, c-format - msgid "Cannot create folder lock on %s: %s" -@@ -3725,48 +3734,48 @@ msgstr "Kunne ikke endre navn på «%s» til %s: %s" - msgid "Could not open folder: %s: %s" - msgstr "Kunne ikke åpne mappe %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:606 -+#: ../camel/providers/local/camel-mbox-summary.c:611 - #, c-format - msgid "Cannot check folder: %s: %s" - msgstr "Kan ikke sjekke mappe: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:695 --#: ../camel/providers/local/camel-mbox-summary.c:840 -+#: ../camel/providers/local/camel-mbox-summary.c:700 -+#: ../camel/providers/local/camel-mbox-summary.c:845 - #: ../camel/providers/local/camel-spool-summary.c:146 - #, c-format - msgid "Could not open file: %s: %s" - msgstr "Kunne ikke åpne fil %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:710 -+#: ../camel/providers/local/camel-mbox-summary.c:715 - #: ../camel/providers/local/camel-spool-summary.c:161 - #, c-format - msgid "Cannot open temporary mailbox: %s" - msgstr "Kan ikke åpne midlertidig postboks: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:727 --#: ../camel/providers/local/camel-mbox-summary.c:962 -+#: ../camel/providers/local/camel-mbox-summary.c:732 -+#: ../camel/providers/local/camel-mbox-summary.c:967 - #, c-format - msgid "Could not close source folder %s: %s" - msgstr "Kunne ikke lukke kildemappe %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:740 -+#: ../camel/providers/local/camel-mbox-summary.c:745 - #, c-format - msgid "Could not close temporary folder: %s" - msgstr "Kunne ikke lukke midlertidig mappe: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:759 -+#: ../camel/providers/local/camel-mbox-summary.c:764 - #, c-format - msgid "Could not rename folder: %s" - msgstr "Kunne ikke endre navn på mappe: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:854 --#: ../camel/providers/local/camel-mbox-summary.c:1127 -+#: ../camel/providers/local/camel-mbox-summary.c:859 -+#: ../camel/providers/local/camel-mbox-summary.c:1132 - #, c-format - msgid "Could not store folder: %s" - msgstr "Kunne ikke lagre mappe: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:893 --#: ../camel/providers/local/camel-mbox-summary.c:1167 -+#: ../camel/providers/local/camel-mbox-summary.c:898 -+#: ../camel/providers/local/camel-mbox-summary.c:1172 - #, c-format - msgid "" - "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " -@@ -3775,25 +3784,25 @@ msgstr "" - "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, " - "men fant den ikke.)" - --#: ../camel/providers/local/camel-mbox-summary.c:903 --#: ../camel/providers/local/camel-mbox-summary.c:1179 -+#: ../camel/providers/local/camel-mbox-summary.c:908 -+#: ../camel/providers/local/camel-mbox-summary.c:1184 - #, c-format - msgid "Summary and folder mismatch, even after a sync" - msgstr "Sammendrag og mappe stemmer ikke overens selv etter synkronisering" - --#: ../camel/providers/local/camel-mbox-summary.c:1072 -+#: ../camel/providers/local/camel-mbox-summary.c:1077 - #: ../camel/providers/local/camel-spool-summary.c:356 - #, c-format - msgid "Unknown error: %s" - msgstr "Ukjent feil: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1237 --#: ../camel/providers/local/camel-mbox-summary.c:1267 -+#: ../camel/providers/local/camel-mbox-summary.c:1242 -+#: ../camel/providers/local/camel-mbox-summary.c:1272 - #, c-format - msgid "Writing to temporary mailbox failed: %s" - msgstr "Skriving til midlertidig postboks feilet: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1256 -+#: ../camel/providers/local/camel-mbox-summary.c:1261 - #, c-format - msgid "Writing to temporary mailbox failed: %s: %s" - msgstr "Skriving til midlertidig postboks feilet: %s: %s" -@@ -3914,21 +3923,21 @@ msgstr "" - "Mappen kan være korrupt, kopi lagret i «%s»" - - #: ../camel/providers/nntp/camel-nntp-folder.c:222 --#: ../camel/providers/nntp/camel-nntp-folder.c:588 -+#: ../camel/providers/nntp/camel-nntp-folder.c:590 - #, c-format - msgid "Internal error: UID in invalid format: %s" - msgstr "Intern feil: UID har ugyldig format: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:291 --#: ../camel/providers/nntp/camel-nntp-folder.c:296 -+#: ../camel/providers/nntp/camel-nntp-folder.c:292 -+#: ../camel/providers/nntp/camel-nntp-folder.c:297 - #: ../camel/providers/pop3/camel-pop3-folder.c:546 - #: ../camel/providers/pop3/camel-pop3-folder.c:945 - #, c-format - msgid "Cannot get message %s: %s" - msgstr "Kan ikke hente melding %s: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:303 --#: ../camel/providers/nntp/camel-nntp-folder.c:622 -+#: ../camel/providers/nntp/camel-nntp-folder.c:304 -+#: ../camel/providers/nntp/camel-nntp-folder.c:624 - #: ../camel/providers/pop3/camel-pop3-folder.c:476 - #: ../camel/providers/pop3/camel-pop3-folder.c:536 - #: ../camel/providers/pop3/camel-pop3-folder.c:555 -@@ -3942,16 +3951,16 @@ msgstr "Kan ikke hente melding %s: " - msgid "Posting failed: %s" - msgstr "Posting feilet: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:501 -+#: ../camel/providers/nntp/camel-nntp-folder.c:503 - msgid "Posting failed: " - msgstr "Posting feilet: " - --#: ../camel/providers/nntp/camel-nntp-folder.c:611 -+#: ../camel/providers/nntp/camel-nntp-folder.c:613 - #, c-format - msgid "This message is not currently available" - msgstr "Denne meldingen er ikke tilgjengelig" - --#: ../camel/providers/nntp/camel-nntp-folder.c:720 -+#: ../camel/providers/nntp/camel-nntp-folder.c:722 - #, c-format - msgid "You cannot copy messages from a NNTP folder" - msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe" -@@ -4678,8 +4687,8 @@ msgstr "(Utfaset) URL for automatisk konfigurasjon av proxy" - - #: ../libebackend/e-authentication-mediator.c:204 - #: ../libebackend/e-authentication-mediator.c:215 --#: ../libebackend/e-authentication-mediator.c:861 --#: ../libebackend/e-authentication-mediator.c:1198 -+#: ../libebackend/e-authentication-mediator.c:860 -+#: ../libebackend/e-authentication-mediator.c:1197 - msgid "Bus name vanished (client terminated?)" - msgstr "Navn på bussen forsvang (klient terminert?)" - -@@ -4689,8 +4698,8 @@ msgstr "Ingen svar fra klient" - - #: ../libebackend/e-authentication-mediator.c:333 - #: ../libebackend/e-authentication-mediator.c:344 --#: ../libebackend/e-authentication-mediator.c:855 --#: ../libebackend/e-authentication-mediator.c:1192 -+#: ../libebackend/e-authentication-mediator.c:854 -+#: ../libebackend/e-authentication-mediator.c:1191 - msgid "Client cancelled the operation" - msgstr "Klienten avbrøt operasjon" - -@@ -4698,11 +4707,11 @@ msgstr "Klienten avbrøt operasjon" - msgid "Client reports password was rejected" - msgstr "Klienten rapporterer at passordet ble avvist" - --#: ../libebackend/e-authentication-session.c:554 -+#: ../libebackend/e-authentication-session.c:539 - msgid "Add this password to your keyring" - msgstr "Legg til dette passordet i nøkkelringen" - --#: ../libebackend/e-authentication-session.c:664 -+#: ../libebackend/e-authentication-session.c:649 - msgid "Password was incorrect" - msgstr "Passordet var ikke korrekt" - -@@ -4711,12 +4720,12 @@ msgstr "Passordet var ikke korrekt" - msgid "%s does not support authentication" - msgstr "%s støtter ikke autentisering" - --#: ../libebackend/e-collection-backend.c:900 -+#: ../libebackend/e-collection-backend.c:901 - #, c-format - msgid "%s does not support creating remote resources" - msgstr "%s støtter ikke å lage eksterne ressurser" - --#: ../libebackend/e-collection-backend.c:959 -+#: ../libebackend/e-collection-backend.c:960 - #, c-format - msgid "%s does not support deleting remote resources" - msgstr "%s støtter ikke sletting av eksterne ressurser" -@@ -4731,38 +4740,38 @@ msgstr "Ingen fabrikk for motor for hash-nøkkel «%s»" - msgid "Data source is missing a [%s] group" - msgstr "Datakilden mangler en [%s]-gruppe" - --#: ../libebackend/e-server-side-source.c:1020 --#: ../libedataserver/e-source.c:1348 -+#: ../libebackend/e-server-side-source.c:1022 -+#: ../libedataserver/e-source.c:1394 - #, c-format - msgid "Data source '%s' does not support creating remote resources" - msgstr "Datakilde «%s» støtter ikke å lage eksterne ressurser" - --#: ../libebackend/e-server-side-source.c:1034 -+#: ../libebackend/e-server-side-source.c:1036 - #, c-format - msgid "" - "Data source '%s' has no collection backend to create the remote resource" - msgstr "Datakilde «%s» har ingen samlingsmotor for å lage ekstern ressurs" - --#: ../libebackend/e-server-side-source.c:1062 --#: ../libedataserver/e-source.c:1461 -+#: ../libebackend/e-server-side-source.c:1064 -+#: ../libedataserver/e-source.c:1507 - #, c-format - msgid "Data source '%s' does not support deleting remote resources" - msgstr "Datakilde «%s» støtter ikke sletting av eksterne ressurser" - --#: ../libebackend/e-server-side-source.c:1076 -+#: ../libebackend/e-server-side-source.c:1078 - #, c-format - msgid "" - "Data source '%s' has no collection backend to delete the remote resource" - msgstr "Datakilde «%s» har ingen samlingsmotor for å slette ekstern ressurs" - --#: ../libebackend/e-server-side-source.c:1107 --#: ../libedataserver/e-source.c:1557 --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 -+#: ../libebackend/e-server-side-source.c:1109 -+#: ../libedataserver/e-source.c:1603 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 - #, c-format - msgid "Data source '%s' does not support OAuth 2.0 authentication" - msgstr "Datakilde «%s» støtter ikke OAuth 2.0 autentisering" - --#: ../libebackend/e-server-side-source.c:1452 -+#: ../libebackend/e-server-side-source.c:1456 - #, c-format - msgid "File must have a '.source' extension" - msgstr "Filen må ha en «.source»-filtype" -@@ -4965,26 +4974,26 @@ msgstr "Vennligst oppgi passordet for oppgaveliste «%s»." - msgid "Please enter the password for account \"%s\"." - msgstr "Vennligst oppgi passordet for konto «%s»." - --#: ../libedataserver/e-source.c:765 -+#: ../libedataserver/e-source.c:768 - #, c-format - msgid "Source file is missing a [%s] group" - msgstr "Kildefilen mangler en [%s]-gruppe" - --#: ../libedataserver/e-source.c:1128 -+#: ../libedataserver/e-source.c:1174 - #, c-format - msgid "Data source '%s' is not removable" - msgstr "Datakilde «%s» kan ikke fjernes" - --#: ../libedataserver/e-source.c:1251 -+#: ../libedataserver/e-source.c:1297 - #, c-format - msgid "Data source '%s' is not writable" - msgstr "Datakilde «%s» er ikke skrivbar" - --#: ../libedataserver/e-source.c:1864 -+#: ../libedataserver/e-source.c:1910 - msgid "Unnamed" - msgstr "Uten navn" - --#: ../libedataserver/e-source-mail-signature.c:486 -+#: ../libedataserver/e-source-mail-signature.c:485 - #, c-format - msgid "Signature script must be a local file" - msgstr "Signaturskriptet må være en lokal fil" -@@ -4994,7 +5003,7 @@ msgstr "Signaturskriptet må være en lokal fil" - msgid "Source '%s' does not support proxy lookups" - msgstr "Kilde «%s» støtter ikke oppslag via proxy" - --#: ../libedataserver/e-source-webdav.c:1551 -+#: ../libedataserver/e-source-webdav.c:1555 - #, c-format - msgid "" - "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " -@@ -5003,7 +5012,7 @@ msgstr "" - "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av adressebok «%s». " - "Vil du akseptere det?" - --#: ../libedataserver/e-source-webdav.c:1560 -+#: ../libedataserver/e-source-webdav.c:1564 - #, c-format - msgid "" - "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " -@@ -5012,7 +5021,7 @@ msgstr "" - "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av kalender «%s». Vil " - "du akseptere det?" - --#: ../libedataserver/e-source-webdav.c:1569 -+#: ../libedataserver/e-source-webdav.c:1573 - #, c-format - msgid "" - "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " -@@ -5021,7 +5030,7 @@ msgstr "" - "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av notatliste «%s». " - "Vil du akseptere det?" - --#: ../libedataserver/e-source-webdav.c:1578 -+#: ../libedataserver/e-source-webdav.c:1582 - #, c-format - msgid "" - "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " -@@ -5215,7 +5224,7 @@ msgstr "Klarte ikke å finne kontoelement" - msgid "Failed to find ASUrl and OABUrl in autodiscover response" - msgstr "Klarte ikke å finne ASUrl og OABUrl i svar fra automatisk gjenkjenning" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 - #, c-format - msgid "" - "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " -@@ -5224,18 +5233,23 @@ msgstr "" - "Kan ikke finne samsvarende konto å finne tilgangstegn for «%s» i org.gnome." - "OnlineAccounts-tjenesten" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 - #, c-format - msgid "Failed to obtain an access token for '%s': " - msgstr "Klarte ikke å hente et adgangstegn for «%s»: " - --#: ../modules/google-backend/module-google-backend.c:191 -+#: ../modules/google-backend/module-google-backend.c:195 - #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 - #: ../modules/yahoo-backend/module-yahoo-backend.c:199 - msgid "Calendar" - msgstr "Kalender" - --#: ../modules/google-backend/module-google-backend.c:260 -+#: ../modules/google-backend/module-google-backend.c:268 -+#: ../modules/yahoo-backend/module-yahoo-backend.c:226 -+msgid "Tasks" -+msgstr "Oppgaver" -+ -+#: ../modules/google-backend/module-google-backend.c:321 - #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 - #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 - msgid "Contacts" -@@ -5338,7 +5352,7 @@ msgstr "E-post" - msgid "Integrate your mailboxes" - msgstr "Integrer dine postbokser" - --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 - #, c-format - msgid "" - "Cannot find a corresponding account service in the accounts database from " -@@ -5352,7 +5366,9 @@ msgstr "" - #, c-format - msgid "" - "Expected status 200 when requesting your identity, instead got status %d (%s)" --msgstr "Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status %d (%s)" -+msgstr "" -+"Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status " -+"%d (%s)" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:101 - #: ../modules/ubuntu-online-accounts/uoa-utils.c:298 -@@ -5383,10 +5399,6 @@ msgstr "Yahoo! kalender" - msgid "Yahoo! Mail" - msgstr "Yahoo! e-post" - --#: ../modules/yahoo-backend/module-yahoo-backend.c:226 --msgid "Tasks" --msgstr "Oppgaver" -- - #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 - #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 - #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 -diff --git a/po/sr.po b/po/sr.po -index f6c4725..08a921c 100644 ---- a/po/sr.po -+++ b/po/sr.po -@@ -9,8 +9,8 @@ msgstr "" - "Project-Id-Version: evolution-data-server\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" - "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" --"POT-Creation-Date: 2014-03-17 17:45+0000\n" --"PO-Revision-Date: 2014-03-17 23:19+0200\n" -+"POT-Creation-Date: 2014-07-22 04:28+0000\n" -+"PO-Revision-Date: 2014-07-22 11:22+0200\n" - "Last-Translator: Мирослав Николић \n" - "Language-Team: Serbian \n" - "Language: sr\n" -@@ -21,79 +21,79 @@ msgstr "" - "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - "X-Project-Style: gnome\n" - --#: ../addressbook/backends/file/e-book-backend-file.c:117 -+#: ../addressbook/backends/file/e-book-backend-file.c:120 - #, c-format - msgid "Failed to remove file '%s': %s" - msgstr "Нисам успео да уклоним датотеку „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:145 -+#: ../addressbook/backends/file/e-book-backend-file.c:148 - #, c-format - msgid "Failed to make directory %s: %s" - msgstr "Нисам успео да направим директоријум „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:396 -+#: ../addressbook/backends/file/e-book-backend-file.c:419 - #, c-format - msgid "Failed to create hardlink for resource '%s': %s" - msgstr "Нисам успео да направим чврсту везу за извор „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:501 --#: ../addressbook/backends/file/e-book-backend-file.c:1230 -+#: ../addressbook/backends/file/e-book-backend-file.c:524 -+#: ../addressbook/backends/file/e-book-backend-file.c:1253 - msgid "No UID in the contact" - msgstr "Нема КИБ-а у контакту" - --#: ../addressbook/backends/file/e-book-backend-file.c:828 -+#: ../addressbook/backends/file/e-book-backend-file.c:851 - #, c-format - msgid "Conflicting UIDs found in added contacts" - msgstr "Пронађени су сукобљавајући КИБ-ови у додатим контактима" - --#: ../addressbook/backends/file/e-book-backend-file.c:967 -+#: ../addressbook/backends/file/e-book-backend-file.c:990 - msgid "Loading..." - msgstr "Учитавам..." - --#: ../addressbook/backends/file/e-book-backend-file.c:969 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 -+#: ../addressbook/backends/file/e-book-backend-file.c:992 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 - msgid "Searching..." - msgstr "Претражујем..." - --#: ../addressbook/backends/file/e-book-backend-file.c:1258 -+#: ../addressbook/backends/file/e-book-backend-file.c:1281 - #, c-format - msgid "Tried to modify contact '%s' with out of sync revision" - msgstr "Покушах да изменим контакт „%s“ са прегледом који није усклађен" - --#: ../addressbook/backends/file/e-book-backend-file.c:1449 --#: ../addressbook/backends/file/e-book-backend-file.c:1532 -+#: ../addressbook/backends/file/e-book-backend-file.c:1472 -+#: ../addressbook/backends/file/e-book-backend-file.c:1555 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 --#: ../addressbook/libedata-book/e-book-sqlite.c:6706 -+#: ../addressbook/libedata-book/e-book-sqlite.c:6711 - #, c-format - msgid "Contact '%s' not found" - msgstr "Контакт „%s“ није пронађен" - --#: ../addressbook/backends/file/e-book-backend-file.c:1592 --#: ../addressbook/backends/file/e-book-backend-file.c:1673 -+#: ../addressbook/backends/file/e-book-backend-file.c:1615 -+#: ../addressbook/backends/file/e-book-backend-file.c:1696 - #, c-format - msgid "Query '%s' not supported" - msgstr "Упит „%s“ није подржан" - --#: ../addressbook/backends/file/e-book-backend-file.c:1601 --#: ../addressbook/backends/file/e-book-backend-file.c:1682 -+#: ../addressbook/backends/file/e-book-backend-file.c:1624 -+#: ../addressbook/backends/file/e-book-backend-file.c:1705 - #, c-format - msgid "Invalid Query '%s'" - msgstr "Неисправан упит „%s“" - --#: ../addressbook/backends/file/e-book-backend-file.c:1947 -+#: ../addressbook/backends/file/e-book-backend-file.c:1970 - msgid "Requested to delete an unrelated cursor" - msgstr "Затражили сте брисање неодносног курзора" - --#: ../addressbook/backends/file/e-book-backend-file.c:2014 -+#: ../addressbook/backends/file/e-book-backend-file.c:2041 - #, c-format - msgid "Failed to rename old database from '%s' to '%s': %s" - msgstr "Нисам успео да преименујем стару базу података „%s“ у „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 -+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 - #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 - #: ../addressbook/libebook-contacts/e-phone-number.c:56 - #: ../addressbook/libebook/e-book.c:1078 -@@ -108,67 +108,69 @@ msgstr "Нисам успео да преименујем стару базу п - #: ../addressbook/libebook/e-book-client.c:3175 - #: ../addressbook/libebook/e-book-client.c:3393 - #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 - #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 - #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 - #: ../calendar/libecal/e-cal-client.c:3239 - #: ../calendar/libecal/e-cal-client.c:3412 - #: ../calendar/libecal/e-cal-client.c:3676 - #: ../calendar/libecal/e-cal-client.c:3917 --#: ../calendar/libecal/e-cal-client.c:4105 --#: ../calendar/libecal/e-cal-client.c:4297 --#: ../calendar/libecal/e-cal-client.c:4467 --#: ../calendar/libecal/e-cal-client.c:4636 --#: ../calendar/libecal/e-cal-client.c:4839 --#: ../calendar/libecal/e-cal-client.c:4989 --#: ../calendar/libecal/e-cal-client.c:5183 --#: ../calendar/libecal/e-cal-client.c:5336 --#: ../calendar/libecal/e-cal-client.c:5553 --#: ../calendar/libecal/e-cal-client.c:5707 --#: ../calendar/libecal/e-cal-client.c:5933 --#: ../calendar/libecal/e-cal-client.c:6129 --#: ../calendar/libecal/e-cal-client.c:6492 --#: ../calendar/libecal/e-cal-client.c:6706 --#: ../camel/providers/imapx/camel-imapx-command.c:642 -+#: ../calendar/libecal/e-cal-client.c:4107 -+#: ../calendar/libecal/e-cal-client.c:4299 -+#: ../calendar/libecal/e-cal-client.c:4469 -+#: ../calendar/libecal/e-cal-client.c:4638 -+#: ../calendar/libecal/e-cal-client.c:4841 -+#: ../calendar/libecal/e-cal-client.c:4991 -+#: ../calendar/libecal/e-cal-client.c:5185 -+#: ../calendar/libecal/e-cal-client.c:5338 -+#: ../calendar/libecal/e-cal-client.c:5555 -+#: ../calendar/libecal/e-cal-client.c:5709 -+#: ../calendar/libecal/e-cal-client.c:5935 -+#: ../calendar/libecal/e-cal-client.c:6131 -+#: ../calendar/libecal/e-cal-client.c:6494 -+#: ../calendar/libecal/e-cal-client.c:6708 -+#: ../camel/providers/imapx/camel-imapx-command.c:645 -+#: ../camel/providers/imapx/camel-imapx-server.c:4769 -+#: ../camel/providers/imapx/camel-imapx-server.c:4778 - #: ../libedataserver/e-client.c:185 - msgid "Unknown error" - msgstr "Непозната грешка" - - #. Query for new contacts asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:836 -+#: ../addressbook/backends/google/e-book-backend-google.c:828 - msgid "Querying for updated contacts…" - msgstr "Пропитујем за ажурираним контактима…" - - #. Run the query asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:988 -+#: ../addressbook/backends/google/e-book-backend-google.c:1010 - msgid "Querying for updated groups…" - msgstr "Пропитујем за ажурираним групама…" - --#: ../addressbook/backends/google/e-book-backend-google.c:1705 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 -+#: ../addressbook/backends/google/e-book-backend-google.c:1757 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 - msgid "The backend does not support bulk additions" - msgstr "Позадинац не подржава групно додавање" - --#: ../addressbook/backends/google/e-book-backend-google.c:1854 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 -+#: ../addressbook/backends/google/e-book-backend-google.c:1912 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 - msgid "The backend does not support bulk modifications" - msgstr "Позадинац не подржава групно уређивање" - --#: ../addressbook/backends/google/e-book-backend-google.c:2054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 -+#: ../addressbook/backends/google/e-book-backend-google.c:2119 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 - msgid "The backend does not support bulk removals" - msgstr "Позадинац не подржава групно уклањање" - --#: ../addressbook/backends/google/e-book-backend-google.c:2180 -+#: ../addressbook/backends/google/e-book-backend-google.c:2239 - msgid "Loading…" - msgstr "Учитавам…" - - #. System Group: My Contacts --#: ../addressbook/backends/google/e-book-google-utils.c:1618 -+#: ../addressbook/backends/google/e-book-google-utils.c:1631 - #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 -@@ -177,131 +179,131 @@ msgid "Personal" - msgstr "Лично" - - #. System Group: Friends --#: ../addressbook/backends/google/e-book-google-utils.c:1620 -+#: ../addressbook/backends/google/e-book-google-utils.c:1633 - msgid "Friends" - msgstr "Пријатељи" - - #. System Group: Family --#: ../addressbook/backends/google/e-book-google-utils.c:1622 -+#: ../addressbook/backends/google/e-book-google-utils.c:1635 - msgid "Family" - msgstr "Породица" - - #. System Group: Coworkers --#: ../addressbook/backends/google/e-book-google-utils.c:1624 -+#: ../addressbook/backends/google/e-book-google-utils.c:1637 - msgid "Coworkers" - msgstr "Сарадници" - - #. Translators: An error message shown to a user when trying to do an - #. * operation on the LDAP address book which is not connected to the server --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 - msgid "Not connected" - msgstr "Нисам повезан" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 - msgid "Failed to bind using either v3 or v2 binds" - msgstr "Нисам успео да повежем користећи ни в3 ни в2 везице" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 - msgid "Reconnecting to LDAP server..." - msgstr "Поново се повезујем на ЛДАП сервер..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 - msgid "Invalid DN syntax" - msgstr "Неисправна ДН синтакса" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 - #, c-format - msgid "LDAP error 0x%x (%s)" - msgstr "Грешка ЛДАП-а 0x%x (%s)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 - #, c-format - msgid "%s: NULL returned from ldap_first_entry" - msgstr "%s: „NULL“ је враћено са првог уноса лдапа (ldap_first_entry)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 - #, c-format - msgid "%s: Unhandled result type %d returned" - msgstr "%s: Враћена је непозната врста резултата %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 - #, c-format - msgid "%s: Unhandled search result type %d returned" - msgstr "%s: Враћена је непозната врста резултата претраге %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 - msgid "Receiving LDAP search results..." - msgstr "Примам резултате претраге са ЛДАП сервера..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 - msgid "Error performing search" - msgstr "Грешка током претраге" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 - #, c-format - msgid "Downloading contacts (%d)..." - msgstr "Преузимам контакте (%d)..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 - msgid "Adding contact to LDAP server..." - msgstr "Додајем контакт на ЛДАП сервер..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 - msgid "Modifying contact from LDAP server..." - msgstr "Мењам контакт са ЛДАП сервера..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 - msgid "Removing contact from LDAP server..." - msgstr "Уклањам контакт са ЛДАП сервера..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 - #, c-format - msgid "Failed to get the DN for user '%s'" - msgstr "Нисам успео да добавим ДН за корисника „%s“" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 - msgid "Loading Addressbook summary..." - msgstr "Учитавам сажетак адресара..." - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 - #, c-format - msgid "PROPFIND on webdav failed with HTTP status %d (%s)" - msgstr "" - "Није успело налажење својства (PROPFIND) на вебдаву са ХТТП стањем %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 - msgid "No response body in webdav PROPFIND result" - msgstr "Нема тела одговора у резултатима налажења својстава вебдава" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 - #, c-format - msgid "Loading Contacts (%d%%)" - msgstr "Учитавам контакте (%d%%)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 - msgid "Cannot transform SoupURI to string" - msgstr "Не могу да преобратим Соуп адресу у ниску" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 - #, c-format - msgid "Create resource '%s' failed with HTTP status %d (%s)" - msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 - msgid "Contact on server changed -> not modifying" - msgstr "Измењен је контакт на серверу —> не мењам" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 - #, c-format - msgid "Modify contact failed with HTTP status %d (%s)" - msgstr "Измена контакта није успела са ХТТП стањем %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 - #, c-format - msgid "DELETE failed with HTTP status %d" - msgstr "Није успело брисање (DELETE) са ХТТП стањем %d" -@@ -905,8 +907,8 @@ msgstr "Списак имена Гугл разговора" - msgid "Twitter Name List" - msgstr "Списак Твитер имена" - --#: ../addressbook/libebook-contacts/e-contact.c:1635 --#: ../addressbook/libebook/e-destination.c:917 -+#: ../addressbook/libebook-contacts/e-contact.c:1654 -+#: ../addressbook/libebook/e-destination.c:920 - msgid "Unnamed List" - msgstr "Неименовани списак" - -@@ -1002,7 +1004,7 @@ msgstr "" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 --#: ../addressbook/libedata-book/e-book-sqlite.c:5364 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5369 - #, c-format - msgid "Query contained unsupported elements" - msgstr "Упит је садржао неподржане елементе" -@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" - msgstr "Не могу да поређам према пољу које може имати више вредности" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 --#: ../addressbook/libedata-book/e-book-sqlite.c:7376 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7381 - #, c-format - msgid "" - "Tried to step a cursor in reverse, but cursor is already at the beginning of " -@@ -1074,7 +1076,7 @@ msgstr "" - "Покушах да померим курзор уназад, али је он већ на почетку списка контакта" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 --#: ../addressbook/libedata-book/e-book-sqlite.c:7384 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7389 - #, c-format - msgid "" - "Tried to step a cursor forwards, but cursor is already at the end of the " -@@ -1084,7 +1086,6 @@ msgstr "" - - #: ../addressbook/libedata-book/e-book-sqlite.c:524 - #, c-format --#| msgid "Invalid contact field '%d' specified in summary" - msgid "Unsupported contact field '%d' specified in summary" - msgstr "Неподржано поље контакта „%d“ је наведено у сажетку" - -@@ -1096,22 +1097,20 @@ msgstr "" - "Не могу да надоградим базу података контаката из старе базе података са више " - "од једним адресаром. Обришите прво један од уноса у табели „фасцикли“." - --#: ../addressbook/libedata-book/e-book-sqlite.c:5357 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5362 - #, c-format --#| msgid "Invalid query: " - msgid "Invalid query: %s" - msgstr "Неисправан упит: %s" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5532 --#| msgid "Invalid query: " -+#: ../addressbook/libedata-book/e-book-sqlite.c:5537 - msgid "Invalid query for EbSqlCursor" - msgstr "Неисправан упит за ЕбСдбКурзор" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7198 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7203 - msgid "At least one sort field must be specified to use an EbSqlCursor" - msgstr "За коришћење ЕбСкулКурзор-а мора бити наведено барем једно поље ређања" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7216 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7221 - msgid "Cannot sort by a field that is not a string type" - msgstr "Не могу да поређам према пољу које није врста ниске" - -@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " - msgstr "Не могу да уклоним контакте: " - - #: ../addressbook/libedata-book/e-data-book-cursor.c:772 --#| msgid "%s does not support creating remote resources" - msgid "Cursor does not support setting the search expression" - msgstr "Курзор не подржава подешавање израза претраге" - - #: ../addressbook/libedata-book/e-data-book-cursor.c:855 --#| msgid "Store does not support an INBOX" - msgid "Cursor does not support step" - msgstr "Курзор не подржава корак" - - #: ../addressbook/libedata-book/e-data-book-cursor.c:938 --#| msgid "%s does not support authentication" - msgid "Cursor does not support alphabetic indexes" - msgstr "Курзор не подржава азбучне индексе" - -@@ -1322,31 +1318,35 @@ msgstr "Недостаје КИБ извора" - msgid "No such source for UID '%s'" - msgstr "Нема таквог извора за КИБ „%s“" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 - #, c-format - msgid "Server is unreachable (%s)" - msgstr "Сервер је недоступан (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 - #, c-format - msgid "Failed to connect to a server using SSL: %s" - msgstr "Нисам успео да се повежем на сервер користећи ССЛ: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 - #, c-format - msgid "Unexpected HTTP status code %d returned (%s)" - msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 - msgid "CalDAV backend is not loaded yet" - msgstr "Позадинац КолДАВ-а још увек није учитан" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 - msgid "Invalid Redirect URL" - msgstr "Неисправна адреса преусмеравања" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 -+#, c-format -+msgid "Cannot create local cache folder '%s'" -+msgstr "Не могу да направим фасциклу месне оставе „%s“" -+ -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 - #, c-format - msgid "" - "Server is unreachable, calendar is opened in read-only mode.\n" -@@ -1355,32 +1355,27 @@ msgstr "" - "Сервер је недоступан, календар је отворен у режиму само за читање.\n" - "Порука грешке: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 --#, c-format --msgid "Cannot create local cache folder '%s'" --msgstr "Не могу да направим фасциклу месне оставе „%s“" -- --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 - msgid "CalDAV does not support bulk additions" - msgstr "КолДАВ не подржава групно додавање" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 - msgid "CalDAV does not support bulk modifications" - msgstr "КолДАВ не подржава групно уређивање" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 - msgid "CalDAV does not support bulk removals" - msgstr "КолДАВ не подржава групно уклањање" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 - msgid "Calendar doesn't support Free/Busy" - msgstr "Календар не подржава Слободно / Заузето" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 - msgid "Schedule outbox url not found" - msgstr "Није пронађена адреса отпремног сандучета распореда" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 - msgid "Unexpected result in schedule-response" - msgstr "Неочекиван резултат у распореду-одговору" - -@@ -1407,27 +1402,27 @@ msgstr "Не могу да сачувам податак из календара - msgid "Cannot save calendar data" - msgstr "Не могу да сачувам податке календара" - --#: ../calendar/backends/http/e-cal-backend-http.c:486 -+#: ../calendar/backends/http/e-cal-backend-http.c:491 - #, c-format - msgid "Malformed URI: %s" - msgstr "Лоша адреса: %s" - --#: ../calendar/backends/http/e-cal-backend-http.c:577 -+#: ../calendar/backends/http/e-cal-backend-http.c:582 - #, c-format - msgid "Redirected to Invalid URI" - msgstr "Преусмерено на неисправну адресу" - --#: ../calendar/backends/http/e-cal-backend-http.c:620 -+#: ../calendar/backends/http/e-cal-backend-http.c:625 - #, c-format - msgid "Bad file format." - msgstr "Лош облик датотеке." - --#: ../calendar/backends/http/e-cal-backend-http.c:630 -+#: ../calendar/backends/http/e-cal-backend-http.c:635 - #, c-format - msgid "Not a calendar." - msgstr "Није календар." - --#: ../calendar/backends/http/e-cal-backend-http.c:917 -+#: ../calendar/backends/http/e-cal-backend-http.c:925 - #: ../calendar/backends/weather/e-cal-backend-weather.c:536 - msgid "Could not create cache file" - msgstr "Не могу да направим датотеку за оставу" -@@ -2057,7 +2052,7 @@ msgstr "Неисправни аргументи за (системска-озн - msgid "Invalid arguments to (user-tag)" - msgstr "Неисправни аргументи за (корисничка-ознака)" - --#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 -+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 - #, c-format - msgid "Error executing filter search: %s: %s" - msgstr "Грешка у примени филтера за претрагу: %s: %s" -@@ -2103,57 +2098,57 @@ msgstr "Умножавам поруке" - msgid "Quota information not supported for folder '%s'" - msgstr "Обавештење о количини није подржано за фасциклу „%s“" - --#: ../camel/camel-folder.c:2868 -+#: ../camel/camel-folder.c:2862 - #, c-format - msgid "Expunging folder '%s'" - msgstr "Празним фасциклу „%s“" - --#: ../camel/camel-folder.c:2996 -+#: ../camel/camel-folder.c:2990 - #, c-format - msgid "Retrieving message '%s' in %s" - msgstr "Довлачим поруку „%s“ у %s" - --#: ../camel/camel-folder.c:3187 -+#: ../camel/camel-folder.c:3181 - #, c-format - msgid "Retrieving quota information for '%s'" - msgstr "Довлачим обавештење о количини за „%s“" - --#: ../camel/camel-folder.c:3487 -+#: ../camel/camel-folder.c:3478 - #, c-format - msgid "Refreshing folder '%s'" - msgstr "Освежавам фасциклу „%s“" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 -+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 - #, c-format - msgid "(%s) requires a single bool result" - msgstr "(%s) захтева само један логички резултат" - - #. Translators: Each '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:964 -+#: ../camel/camel-folder-search.c:976 - #, c-format - msgid "(%s) not allowed inside %s" - msgstr "(%s) није дозвољено унутар %s" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 -+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 - #, c-format - msgid "(%s) requires a match type string" - msgstr "(%s) захтева ниску са типом поклапања" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1007 -+#: ../camel/camel-folder-search.c:1019 - #, c-format - msgid "(%s) expects an array result" - msgstr "(%s) очекује низ као резултат" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1017 -+#: ../camel/camel-folder-search.c:1029 - #, c-format - msgid "(%s) requires the folder set" - msgstr "(%s) захтева скуп фасцикли" - --#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 -+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 - #, c-format - msgid "" - "Cannot parse search expression: %s:\n" -@@ -2162,7 +2157,7 @@ msgstr "" - "Не могу да анализирам израз претраге: %s:\n" - "%s" - --#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 -+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 - #, c-format - msgid "" - "Error executing search expression: %s:\n" -@@ -2436,11 +2431,6 @@ msgstr "" - msgid "Host lookup '%s' failed: %s" - msgstr "Није успело тражење домаћина „%s“: %s" - --#: ../camel/camel-network-service.c:1009 --#| msgid "No quota information available for folder '%s'" --msgid "No host information available" --msgstr "Нису доступни подаци о домаћину" -- - #: ../camel/camel-offline-folder.c:90 - msgid "Downloading new messages for offline mode" - msgstr "Преузимам нове поруке за рад ван мреже" -@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" - msgstr "Неисправна Гврста регистрована за протокол „%s“" - - #: ../camel/camel-session.c:502 --#: ../camel/providers/imapx/camel-imapx-server.c:4814 -+#: ../camel/providers/imapx/camel-imapx-server.c:4719 - #: ../camel/providers/pop3/camel-pop3-store.c:311 - #: ../camel/providers/pop3/camel-pop3-store.c:757 - #: ../camel/providers/smtp/camel-smtp-transport.c:515 -@@ -2961,21 +2951,20 @@ msgstr "Не могу да направим фасциклу: %s: фасцикл - msgid "Creating folder '%s'" - msgstr "Стварам фасциклу „%s“" - --#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 -+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 - #: ../camel/providers/local/camel-maildir-store.c:321 - #, c-format - msgid "Cannot delete folder: %s: Invalid operation" - msgstr "Не могу да обришем фасциклу: %s: неисправна операција" - --#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 --#: ../camel/providers/local/camel-maildir-store.c:852 -+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 -+#: ../camel/providers/local/camel-maildir-store.c:872 - #, c-format - msgid "Cannot rename folder: %s: Invalid operation" - msgstr "Не могу да преименујем фасциклу: %s: неисправна операција" - - #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 - #, c-format --#| msgid "Data source '%s' is not removable" - msgid "Stream type '%s' is not seekable" - msgstr "Врста тока „%s“ се не може премотати" - -@@ -3042,17 +3031,17 @@ msgstr "Сам _ажурирај ори измени у изворним фас - msgid "Unmatched" - msgstr "Непоклопљено" - --#: ../camel/camel-vee-store.c:442 -+#: ../camel/camel-vee-store.c:436 - #, c-format - msgid "Cannot delete folder: %s: No such folder" - msgstr "Не могу да обришем фасциклу: %s: нема такве фасцикле" - --#: ../camel/camel-vee-store.c:477 -+#: ../camel/camel-vee-store.c:471 - #, c-format - msgid "Cannot rename folder: %s: No such folder" - msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле" - --#: ../camel/camel-vee-store.c:539 -+#: ../camel/camel-vee-store.c:533 - msgid "Enable _Unmatched folder" - msgstr "Укључи _непоклопљене фасцикле" - -@@ -3064,47 +3053,46 @@ msgstr "Не могу да умножим поруке у фасциклу за - msgid "Cannot copy messages to the Junk folder" - msgstr "Не могу да умножим поруке у фасциклу за ђубре" - --#: ../camel/providers/imapx/camel-imapx-folder.c:687 -+#: ../camel/providers/imapx/camel-imapx-folder.c:796 - #, c-format - msgid "No quota information available for folder '%s'" - msgstr "Обавештење о количини није доступно за фасциклу „%s“" - --#: ../camel/providers/imapx/camel-imapx-folder.c:801 --#: ../camel/providers/imapx/camel-imapx-folder.c:894 -+#: ../camel/providers/imapx/camel-imapx-folder.c:936 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1029 - #, c-format - msgid "No destination folder specified" - msgstr "Није наведена фасцикла одредишта" - --#: ../camel/providers/imapx/camel-imapx-folder.c:829 -+#: ../camel/providers/imapx/camel-imapx-folder.c:964 - msgid "Unable to move junk messages" - msgstr "Не могу да преместим непожељне поруке" - --#: ../camel/providers/imapx/camel-imapx-folder.c:922 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1057 - msgid "Unable to move deleted messages" - msgstr "Не могу да преместим обрисане поруке" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1148 --#: ../camel/providers/nntp/camel-nntp-folder.c:758 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1374 -+#: ../camel/providers/nntp/camel-nntp-folder.c:760 - msgid "Apply message _filters to this folder" - msgstr "Примени _филтере поруке над овом фасциклом" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1254 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1485 - #, c-format - msgid "Could not create folder summary for %s" - msgstr "Не могу да направим сажетак фасцикле за „%s“" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1263 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1494 - #, c-format - msgid "Could not create cache for %s: " - msgstr "Не могу да направим оставу за „%s“: " - --#: ../camel/providers/imapx/camel-imapx-folder.c:1448 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1709 - #, c-format --#| msgid "No quota information available for folder '%s'" - msgid "No IMAP mailbox available for folder '%s'" - msgstr "Ниједно ИМАП сандуче није доступно за фасциклу „%s“" - --#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 -+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 - #, c-format - msgid "Source stream returned no data" - msgstr "Одговор изворног тока је без података" -@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" - msgstr "_Ослушкуј за обавештењима о изменама сервера" - - #: ../camel/providers/imapx/camel-imapx-provider.c:49 -+#| msgid "Evolution Data Server" -+msgid "Connection to Server" -+msgstr "Повезивање на сервер" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+msgid "Numbe_r of concurrent connections to use" -+msgstr "_Број тренутних веза за коришћење" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:54 - #: ../camel/providers/nntp/camel-nntp-provider.c:44 - msgid "Folders" - msgstr "Фасцикле" - --#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+#: ../camel/providers/imapx/camel-imapx-provider.c:56 - msgid "_Show only subscribed folders" - msgstr "Прик_ажи само пријављене фасцикле" - --#: ../camel/providers/imapx/camel-imapx-provider.c:54 -+#: ../camel/providers/imapx/camel-imapx-provider.c:59 - msgid "O_verride server-supplied folder namespace" - msgstr "П_ремости облик имена фасцикле које даје сервер" - --#: ../camel/providers/imapx/camel-imapx-provider.c:56 -+#: ../camel/providers/imapx/camel-imapx-provider.c:61 - msgid "Namespace:" - msgstr "Облик имена:" - --#: ../camel/providers/imapx/camel-imapx-provider.c:59 -+#: ../camel/providers/imapx/camel-imapx-provider.c:64 - #: ../camel/providers/local/camel-local-provider.c:39 - #: ../camel/providers/local/camel-local-provider.c:79 - #: ../camel/providers/local/camel-local-provider.c:99 -@@ -3154,262 +3151,263 @@ msgstr "Облик имена:" - msgid "Options" - msgstr "Опције" - --#: ../camel/providers/imapx/camel-imapx-provider.c:61 -+#: ../camel/providers/imapx/camel-imapx-provider.c:66 - #: ../camel/providers/nntp/camel-nntp-provider.c:41 - msgid "Apply _filters to new messages in all folders" - msgstr "Примени филтере на нове поруке у свим _фасциклама" - --#: ../camel/providers/imapx/camel-imapx-provider.c:63 -+#: ../camel/providers/imapx/camel-imapx-provider.c:68 - msgid "_Apply filters to new messages in Inbox on this server" - msgstr "_Примени пропуснике на нове поруке у сандучету овог сервера" - --#: ../camel/providers/imapx/camel-imapx-provider.c:65 -+#: ../camel/providers/imapx/camel-imapx-provider.c:70 - msgid "Check new messages for _Junk contents" - msgstr "Провери да нема _ђубрета међу новим порукама" - --#: ../camel/providers/imapx/camel-imapx-provider.c:67 -+#: ../camel/providers/imapx/camel-imapx-provider.c:72 - msgid "Only check for Junk messages in the IN_BOX folder" - msgstr "Провери да нема ђубрета само у фасцикли САН_ДУЧЕ" - --#: ../camel/providers/imapx/camel-imapx-provider.c:69 -+#: ../camel/providers/imapx/camel-imapx-provider.c:74 - msgid "Automatically synchroni_ze remote mail locally" - msgstr "Сам усклади уд_аљену пошту са локалном" - --#: ../camel/providers/imapx/camel-imapx-provider.c:75 -+#: ../camel/providers/imapx/camel-imapx-provider.c:80 - msgid "Default IMAP port" - msgstr "Основни порт ИМАП-а" - --#: ../camel/providers/imapx/camel-imapx-provider.c:76 -+#: ../camel/providers/imapx/camel-imapx-provider.c:81 - msgid "IMAP over SSL" - msgstr "ИМАП преко ССЛ-а" - --#: ../camel/providers/imapx/camel-imapx-provider.c:83 -+#: ../camel/providers/imapx/camel-imapx-provider.c:88 - msgid "IMAP+" - msgstr "ИМАП+" - --#: ../camel/providers/imapx/camel-imapx-provider.c:85 -+#: ../camel/providers/imapx/camel-imapx-provider.c:90 - msgid "For reading and storing mail on IMAP servers." - msgstr "За читање и смештање поште на ИМАП сервере." - --#: ../camel/providers/imapx/camel-imapx-server.c:844 -+#: ../camel/providers/imapx/camel-imapx-server.c:1009 -+#: ../camel/providers/imapx/camel-imapx-server.c:1016 - #, c-format - msgid "Not authenticated" - msgstr "Непотврђеног идентитета" - --#: ../camel/providers/imapx/camel-imapx-server.c:1773 -+#: ../camel/providers/imapx/camel-imapx-server.c:1713 - msgid "Server disconnected" - msgstr "Веза са сервером је искључена" - --#: ../camel/providers/imapx/camel-imapx-server.c:2255 -+#: ../camel/providers/imapx/camel-imapx-server.c:2205 - msgid "Error writing to cache stream" - msgstr "Грешка приликом уписа у ток оставе" - --#: ../camel/providers/imapx/camel-imapx-server.c:3672 -+#: ../camel/providers/imapx/camel-imapx-server.c:3550 - msgid "Error performing IDLE" - msgstr "Грешка приликом извршавања ИДЛЕ-а" - --#: ../camel/providers/imapx/camel-imapx-server.c:4661 -+#: ../camel/providers/imapx/camel-imapx-server.c:4558 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: %s" - msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:4662 -+#: ../camel/providers/imapx/camel-imapx-server.c:4559 - #: ../camel/providers/smtp/camel-smtp-transport.c:215 - msgid "STARTTLS not supported" - msgstr "СТАРТТЛС није подржано" - --#: ../camel/providers/imapx/camel-imapx-server.c:4722 -+#: ../camel/providers/imapx/camel-imapx-server.c:4619 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: " - msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: " - --#: ../camel/providers/imapx/camel-imapx-server.c:4803 -+#: ../camel/providers/imapx/camel-imapx-server.c:4708 - #, c-format - msgid "IMAP server %s does not support %s authentication" - msgstr "ИМАП сервер „%s“ не подржава „%s“ пријављивање идентитета" - --#: ../camel/providers/imapx/camel-imapx-server.c:4833 -+#: ../camel/providers/imapx/camel-imapx-server.c:4738 - #: ../camel/providers/nntp/camel-nntp-store.c:394 - #: ../camel/providers/nntp/camel-nntp-store.c:531 - msgid "Cannot authenticate without a username" - msgstr "Не могу да потврдим идентитет без корисничког имена" - --#: ../camel/providers/imapx/camel-imapx-server.c:4842 -+#: ../camel/providers/imapx/camel-imapx-server.c:4747 - #: ../camel/providers/nntp/camel-nntp-store.c:540 - #: ../camel/providers/pop3/camel-pop3-store.c:678 - #: ../camel/providers/pop3/camel-pop3-store.c:699 - msgid "Authentication password not available" - msgstr "Лозинка потврђивања идентитета није доступна" - --#: ../camel/providers/imapx/camel-imapx-server.c:5093 -+#: ../camel/providers/imapx/camel-imapx-server.c:4983 -+#: ../camel/providers/imapx/camel-imapx-server.c:5042 - msgid "Error fetching message" - msgstr "Грешка приликом преузимања поруке" - --#: ../camel/providers/imapx/camel-imapx-server.c:5139 -+#: ../camel/providers/imapx/camel-imapx-server.c:5035 - msgid "Failed to close the tmp stream" - msgstr "Нисам успео да затворим привремену датотеку" - --#: ../camel/providers/imapx/camel-imapx-server.c:5168 -+#: ../camel/providers/imapx/camel-imapx-server.c:5071 - msgid "Failed to copy the tmp file" - msgstr "Нисам успео да умножим привремену датотеку" - --#: ../camel/providers/imapx/camel-imapx-server.c:5294 -+#: ../camel/providers/imapx/camel-imapx-server.c:5212 - msgid "Error moving messages" - msgstr "Грешка премештања порука" - --#: ../camel/providers/imapx/camel-imapx-server.c:5298 -+#: ../camel/providers/imapx/camel-imapx-server.c:5216 - msgid "Error copying messages" - msgstr "Грешка умножавања порука" - --#: ../camel/providers/imapx/camel-imapx-server.c:5520 -+#: ../camel/providers/imapx/camel-imapx-server.c:5438 - msgid "Error appending message" - msgstr "Грешка прикачињања порука" - --#: ../camel/providers/imapx/camel-imapx-server.c:5756 -+#: ../camel/providers/imapx/camel-imapx-server.c:5674 - msgid "Error fetching message headers" - msgstr "Грешка преузимања заглавља поруке" - --#: ../camel/providers/imapx/camel-imapx-server.c:5921 -+#: ../camel/providers/imapx/camel-imapx-server.c:5841 - msgid "Error retrieving message" - msgstr "Грешка довлачења поруке" - --#: ../camel/providers/imapx/camel-imapx-server.c:6051 --#: ../camel/providers/imapx/camel-imapx-server.c:6274 -+#: ../camel/providers/imapx/camel-imapx-server.c:5975 -+#: ../camel/providers/imapx/camel-imapx-server.c:6204 - #, c-format - msgid "Fetching summary information for new messages in '%s'" - msgstr "Прикупљам преглед података нових порука у „%s“" - --#: ../camel/providers/imapx/camel-imapx-server.c:6103 -+#: ../camel/providers/imapx/camel-imapx-server.c:6027 - #, c-format - msgid "Scanning for changed messages in '%s'" - msgstr "Прегледам измењене поруке у „%s“" - --#: ../camel/providers/imapx/camel-imapx-server.c:6155 -+#: ../camel/providers/imapx/camel-imapx-server.c:6079 - msgid "Error fetching new messages" - msgstr "Грешка приликом преузимања нових порука" - --#: ../camel/providers/imapx/camel-imapx-server.c:6423 -+#: ../camel/providers/imapx/camel-imapx-server.c:6352 - msgid "Error refreshing folder" - msgstr "Грешка током претраге" - --#: ../camel/providers/imapx/camel-imapx-server.c:6573 -+#: ../camel/providers/imapx/camel-imapx-server.c:6502 - msgid "Error expunging message" - msgstr "Грешка приликом избацивања поруке" - --#: ../camel/providers/imapx/camel-imapx-server.c:6682 --#: ../camel/providers/imapx/camel-imapx-server.c:6707 -+#: ../camel/providers/imapx/camel-imapx-server.c:6617 -+#: ../camel/providers/imapx/camel-imapx-server.c:6642 - msgid "Error fetching folders" - msgstr "Грешка приликом преузимања фасцикле" - --#: ../camel/providers/imapx/camel-imapx-server.c:6787 -+#: ../camel/providers/imapx/camel-imapx-server.c:6722 - msgid "Error creating folder" - msgstr "Грешка приликом стварања фасцикле" - --#: ../camel/providers/imapx/camel-imapx-server.c:6839 -+#: ../camel/providers/imapx/camel-imapx-server.c:6774 - msgid "Error deleting folder" - msgstr "Грешка приликом брисања фасцикле" - --#: ../camel/providers/imapx/camel-imapx-server.c:6906 -+#: ../camel/providers/imapx/camel-imapx-server.c:6850 - msgid "Error renaming folder" - msgstr "Грешка приликом преименовања фасцикле" - --#: ../camel/providers/imapx/camel-imapx-server.c:6993 -+#: ../camel/providers/imapx/camel-imapx-server.c:6924 - msgid "Error subscribing to folder" - msgstr "Грешка приликом пријављивања на фасциклу" - --#: ../camel/providers/imapx/camel-imapx-server.c:7053 --#| msgid "Error subscribing to folder" -+#: ../camel/providers/imapx/camel-imapx-server.c:6990 - msgid "Error unsubscribing from folder" - msgstr "Грешка одјављивања са фасцикле" - --#: ../camel/providers/imapx/camel-imapx-server.c:7109 -+#: ../camel/providers/imapx/camel-imapx-server.c:7052 - msgid "Error retrieving quota information" - msgstr "Грешка довлачења обавештења о количини" - --#: ../camel/providers/imapx/camel-imapx-server.c:7161 -+#: ../camel/providers/imapx/camel-imapx-server.c:7104 - msgid "Search failed" - msgstr "Претрага није успела" - --#: ../camel/providers/imapx/camel-imapx-server.c:7223 -+#: ../camel/providers/imapx/camel-imapx-server.c:7166 - msgid "Error performing NOOP" - msgstr "Грешка приликом обављања НООП-а" - --#: ../camel/providers/imapx/camel-imapx-server.c:7330 -+#: ../camel/providers/imapx/camel-imapx-server.c:7273 - msgid "Error syncing changes" - msgstr "Грешка приликом усклађивања измена" - --#: ../camel/providers/imapx/camel-imapx-server.c:8441 -+#: ../camel/providers/imapx/camel-imapx-server.c:8258 - #, c-format - msgid "Cannot get message with message ID %s: %s" - msgstr "Не могу да набавим поруку са ИБ „%s“: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:8442 -+#: ../camel/providers/imapx/camel-imapx-server.c:8259 - msgid "No such message available." - msgstr "Нема такве поруке." - --#: ../camel/providers/imapx/camel-imapx-server.c:8640 --#: ../camel/providers/imapx/camel-imapx-server.c:8661 -+#: ../camel/providers/imapx/camel-imapx-server.c:8466 -+#: ../camel/providers/imapx/camel-imapx-server.c:8487 - msgid "Cannot create spool file: " - msgstr "Не могу да направим датотеку припреме: " - --#: ../camel/providers/imapx/camel-imapx-server.c:9403 -+#: ../camel/providers/imapx/camel-imapx-server.c:9228 - msgid "IMAP server does not support quotas" - msgstr "ИМАП сервер не подржава количине" - - #. create a dummy "." parent inbox, use to scan, then put back at the top level --#: ../camel/providers/imapx/camel-imapx-store.c:207 -+#: ../camel/providers/imapx/camel-imapx-store.c:223 - #: ../camel/providers/local/camel-maildir-folder.c:482 - #: ../camel/providers/local/camel-maildir-store.c:322 --#: ../camel/providers/local/camel-maildir-store.c:764 --#: ../camel/providers/local/camel-maildir-store.c:770 --#: ../camel/providers/local/camel-maildir-store.c:853 -+#: ../camel/providers/local/camel-maildir-store.c:784 -+#: ../camel/providers/local/camel-maildir-store.c:790 -+#: ../camel/providers/local/camel-maildir-store.c:873 - #: ../camel/providers/local/camel-spool-store.c:393 - msgid "Inbox" - msgstr "Сандуче" - --#: ../camel/providers/imapx/camel-imapx-store.c:823 -+#: ../camel/providers/imapx/camel-imapx-store.c:758 - #, c-format - msgid "IMAP server %s" - msgstr "ИМАП сервер „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:826 -+#: ../camel/providers/imapx/camel-imapx-store.c:761 - #, c-format - msgid "IMAP service for %s on %s" - msgstr "ИМАП сервис за „%s“ на „%s" - --#: ../camel/providers/imapx/camel-imapx-store.c:1035 -+#: ../camel/providers/imapx/camel-imapx-store.c:836 - #: ../camel/providers/nntp/camel-nntp-provider.c:93 - #: ../camel/providers/pop3/camel-pop3-provider.c:81 - msgid "Password" - msgstr "Лозинка" - --#: ../camel/providers/imapx/camel-imapx-store.c:1037 -+#: ../camel/providers/imapx/camel-imapx-store.c:838 - msgid "This option will connect to the IMAP server using a plaintext password." - msgstr "" - "Ова опција ће повезати на ИМАП сервер коришћењем лозинке у обичном тексту." - --#: ../camel/providers/imapx/camel-imapx-store.c:1112 -+#: ../camel/providers/imapx/camel-imapx-store.c:913 - #, c-format - msgid "No such folder %s" - msgstr "Нема такве фасцикле „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:1507 --#, c-format, -+#: ../camel/providers/imapx/camel-imapx-store.c:1324 -+#, c-format - msgid "No IMAP namespace for folder path '%s'" - msgstr "Нема ИМАП простора назива за путању фасцикле „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:1656 -+#: ../camel/providers/imapx/camel-imapx-store.c:1472 - #, c-format - msgid "Retrieving folder list for %s" - msgstr "Довлачим списак фасцикле за „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:2094 -+#: ../camel/providers/imapx/camel-imapx-store.c:1924 - #, c-format - msgid "" - "The folder name \"%s\" is invalid because it contains the character \"%c\"" - msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“" - --#: ../camel/providers/imapx/camel-imapx-store.c:2615 -+#: ../camel/providers/imapx/camel-imapx-store.c:2689 - #: ../camel/providers/nntp/camel-nntp-store.c:1250 - #: ../camel/providers/pop3/camel-pop3-folder.c:450 - #: ../camel/providers/pop3/camel-pop3-folder.c:593 -@@ -3424,27 +3422,27 @@ msgstr "Име фасцикле „%s“ није исправно јер сад - msgid "You must be working online to complete this operation" - msgstr "Морате да будете на мрежи да бисте завршили ову операцију" - --#: ../camel/providers/local/camel-local-folder.c:192 -+#: ../camel/providers/local/camel-local-folder.c:195 - #, c-format - msgid "~%s (%s)" - msgstr "~%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:202 --#: ../camel/providers/local/camel-local-folder.c:211 -+#: ../camel/providers/local/camel-local-folder.c:205 -+#: ../camel/providers/local/camel-local-folder.c:214 - #, c-format - msgid "mailbox: %s (%s)" - msgstr "поштанско сандуче:%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:220 -+#: ../camel/providers/local/camel-local-folder.c:223 - #, c-format - msgid "%s (%s)" - msgstr "%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:497 -+#: ../camel/providers/local/camel-local-folder.c:500 - msgid "_Index message body data" - msgstr "_Попиши садржаје порука" - --#: ../camel/providers/local/camel-local-folder.c:725 -+#: ../camel/providers/local/camel-local-folder.c:730 - #, c-format - msgid "" - "Cannot get message %s from folder %s\n" -@@ -3595,7 +3593,7 @@ msgstr "Не могу да пребацим поруку у одредишну - - #: ../camel/providers/local/camel-maildir-store.c:130 - #: ../camel/providers/local/camel-maildir-store.c:149 --#: ../camel/providers/local/camel-maildir-store.c:861 -+#: ../camel/providers/local/camel-maildir-store.c:881 - #, c-format - msgid "Folder %s already exists" - msgstr "Фасцикла „%s“ већ постоји" -@@ -3638,8 +3636,8 @@ msgstr "Не могу да обришем фасциклу „%s“: %s" - msgid "not a maildir directory" - msgstr "није директоријум поште" - --#: ../camel/providers/local/camel-maildir-store.c:636 --#: ../camel/providers/local/camel-maildir-store.c:1075 -+#: ../camel/providers/local/camel-maildir-store.c:637 -+#: ../camel/providers/local/camel-maildir-store.c:1095 - #: ../camel/providers/local/camel-spool-store.c:212 - #: ../camel/providers/local/camel-spool-store.c:231 - #, c-format -@@ -3660,10 +3658,10 @@ msgstr "Проверавам целовитост фасцикле" - msgid "Checking for new messages" - msgstr "Вршим проверу за новим порукама" - --#: ../camel/providers/local/camel-maildir-summary.c:784 -+#: ../camel/providers/local/camel-maildir-summary.c:791 - #: ../camel/providers/local/camel-mbox-summary.c:466 --#: ../camel/providers/local/camel-mbox-summary.c:682 --#: ../camel/providers/local/camel-mbox-summary.c:831 -+#: ../camel/providers/local/camel-mbox-summary.c:687 -+#: ../camel/providers/local/camel-mbox-summary.c:836 - #: ../camel/providers/local/camel-spool-summary.c:139 - msgid "Storing folder" - msgstr "Смештам фасциклу" -@@ -3761,48 +3759,48 @@ msgstr "Не могу да преименујем „%s“ у „%s“: %s" - msgid "Could not open folder: %s: %s" - msgstr "Не могу да отворим фасциклу: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:606 -+#: ../camel/providers/local/camel-mbox-summary.c:611 - #, c-format - msgid "Cannot check folder: %s: %s" - msgstr "Не могу да проверим фасциклу: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:695 --#: ../camel/providers/local/camel-mbox-summary.c:840 -+#: ../camel/providers/local/camel-mbox-summary.c:700 -+#: ../camel/providers/local/camel-mbox-summary.c:845 - #: ../camel/providers/local/camel-spool-summary.c:146 - #, c-format - msgid "Could not open file: %s: %s" - msgstr "Не могу да отворим датотеку: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:710 -+#: ../camel/providers/local/camel-mbox-summary.c:715 - #: ../camel/providers/local/camel-spool-summary.c:161 - #, c-format - msgid "Cannot open temporary mailbox: %s" - msgstr "Не могу да отворим привремено поштанско сандуче: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:727 --#: ../camel/providers/local/camel-mbox-summary.c:962 -+#: ../camel/providers/local/camel-mbox-summary.c:732 -+#: ../camel/providers/local/camel-mbox-summary.c:967 - #, c-format - msgid "Could not close source folder %s: %s" - msgstr "Не могу да затворим изворну фасциклу „%s“: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:740 -+#: ../camel/providers/local/camel-mbox-summary.c:745 - #, c-format - msgid "Could not close temporary folder: %s" - msgstr "Не могу да затворим привремену фасциклу: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:759 -+#: ../camel/providers/local/camel-mbox-summary.c:764 - #, c-format - msgid "Could not rename folder: %s" - msgstr "Не могу да преименујем фасциклу: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:854 --#: ../camel/providers/local/camel-mbox-summary.c:1127 -+#: ../camel/providers/local/camel-mbox-summary.c:859 -+#: ../camel/providers/local/camel-mbox-summary.c:1132 - #, c-format - msgid "Could not store folder: %s" - msgstr "Не могу да сачувам фасциклу: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:893 --#: ../camel/providers/local/camel-mbox-summary.c:1167 -+#: ../camel/providers/local/camel-mbox-summary.c:898 -+#: ../camel/providers/local/camel-mbox-summary.c:1172 - #, c-format - msgid "" - "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " -@@ -3811,25 +3809,25 @@ msgstr "" - "МБОКС датотека је оштећена, поправите је. (Очекивано је „Из реда“, али нисам " - "добио.)" - --#: ../camel/providers/local/camel-mbox-summary.c:903 --#: ../camel/providers/local/camel-mbox-summary.c:1179 -+#: ../camel/providers/local/camel-mbox-summary.c:908 -+#: ../camel/providers/local/camel-mbox-summary.c:1184 - #, c-format - msgid "Summary and folder mismatch, even after a sync" - msgstr "Неслагање прегледа и фасцикле, чак и након усклађивања" - --#: ../camel/providers/local/camel-mbox-summary.c:1072 -+#: ../camel/providers/local/camel-mbox-summary.c:1077 - #: ../camel/providers/local/camel-spool-summary.c:356 - #, c-format - msgid "Unknown error: %s" - msgstr "Непозната грешка: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1237 --#: ../camel/providers/local/camel-mbox-summary.c:1267 -+#: ../camel/providers/local/camel-mbox-summary.c:1242 -+#: ../camel/providers/local/camel-mbox-summary.c:1272 - #, c-format - msgid "Writing to temporary mailbox failed: %s" - msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1256 -+#: ../camel/providers/local/camel-mbox-summary.c:1261 - #, c-format - msgid "Writing to temporary mailbox failed: %s: %s" - msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s: %s" -@@ -3950,21 +3948,21 @@ msgstr "" - "Фасцикла је можда оштећена, умножите сачувано у „%s“" - - #: ../camel/providers/nntp/camel-nntp-folder.c:222 --#: ../camel/providers/nntp/camel-nntp-folder.c:588 -+#: ../camel/providers/nntp/camel-nntp-folder.c:590 - #, c-format - msgid "Internal error: UID in invalid format: %s" - msgstr "Унутрашња грешка: КИБ у неисправном облику: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:291 --#: ../camel/providers/nntp/camel-nntp-folder.c:296 -+#: ../camel/providers/nntp/camel-nntp-folder.c:292 -+#: ../camel/providers/nntp/camel-nntp-folder.c:297 - #: ../camel/providers/pop3/camel-pop3-folder.c:546 - #: ../camel/providers/pop3/camel-pop3-folder.c:945 - #, c-format - msgid "Cannot get message %s: %s" - msgstr "Не могу да добавим поруку „%s“: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:303 --#: ../camel/providers/nntp/camel-nntp-folder.c:622 -+#: ../camel/providers/nntp/camel-nntp-folder.c:304 -+#: ../camel/providers/nntp/camel-nntp-folder.c:624 - #: ../camel/providers/pop3/camel-pop3-folder.c:476 - #: ../camel/providers/pop3/camel-pop3-folder.c:536 - #: ../camel/providers/pop3/camel-pop3-folder.c:555 -@@ -3978,18 +3976,17 @@ msgstr "Не могу да добавим поруку „%s“: " - msgid "Posting failed: %s" - msgstr "Неуспела пошиљка: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:501 -+#: ../camel/providers/nntp/camel-nntp-folder.c:503 - msgid "Posting failed: " - msgstr "Неуспела пошиљка: " - --#: ../camel/providers/nntp/camel-nntp-folder.c:611 -+#: ../camel/providers/nntp/camel-nntp-folder.c:613 - #, c-format - msgid "This message is not currently available" - msgstr "Ова порука није тренутно доступна" - --#: ../camel/providers/nntp/camel-nntp-folder.c:720 -+#: ../camel/providers/nntp/camel-nntp-folder.c:722 - #, c-format --#| msgid "You cannot copy messages from a NNTP folder!" - msgid "You cannot copy messages from a NNTP folder" - msgstr "Не можете да умножите поруке из ННТП фасцикле" - -@@ -4652,7 +4649,6 @@ msgstr "" - "Јединице за подсетник на рођендане или годишњице, „минути“, „сати“ или „дани“" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 --#| msgid "Proxy type to use" - msgid "(Deprecated) Proxy type to use" - msgstr "(Застарело) Врста посредника за коришћење" - -@@ -4667,69 +4663,57 @@ msgstr "" - "Еволуције. Видите АПИ документацију „ESourceProxy“ за појединости." - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 --#| msgid "Whether to use http-proxy" - msgid "(Deprecated) Whether to use http-proxy" - msgstr "(Застарело) Да ли да користи хттп-посредника" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 --#| msgid "Whether proxy server requires authentication" - msgid "(Deprecated) Whether proxy server requires authentication" - msgstr "(Застарело) Да ли сервер посредник захтева потврду идентитета" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 --#| msgid "Host name for HTTP requests" - msgid "(Deprecated) Host name for HTTP requests" - msgstr "(Застарело) Назив домаћина за ХТТП захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 --#| msgid "Port number for HTTP requests" - msgid "(Deprecated) Port number for HTTP requests" - msgstr "(Застарело) Број прикључника за ХТТП захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 --#| msgid "Proxy authentication user name" - msgid "(Deprecated) Proxy authentication user name" - msgstr "(Застарело) Корисничко име потврде идентитета посредника" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 --#| msgid "Proxy authentication password" - msgid "(Deprecated) Proxy authentication password" - msgstr "(Застарело) Лозинка потврде идентитета посредника" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 --#| msgid "List of hosts to connect to without proxy" - msgid "(Deprecated) List of hosts to connect to without proxy" - msgstr "(Застарело) Списак домаћина за повезивање без посредника" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 --#| msgid "Host name for HTTPS requests" - msgid "(Deprecated) Host name for HTTPS requests" - msgstr "(Застарело) Назив домаћина за ХТТПС захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 --#| msgid "Port number for HTTPS requests" - msgid "(Deprecated) Port number for HTTPS requests" - msgstr "(Застарело) Број прикључника за ХТТПС захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 --#| msgid "Host name for SOCKS requests" - msgid "(Deprecated) Host name for SOCKS requests" - msgstr "(Застарело) Назив домаћина за СОЦКС захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 --#| msgid "Port number for SOCKS requests" - msgid "(Deprecated) Port number for SOCKS requests" - msgstr "(Застарело) Број прикључника за СОЦКС захтеве" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 --#| msgid "Automatic proxy configuration URL" - msgid "(Deprecated) Automatic proxy configuration URL" - msgstr "(Застарело) Адреса за самоподешавање посредника" - - #: ../libebackend/e-authentication-mediator.c:204 - #: ../libebackend/e-authentication-mediator.c:215 --#: ../libebackend/e-authentication-mediator.c:861 --#: ../libebackend/e-authentication-mediator.c:1198 -+#: ../libebackend/e-authentication-mediator.c:860 -+#: ../libebackend/e-authentication-mediator.c:1197 - msgid "Bus name vanished (client terminated?)" - msgstr "Назив сабирнице је нестао (клијент је окончан?)" - -@@ -4739,8 +4723,8 @@ msgstr "Нема одговора са клијента" - - #: ../libebackend/e-authentication-mediator.c:333 - #: ../libebackend/e-authentication-mediator.c:344 --#: ../libebackend/e-authentication-mediator.c:855 --#: ../libebackend/e-authentication-mediator.c:1192 -+#: ../libebackend/e-authentication-mediator.c:854 -+#: ../libebackend/e-authentication-mediator.c:1191 - msgid "Client cancelled the operation" - msgstr "Клијент је отказао сте операцију" - -@@ -4748,11 +4732,11 @@ msgstr "Клијент је отказао сте операцију" - msgid "Client reports password was rejected" - msgstr "Лозинка извештаја клијента је одбијена" - --#: ../libebackend/e-authentication-session.c:554 -+#: ../libebackend/e-authentication-session.c:539 - msgid "Add this password to your keyring" - msgstr "Додајте ову лозинку у ваш привезак" - --#: ../libebackend/e-authentication-session.c:664 -+#: ../libebackend/e-authentication-session.c:649 - msgid "Password was incorrect" - msgstr "Лозинка је неисправна" - -@@ -4761,12 +4745,12 @@ msgstr "Лозинка је неисправна" - msgid "%s does not support authentication" - msgstr "„%s“ не подржава потврђивање идентитета" - --#: ../libebackend/e-collection-backend.c:900 -+#: ../libebackend/e-collection-backend.c:901 - #, c-format - msgid "%s does not support creating remote resources" - msgstr "„%s“ не подржава стварање удаљених изворишта" - --#: ../libebackend/e-collection-backend.c:959 -+#: ../libebackend/e-collection-backend.c:960 - #, c-format - msgid "%s does not support deleting remote resources" - msgstr "„%s“ не подржава брисање удаљених изворишта" -@@ -4781,40 +4765,40 @@ msgstr "Нема погона позадинца за тастер мешања - msgid "Data source is missing a [%s] group" - msgstr "Извору података недостаје [%s] група" - --#: ../libebackend/e-server-side-source.c:1020 --#: ../libedataserver/e-source.c:1348 -+#: ../libebackend/e-server-side-source.c:1022 -+#: ../libedataserver/e-source.c:1394 - #, c-format - msgid "Data source '%s' does not support creating remote resources" - msgstr "Извор података „%s“ не подржава стварање удаљених изворишта" - --#: ../libebackend/e-server-side-source.c:1034 -+#: ../libebackend/e-server-side-source.c:1036 - #, c-format - msgid "" - "Data source '%s' has no collection backend to create the remote resource" - msgstr "" - "Извор података „%s“ нема позадинца збирке да би направио удаљено извориште" - --#: ../libebackend/e-server-side-source.c:1062 --#: ../libedataserver/e-source.c:1461 -+#: ../libebackend/e-server-side-source.c:1064 -+#: ../libedataserver/e-source.c:1507 - #, c-format - msgid "Data source '%s' does not support deleting remote resources" - msgstr "Извор података „%s“ не подржава брисање удаљених изворишта" - --#: ../libebackend/e-server-side-source.c:1076 -+#: ../libebackend/e-server-side-source.c:1078 - #, c-format - msgid "" - "Data source '%s' has no collection backend to delete the remote resource" - msgstr "" - "Извор података „%s“ нема позадинца збирке да би обрисао удаљено извориште" - --#: ../libebackend/e-server-side-source.c:1107 --#: ../libedataserver/e-source.c:1557 --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 -+#: ../libebackend/e-server-side-source.c:1109 -+#: ../libedataserver/e-source.c:1603 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 - #, c-format - msgid "Data source '%s' does not support OAuth 2.0 authentication" - msgstr "Извор података „%s“ не подржава ОАут 2.0 потврђивање идентитета" - --#: ../libebackend/e-server-side-source.c:1452 -+#: ../libebackend/e-server-side-source.c:1456 - #, c-format - msgid "File must have a '.source' extension" - msgstr "Датотека мора да има наставак „.source“" -@@ -5018,37 +5002,36 @@ msgstr "Унесите лозинку за списак задужења „%s - msgid "Please enter the password for account \"%s\"." - msgstr "Унесите лозинку за налог „%s“." - --#: ../libedataserver/e-source.c:765 -+#: ../libedataserver/e-source.c:768 - #, c-format - msgid "Source file is missing a [%s] group" - msgstr "Изворној датотеци недостаје [%s] група" - --#: ../libedataserver/e-source.c:1128 -+#: ../libedataserver/e-source.c:1174 - #, c-format - msgid "Data source '%s' is not removable" - msgstr "Извор података „%s“ се не може уклонити" - --#: ../libedataserver/e-source.c:1251 -+#: ../libedataserver/e-source.c:1297 - #, c-format - msgid "Data source '%s' is not writable" - msgstr "Извор подтака „%s“ није уписив" - --#: ../libedataserver/e-source.c:1864 -+#: ../libedataserver/e-source.c:1910 - msgid "Unnamed" - msgstr "Неименован" - --#: ../libedataserver/e-source-mail-signature.c:486 -+#: ../libedataserver/e-source-mail-signature.c:485 - #, c-format - msgid "Signature script must be a local file" - msgstr "Скрипта потписа мора да буде месна датотека" - - #: ../libedataserver/e-source-proxy.c:1646 - #, c-format --#| msgid "Data source '%s' does not support creating remote resources" - msgid "Source '%s' does not support proxy lookups" - msgstr "Извор „%s“ не подржава тражења посредника" - --#: ../libedataserver/e-source-webdav.c:1551 -+#: ../libedataserver/e-source-webdav.c:1555 - #, c-format - msgid "" - "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " -@@ -5057,7 +5040,7 @@ msgstr "" - "ССЛ уверење за домаћина „%s“, које користи адресар „%s“, није од поверења. " - "Да ли желите да га прихватите?" - --#: ../libedataserver/e-source-webdav.c:1560 -+#: ../libedataserver/e-source-webdav.c:1564 - #, c-format - msgid "" - "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " -@@ -5066,7 +5049,7 @@ msgstr "" - "ССЛ уверење за домаћина „%s“, које користи календар „%s“, није од поверења. " - "Да ли желите да га прихватите?" - --#: ../libedataserver/e-source-webdav.c:1569 -+#: ../libedataserver/e-source-webdav.c:1573 - #, c-format - msgid "" - "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " -@@ -5075,7 +5058,7 @@ msgstr "" - "ССЛ уверење за домаћина „%s“, које користе белешке „%s“, није од поверења. " - "Да ли желите да га прихватите?" - --#: ../libedataserver/e-source-webdav.c:1578 -+#: ../libedataserver/e-source-webdav.c:1582 - #, c-format - msgid "" - "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " -@@ -5269,7 +5252,7 @@ msgstr "Нисам успео да пронађем елемент налога" - msgid "Failed to find ASUrl and OABUrl in autodiscover response" - msgstr "Нисам успео да пронађем АСадресу и ОАБадресу у одговору самооткривања" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 - #, c-format - msgid "" - "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " -@@ -5278,18 +5261,23 @@ msgstr "" - "Не могу да пронађем одговарајући налог на услузи „орг.гном.Налози на мрежи“ " - "са које бих добио приступ за „%s“." - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 - #, c-format - msgid "Failed to obtain an access token for '%s': " - msgstr "Нисам успео да добијем приступ за „%s“: " - --#: ../modules/google-backend/module-google-backend.c:191 -+#: ../modules/google-backend/module-google-backend.c:195 - #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 - #: ../modules/yahoo-backend/module-yahoo-backend.c:199 - msgid "Calendar" - msgstr "Календар" - --#: ../modules/google-backend/module-google-backend.c:260 -+#: ../modules/google-backend/module-google-backend.c:268 -+#: ../modules/yahoo-backend/module-yahoo-backend.c:226 -+msgid "Tasks" -+msgstr "Задужења" -+ -+#: ../modules/google-backend/module-google-backend.c:321 - #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 - #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 - msgid "Contacts" -@@ -5388,7 +5376,7 @@ msgstr "Пошта" - msgid "Integrate your mailboxes" - msgstr "Обједините ваше сандучиће" - --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 - #, c-format - msgid "" - "Cannot find a corresponding account service in the accounts database from " -@@ -5400,7 +5388,6 @@ msgstr "" - #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 - #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 - #, c-format --#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" - msgid "" - "Expected status 200 when requesting your identity, instead got status %d (%s)" - msgstr "" -@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " - msgstr "Грешка обраде одговора као ЈСОН:" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'email' in JSON data" - msgstr "Нисам нашао „email“ у ЈСОН подацима" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'id' in JSON data" - msgstr "Нисам нашао „id“ у ЈСОН подацима" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'emails.account' in JSON data" - msgstr "Нисам нашао „emails.account“ у ЈСОН подацима" - - #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 --#| msgid "Wants HTML Mail" - msgid "Windows Live Mail" - msgstr "Пошта Виндоуза уживо" - -@@ -5440,10 +5423,6 @@ msgstr "Јаху! календар" - msgid "Yahoo! Mail" - msgstr "Јаху! пошта" - --#: ../modules/yahoo-backend/module-yahoo-backend.c:226 --msgid "Tasks" --msgstr "Задужења" -- - #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 - #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 - #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 -@@ -5500,6 +5479,10 @@ msgstr "Не пресељавај корисничке податке из пр - msgid "_Dismiss" - msgstr "_Занемари" - -+#~| msgid "No quota information available for folder '%s'" -+#~ msgid "No host information available" -+#~ msgstr "Нису доступни подаци о домаћину" -+ - #~ msgid "You may not import keys with this cipher" - #~ msgstr "Можда нећете моћи да увезете кључеве са овим алгоритмом" - -diff --git a/po/sr@latin.po b/po/sr@latin.po -index c238a0e..2b70068 100644 ---- a/po/sr@latin.po -+++ b/po/sr@latin.po -@@ -9,8 +9,8 @@ msgstr "" - "Project-Id-Version: evolution-data-server\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" - "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" --"POT-Creation-Date: 2014-03-17 17:45+0000\n" --"PO-Revision-Date: 2014-03-17 23:19+0200\n" -+"POT-Creation-Date: 2014-07-22 04:28+0000\n" -+"PO-Revision-Date: 2014-07-22 11:22+0200\n" - "Last-Translator: Miroslav Nikolić \n" - "Language-Team: Serbian \n" - "Language: sr\n" -@@ -21,79 +21,79 @@ msgstr "" - "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - "X-Project-Style: gnome\n" - --#: ../addressbook/backends/file/e-book-backend-file.c:117 -+#: ../addressbook/backends/file/e-book-backend-file.c:120 - #, c-format - msgid "Failed to remove file '%s': %s" - msgstr "Nisam uspeo da uklonim datoteku „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:145 -+#: ../addressbook/backends/file/e-book-backend-file.c:148 - #, c-format - msgid "Failed to make directory %s: %s" - msgstr "Nisam uspeo da napravim direktorijum „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:396 -+#: ../addressbook/backends/file/e-book-backend-file.c:419 - #, c-format - msgid "Failed to create hardlink for resource '%s': %s" - msgstr "Nisam uspeo da napravim čvrstu vezu za izvor „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file.c:501 --#: ../addressbook/backends/file/e-book-backend-file.c:1230 -+#: ../addressbook/backends/file/e-book-backend-file.c:524 -+#: ../addressbook/backends/file/e-book-backend-file.c:1253 - msgid "No UID in the contact" - msgstr "Nema KIB-a u kontaktu" - --#: ../addressbook/backends/file/e-book-backend-file.c:828 -+#: ../addressbook/backends/file/e-book-backend-file.c:851 - #, c-format - msgid "Conflicting UIDs found in added contacts" - msgstr "Pronađeni su sukobljavajući KIB-ovi u dodatim kontaktima" - --#: ../addressbook/backends/file/e-book-backend-file.c:967 -+#: ../addressbook/backends/file/e-book-backend-file.c:990 - msgid "Loading..." - msgstr "Učitavam..." - --#: ../addressbook/backends/file/e-book-backend-file.c:969 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 -+#: ../addressbook/backends/file/e-book-backend-file.c:992 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 - msgid "Searching..." - msgstr "Pretražujem..." - --#: ../addressbook/backends/file/e-book-backend-file.c:1258 -+#: ../addressbook/backends/file/e-book-backend-file.c:1281 - #, c-format - msgid "Tried to modify contact '%s' with out of sync revision" - msgstr "Pokušah da izmenim kontakt „%s“ sa pregledom koji nije usklađen" - --#: ../addressbook/backends/file/e-book-backend-file.c:1449 --#: ../addressbook/backends/file/e-book-backend-file.c:1532 -+#: ../addressbook/backends/file/e-book-backend-file.c:1472 -+#: ../addressbook/backends/file/e-book-backend-file.c:1555 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 --#: ../addressbook/libedata-book/e-book-sqlite.c:6706 -+#: ../addressbook/libedata-book/e-book-sqlite.c:6711 - #, c-format - msgid "Contact '%s' not found" - msgstr "Kontakt „%s“ nije pronađen" - --#: ../addressbook/backends/file/e-book-backend-file.c:1592 --#: ../addressbook/backends/file/e-book-backend-file.c:1673 -+#: ../addressbook/backends/file/e-book-backend-file.c:1615 -+#: ../addressbook/backends/file/e-book-backend-file.c:1696 - #, c-format - msgid "Query '%s' not supported" - msgstr "Upit „%s“ nije podržan" - --#: ../addressbook/backends/file/e-book-backend-file.c:1601 --#: ../addressbook/backends/file/e-book-backend-file.c:1682 -+#: ../addressbook/backends/file/e-book-backend-file.c:1624 -+#: ../addressbook/backends/file/e-book-backend-file.c:1705 - #, c-format - msgid "Invalid Query '%s'" - msgstr "Neispravan upit „%s“" - --#: ../addressbook/backends/file/e-book-backend-file.c:1947 -+#: ../addressbook/backends/file/e-book-backend-file.c:1970 - msgid "Requested to delete an unrelated cursor" - msgstr "Zatražili ste brisanje neodnosnog kurzora" - --#: ../addressbook/backends/file/e-book-backend-file.c:2014 -+#: ../addressbook/backends/file/e-book-backend-file.c:2041 - #, c-format - msgid "Failed to rename old database from '%s' to '%s': %s" - msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" - --#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 -+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 - #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 - #: ../addressbook/libebook-contacts/e-phone-number.c:56 - #: ../addressbook/libebook/e-book.c:1078 -@@ -108,67 +108,69 @@ msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" - #: ../addressbook/libebook/e-book-client.c:3175 - #: ../addressbook/libebook/e-book-client.c:3393 - #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 - #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 - #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 - #: ../calendar/libecal/e-cal-client.c:3239 - #: ../calendar/libecal/e-cal-client.c:3412 - #: ../calendar/libecal/e-cal-client.c:3676 - #: ../calendar/libecal/e-cal-client.c:3917 --#: ../calendar/libecal/e-cal-client.c:4105 --#: ../calendar/libecal/e-cal-client.c:4297 --#: ../calendar/libecal/e-cal-client.c:4467 --#: ../calendar/libecal/e-cal-client.c:4636 --#: ../calendar/libecal/e-cal-client.c:4839 --#: ../calendar/libecal/e-cal-client.c:4989 --#: ../calendar/libecal/e-cal-client.c:5183 --#: ../calendar/libecal/e-cal-client.c:5336 --#: ../calendar/libecal/e-cal-client.c:5553 --#: ../calendar/libecal/e-cal-client.c:5707 --#: ../calendar/libecal/e-cal-client.c:5933 --#: ../calendar/libecal/e-cal-client.c:6129 --#: ../calendar/libecal/e-cal-client.c:6492 --#: ../calendar/libecal/e-cal-client.c:6706 --#: ../camel/providers/imapx/camel-imapx-command.c:642 -+#: ../calendar/libecal/e-cal-client.c:4107 -+#: ../calendar/libecal/e-cal-client.c:4299 -+#: ../calendar/libecal/e-cal-client.c:4469 -+#: ../calendar/libecal/e-cal-client.c:4638 -+#: ../calendar/libecal/e-cal-client.c:4841 -+#: ../calendar/libecal/e-cal-client.c:4991 -+#: ../calendar/libecal/e-cal-client.c:5185 -+#: ../calendar/libecal/e-cal-client.c:5338 -+#: ../calendar/libecal/e-cal-client.c:5555 -+#: ../calendar/libecal/e-cal-client.c:5709 -+#: ../calendar/libecal/e-cal-client.c:5935 -+#: ../calendar/libecal/e-cal-client.c:6131 -+#: ../calendar/libecal/e-cal-client.c:6494 -+#: ../calendar/libecal/e-cal-client.c:6708 -+#: ../camel/providers/imapx/camel-imapx-command.c:645 -+#: ../camel/providers/imapx/camel-imapx-server.c:4769 -+#: ../camel/providers/imapx/camel-imapx-server.c:4778 - #: ../libedataserver/e-client.c:185 - msgid "Unknown error" - msgstr "Nepoznata greška" - - #. Query for new contacts asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:836 -+#: ../addressbook/backends/google/e-book-backend-google.c:828 - msgid "Querying for updated contacts…" - msgstr "Propitujem za ažuriranim kontaktima…" - - #. Run the query asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:988 -+#: ../addressbook/backends/google/e-book-backend-google.c:1010 - msgid "Querying for updated groups…" - msgstr "Propitujem za ažuriranim grupama…" - --#: ../addressbook/backends/google/e-book-backend-google.c:1705 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 -+#: ../addressbook/backends/google/e-book-backend-google.c:1757 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 - msgid "The backend does not support bulk additions" - msgstr "Pozadinac ne podržava grupno dodavanje" - --#: ../addressbook/backends/google/e-book-backend-google.c:1854 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 -+#: ../addressbook/backends/google/e-book-backend-google.c:1912 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 - msgid "The backend does not support bulk modifications" - msgstr "Pozadinac ne podržava grupno uređivanje" - --#: ../addressbook/backends/google/e-book-backend-google.c:2054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 -+#: ../addressbook/backends/google/e-book-backend-google.c:2119 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 - msgid "The backend does not support bulk removals" - msgstr "Pozadinac ne podržava grupno uklanjanje" - --#: ../addressbook/backends/google/e-book-backend-google.c:2180 -+#: ../addressbook/backends/google/e-book-backend-google.c:2239 - msgid "Loading…" - msgstr "Učitavam…" - - #. System Group: My Contacts --#: ../addressbook/backends/google/e-book-google-utils.c:1618 -+#: ../addressbook/backends/google/e-book-google-utils.c:1631 - #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 -@@ -177,131 +179,131 @@ msgid "Personal" - msgstr "Lično" - - #. System Group: Friends --#: ../addressbook/backends/google/e-book-google-utils.c:1620 -+#: ../addressbook/backends/google/e-book-google-utils.c:1633 - msgid "Friends" - msgstr "Prijatelji" - - #. System Group: Family --#: ../addressbook/backends/google/e-book-google-utils.c:1622 -+#: ../addressbook/backends/google/e-book-google-utils.c:1635 - msgid "Family" - msgstr "Porodica" - - #. System Group: Coworkers --#: ../addressbook/backends/google/e-book-google-utils.c:1624 -+#: ../addressbook/backends/google/e-book-google-utils.c:1637 - msgid "Coworkers" - msgstr "Saradnici" - - #. Translators: An error message shown to a user when trying to do an - #. * operation on the LDAP address book which is not connected to the server --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 - msgid "Not connected" - msgstr "Nisam povezan" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 - msgid "Failed to bind using either v3 or v2 binds" - msgstr "Nisam uspeo da povežem koristeći ni v3 ni v2 vezice" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 - msgid "Reconnecting to LDAP server..." - msgstr "Ponovo se povezujem na LDAP server..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 - msgid "Invalid DN syntax" - msgstr "Neispravna DN sintaksa" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 - #, c-format - msgid "LDAP error 0x%x (%s)" - msgstr "Greška LDAP-a 0x%x (%s)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 - #, c-format - msgid "%s: NULL returned from ldap_first_entry" - msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa (ldap_first_entry)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 - #, c-format - msgid "%s: Unhandled result type %d returned" - msgstr "%s: Vraćena je nepoznata vrsta rezultata %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 - #, c-format - msgid "%s: Unhandled search result type %d returned" - msgstr "%s: Vraćena je nepoznata vrsta rezultata pretrage %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 - msgid "Receiving LDAP search results..." - msgstr "Primam rezultate pretrage sa LDAP servera..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 - msgid "Error performing search" - msgstr "Greška tokom pretrage" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 - #, c-format - msgid "Downloading contacts (%d)..." - msgstr "Preuzimam kontakte (%d)..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 - msgid "Adding contact to LDAP server..." - msgstr "Dodajem kontakt na LDAP server..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 - msgid "Modifying contact from LDAP server..." - msgstr "Menjam kontakt sa LDAP servera..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 - msgid "Removing contact from LDAP server..." - msgstr "Uklanjam kontakt sa LDAP servera..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 - #, c-format - msgid "Failed to get the DN for user '%s'" - msgstr "Nisam uspeo da dobavim DN za korisnika „%s“" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 - msgid "Loading Addressbook summary..." - msgstr "Učitavam sažetak adresara..." - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 - #, c-format - msgid "PROPFIND on webdav failed with HTTP status %d (%s)" - msgstr "" - "Nije uspelo nalaženje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 - msgid "No response body in webdav PROPFIND result" - msgstr "Nema tela odgovora u rezultatima nalaženja svojstava vebdava" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 - #, c-format - msgid "Loading Contacts (%d%%)" - msgstr "Učitavam kontakte (%d%%)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 - msgid "Cannot transform SoupURI to string" - msgstr "Ne mogu da preobratim Soup adresu u nisku" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 - #, c-format - msgid "Create resource '%s' failed with HTTP status %d (%s)" - msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 - msgid "Contact on server changed -> not modifying" - msgstr "Izmenjen je kontakt na serveru —> ne menjam" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 - #, c-format - msgid "Modify contact failed with HTTP status %d (%s)" - msgstr "Izmena kontakta nije uspela sa HTTP stanjem %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 - #, c-format - msgid "DELETE failed with HTTP status %d" - msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d" -@@ -905,8 +907,8 @@ msgstr "Spisak imena Gugl razgovora" - msgid "Twitter Name List" - msgstr "Spisak Tviter imena" - --#: ../addressbook/libebook-contacts/e-contact.c:1635 --#: ../addressbook/libebook/e-destination.c:917 -+#: ../addressbook/libebook-contacts/e-contact.c:1654 -+#: ../addressbook/libebook/e-destination.c:920 - msgid "Unnamed List" - msgstr "Neimenovani spisak" - -@@ -1002,7 +1004,7 @@ msgstr "" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 --#: ../addressbook/libedata-book/e-book-sqlite.c:5364 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5369 - #, c-format - msgid "Query contained unsupported elements" - msgstr "Upit je sadržao nepodržane elemente" -@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" - msgstr "Ne mogu da poređam prema polju koje može imati više vrednosti" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 --#: ../addressbook/libedata-book/e-book-sqlite.c:7376 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7381 - #, c-format - msgid "" - "Tried to step a cursor in reverse, but cursor is already at the beginning of " -@@ -1074,7 +1076,7 @@ msgstr "" - "Pokušah da pomerim kurzor unazad, ali je on već na početku spiska kontakta" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 --#: ../addressbook/libedata-book/e-book-sqlite.c:7384 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7389 - #, c-format - msgid "" - "Tried to step a cursor forwards, but cursor is already at the end of the " -@@ -1084,7 +1086,6 @@ msgstr "" - - #: ../addressbook/libedata-book/e-book-sqlite.c:524 - #, c-format --#| msgid "Invalid contact field '%d' specified in summary" - msgid "Unsupported contact field '%d' specified in summary" - msgstr "Nepodržano polje kontakta „%d“ je navedeno u sažetku" - -@@ -1096,22 +1097,20 @@ msgstr "" - "Ne mogu da nadogradim bazu podataka kontakata iz stare baze podataka sa više " - "od jednim adresarom. Obrišite prvo jedan od unosa u tabeli „fascikli“." - --#: ../addressbook/libedata-book/e-book-sqlite.c:5357 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5362 - #, c-format --#| msgid "Invalid query: " - msgid "Invalid query: %s" - msgstr "Neispravan upit: %s" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5532 --#| msgid "Invalid query: " -+#: ../addressbook/libedata-book/e-book-sqlite.c:5537 - msgid "Invalid query for EbSqlCursor" - msgstr "Neispravan upit za EbSdbKurzor" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7198 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7203 - msgid "At least one sort field must be specified to use an EbSqlCursor" - msgstr "Za korišćenje EbSkulKurzor-a mora biti navedeno barem jedno polje ređanja" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7216 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7221 - msgid "Cannot sort by a field that is not a string type" - msgstr "Ne mogu da poređam prema polju koje nije vrsta niske" - -@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " - msgstr "Ne mogu da uklonim kontakte: " - - #: ../addressbook/libedata-book/e-data-book-cursor.c:772 --#| msgid "%s does not support creating remote resources" - msgid "Cursor does not support setting the search expression" - msgstr "Kurzor ne podržava podešavanje izraza pretrage" - - #: ../addressbook/libedata-book/e-data-book-cursor.c:855 --#| msgid "Store does not support an INBOX" - msgid "Cursor does not support step" - msgstr "Kurzor ne podržava korak" - - #: ../addressbook/libedata-book/e-data-book-cursor.c:938 --#| msgid "%s does not support authentication" - msgid "Cursor does not support alphabetic indexes" - msgstr "Kurzor ne podržava azbučne indekse" - -@@ -1322,31 +1318,35 @@ msgstr "Nedostaje KIB izvora" - msgid "No such source for UID '%s'" - msgstr "Nema takvog izvora za KIB „%s“" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 - #, c-format - msgid "Server is unreachable (%s)" - msgstr "Server je nedostupan (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 - #, c-format - msgid "Failed to connect to a server using SSL: %s" - msgstr "Nisam uspeo da se povežem na server koristeći SSL: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 - #, c-format - msgid "Unexpected HTTP status code %d returned (%s)" - msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 - msgid "CalDAV backend is not loaded yet" - msgstr "Pozadinac KolDAV-a još uvek nije učitan" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 - msgid "Invalid Redirect URL" - msgstr "Neispravna adresa preusmeravanja" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 -+#, c-format -+msgid "Cannot create local cache folder '%s'" -+msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" -+ -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 - #, c-format - msgid "" - "Server is unreachable, calendar is opened in read-only mode.\n" -@@ -1355,32 +1355,27 @@ msgstr "" - "Server je nedostupan, kalendar je otvoren u režimu samo za čitanje.\n" - "Poruka greške: %s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 --#, c-format --msgid "Cannot create local cache folder '%s'" --msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" -- --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 - msgid "CalDAV does not support bulk additions" - msgstr "KolDAV ne podržava grupno dodavanje" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 - msgid "CalDAV does not support bulk modifications" - msgstr "KolDAV ne podržava grupno uređivanje" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 - msgid "CalDAV does not support bulk removals" - msgstr "KolDAV ne podržava grupno uklanjanje" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 - msgid "Calendar doesn't support Free/Busy" - msgstr "Kalendar ne podržava Slobodno / Zauzeto" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 - msgid "Schedule outbox url not found" - msgstr "Nije pronađena adresa otpremnog sandučeta rasporeda" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 - msgid "Unexpected result in schedule-response" - msgstr "Neočekivan rezultat u rasporedu-odgovoru" - -@@ -1407,27 +1402,27 @@ msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa." - msgid "Cannot save calendar data" - msgstr "Ne mogu da sačuvam podatke kalendara" - --#: ../calendar/backends/http/e-cal-backend-http.c:486 -+#: ../calendar/backends/http/e-cal-backend-http.c:491 - #, c-format - msgid "Malformed URI: %s" - msgstr "Loša adresa: %s" - --#: ../calendar/backends/http/e-cal-backend-http.c:577 -+#: ../calendar/backends/http/e-cal-backend-http.c:582 - #, c-format - msgid "Redirected to Invalid URI" - msgstr "Preusmereno na neispravnu adresu" - --#: ../calendar/backends/http/e-cal-backend-http.c:620 -+#: ../calendar/backends/http/e-cal-backend-http.c:625 - #, c-format - msgid "Bad file format." - msgstr "Loš oblik datoteke." - --#: ../calendar/backends/http/e-cal-backend-http.c:630 -+#: ../calendar/backends/http/e-cal-backend-http.c:635 - #, c-format - msgid "Not a calendar." - msgstr "Nije kalendar." - --#: ../calendar/backends/http/e-cal-backend-http.c:917 -+#: ../calendar/backends/http/e-cal-backend-http.c:925 - #: ../calendar/backends/weather/e-cal-backend-weather.c:536 - msgid "Could not create cache file" - msgstr "Ne mogu da napravim datoteku za ostavu" -@@ -2057,7 +2052,7 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)" - msgid "Invalid arguments to (user-tag)" - msgstr "Neispravni argumenti za (korisnička-oznaka)" - --#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 -+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 - #, c-format - msgid "Error executing filter search: %s: %s" - msgstr "Greška u primeni filtera za pretragu: %s: %s" -@@ -2103,57 +2098,57 @@ msgstr "Umnožavam poruke" - msgid "Quota information not supported for folder '%s'" - msgstr "Obaveštenje o količini nije podržano za fasciklu „%s“" - --#: ../camel/camel-folder.c:2868 -+#: ../camel/camel-folder.c:2862 - #, c-format - msgid "Expunging folder '%s'" - msgstr "Praznim fasciklu „%s“" - --#: ../camel/camel-folder.c:2996 -+#: ../camel/camel-folder.c:2990 - #, c-format - msgid "Retrieving message '%s' in %s" - msgstr "Dovlačim poruku „%s“ u %s" - --#: ../camel/camel-folder.c:3187 -+#: ../camel/camel-folder.c:3181 - #, c-format - msgid "Retrieving quota information for '%s'" - msgstr "Dovlačim obaveštenje o količini za „%s“" - --#: ../camel/camel-folder.c:3487 -+#: ../camel/camel-folder.c:3478 - #, c-format - msgid "Refreshing folder '%s'" - msgstr "Osvežavam fasciklu „%s“" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 -+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 - #, c-format - msgid "(%s) requires a single bool result" - msgstr "(%s) zahteva samo jedan logički rezultat" - - #. Translators: Each '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:964 -+#: ../camel/camel-folder-search.c:976 - #, c-format - msgid "(%s) not allowed inside %s" - msgstr "(%s) nije dozvoljeno unutar %s" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 -+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 - #, c-format - msgid "(%s) requires a match type string" - msgstr "(%s) zahteva nisku sa tipom poklapanja" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1007 -+#: ../camel/camel-folder-search.c:1019 - #, c-format - msgid "(%s) expects an array result" - msgstr "(%s) očekuje niz kao rezultat" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1017 -+#: ../camel/camel-folder-search.c:1029 - #, c-format - msgid "(%s) requires the folder set" - msgstr "(%s) zahteva skup fascikli" - --#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 -+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 - #, c-format - msgid "" - "Cannot parse search expression: %s:\n" -@@ -2162,7 +2157,7 @@ msgstr "" - "Ne mogu da analiziram izraz pretrage: %s:\n" - "%s" - --#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 -+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 - #, c-format - msgid "" - "Error executing search expression: %s:\n" -@@ -2436,11 +2431,6 @@ msgstr "" - msgid "Host lookup '%s' failed: %s" - msgstr "Nije uspelo traženje domaćina „%s“: %s" - --#: ../camel/camel-network-service.c:1009 --#| msgid "No quota information available for folder '%s'" --msgid "No host information available" --msgstr "Nisu dostupni podaci o domaćinu" -- - #: ../camel/camel-offline-folder.c:90 - msgid "Downloading new messages for offline mode" - msgstr "Preuzimam nove poruke za rad van mreže" -@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" - msgstr "Neispravna Gvrsta registrovana za protokol „%s“" - - #: ../camel/camel-session.c:502 --#: ../camel/providers/imapx/camel-imapx-server.c:4814 -+#: ../camel/providers/imapx/camel-imapx-server.c:4719 - #: ../camel/providers/pop3/camel-pop3-store.c:311 - #: ../camel/providers/pop3/camel-pop3-store.c:757 - #: ../camel/providers/smtp/camel-smtp-transport.c:515 -@@ -2961,21 +2951,20 @@ msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji" - msgid "Creating folder '%s'" - msgstr "Stvaram fasciklu „%s“" - --#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 -+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 - #: ../camel/providers/local/camel-maildir-store.c:321 - #, c-format - msgid "Cannot delete folder: %s: Invalid operation" - msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija" - --#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 --#: ../camel/providers/local/camel-maildir-store.c:852 -+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 -+#: ../camel/providers/local/camel-maildir-store.c:872 - #, c-format - msgid "Cannot rename folder: %s: Invalid operation" - msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija" - - #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 - #, c-format --#| msgid "Data source '%s' is not removable" - msgid "Stream type '%s' is not seekable" - msgstr "Vrsta toka „%s“ se ne može premotati" - -@@ -3042,17 +3031,17 @@ msgstr "Sam _ažuriraj ori izmeni u izvornim fasciklama" - msgid "Unmatched" - msgstr "Nepoklopljeno" - --#: ../camel/camel-vee-store.c:442 -+#: ../camel/camel-vee-store.c:436 - #, c-format - msgid "Cannot delete folder: %s: No such folder" - msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle" - --#: ../camel/camel-vee-store.c:477 -+#: ../camel/camel-vee-store.c:471 - #, c-format - msgid "Cannot rename folder: %s: No such folder" - msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle" - --#: ../camel/camel-vee-store.c:539 -+#: ../camel/camel-vee-store.c:533 - msgid "Enable _Unmatched folder" - msgstr "Uključi _nepoklopljene fascikle" - -@@ -3064,47 +3053,46 @@ msgstr "Ne mogu da umnožim poruke u fasciklu za smeće" - msgid "Cannot copy messages to the Junk folder" - msgstr "Ne mogu da umnožim poruke u fasciklu za đubre" - --#: ../camel/providers/imapx/camel-imapx-folder.c:687 -+#: ../camel/providers/imapx/camel-imapx-folder.c:796 - #, c-format - msgid "No quota information available for folder '%s'" - msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“" - --#: ../camel/providers/imapx/camel-imapx-folder.c:801 --#: ../camel/providers/imapx/camel-imapx-folder.c:894 -+#: ../camel/providers/imapx/camel-imapx-folder.c:936 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1029 - #, c-format - msgid "No destination folder specified" - msgstr "Nije navedena fascikla odredišta" - --#: ../camel/providers/imapx/camel-imapx-folder.c:829 -+#: ../camel/providers/imapx/camel-imapx-folder.c:964 - msgid "Unable to move junk messages" - msgstr "Ne mogu da premestim nepoželjne poruke" - --#: ../camel/providers/imapx/camel-imapx-folder.c:922 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1057 - msgid "Unable to move deleted messages" - msgstr "Ne mogu da premestim obrisane poruke" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1148 --#: ../camel/providers/nntp/camel-nntp-folder.c:758 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1374 -+#: ../camel/providers/nntp/camel-nntp-folder.c:760 - msgid "Apply message _filters to this folder" - msgstr "Primeni _filtere poruke nad ovom fasciklom" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1254 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1485 - #, c-format - msgid "Could not create folder summary for %s" - msgstr "Ne mogu da napravim sažetak fascikle za „%s“" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1263 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1494 - #, c-format - msgid "Could not create cache for %s: " - msgstr "Ne mogu da napravim ostavu za „%s“: " - --#: ../camel/providers/imapx/camel-imapx-folder.c:1448 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1709 - #, c-format --#| msgid "No quota information available for folder '%s'" - msgid "No IMAP mailbox available for folder '%s'" - msgstr "Nijedno IMAP sanduče nije dostupno za fasciklu „%s“" - --#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 -+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 - #, c-format - msgid "Source stream returned no data" - msgstr "Odgovor izvornog toka je bez podataka" -@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" - msgstr "_Osluškuj za obaveštenjima o izmenama servera" - - #: ../camel/providers/imapx/camel-imapx-provider.c:49 -+#| msgid "Evolution Data Server" -+msgid "Connection to Server" -+msgstr "Povezivanje na server" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+msgid "Numbe_r of concurrent connections to use" -+msgstr "_Broj trenutnih veza za korišćenje" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:54 - #: ../camel/providers/nntp/camel-nntp-provider.c:44 - msgid "Folders" - msgstr "Fascikle" - --#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+#: ../camel/providers/imapx/camel-imapx-provider.c:56 - msgid "_Show only subscribed folders" - msgstr "Prik_aži samo prijavljene fascikle" - --#: ../camel/providers/imapx/camel-imapx-provider.c:54 -+#: ../camel/providers/imapx/camel-imapx-provider.c:59 - msgid "O_verride server-supplied folder namespace" - msgstr "P_remosti oblik imena fascikle koje daje server" - --#: ../camel/providers/imapx/camel-imapx-provider.c:56 -+#: ../camel/providers/imapx/camel-imapx-provider.c:61 - msgid "Namespace:" - msgstr "Oblik imena:" - --#: ../camel/providers/imapx/camel-imapx-provider.c:59 -+#: ../camel/providers/imapx/camel-imapx-provider.c:64 - #: ../camel/providers/local/camel-local-provider.c:39 - #: ../camel/providers/local/camel-local-provider.c:79 - #: ../camel/providers/local/camel-local-provider.c:99 -@@ -3154,262 +3151,263 @@ msgstr "Oblik imena:" - msgid "Options" - msgstr "Opcije" - --#: ../camel/providers/imapx/camel-imapx-provider.c:61 -+#: ../camel/providers/imapx/camel-imapx-provider.c:66 - #: ../camel/providers/nntp/camel-nntp-provider.c:41 - msgid "Apply _filters to new messages in all folders" - msgstr "Primeni filtere na nove poruke u svim _fasciklama" - --#: ../camel/providers/imapx/camel-imapx-provider.c:63 -+#: ../camel/providers/imapx/camel-imapx-provider.c:68 - msgid "_Apply filters to new messages in Inbox on this server" - msgstr "_Primeni propusnike na nove poruke u sandučetu ovog servera" - --#: ../camel/providers/imapx/camel-imapx-provider.c:65 -+#: ../camel/providers/imapx/camel-imapx-provider.c:70 - msgid "Check new messages for _Junk contents" - msgstr "Proveri da nema _đubreta među novim porukama" - --#: ../camel/providers/imapx/camel-imapx-provider.c:67 -+#: ../camel/providers/imapx/camel-imapx-provider.c:72 - msgid "Only check for Junk messages in the IN_BOX folder" - msgstr "Proveri da nema đubreta samo u fascikli SAN_DUČE" - --#: ../camel/providers/imapx/camel-imapx-provider.c:69 -+#: ../camel/providers/imapx/camel-imapx-provider.c:74 - msgid "Automatically synchroni_ze remote mail locally" - msgstr "Sam uskladi ud_aljenu poštu sa lokalnom" - --#: ../camel/providers/imapx/camel-imapx-provider.c:75 -+#: ../camel/providers/imapx/camel-imapx-provider.c:80 - msgid "Default IMAP port" - msgstr "Osnovni port IMAP-a" - --#: ../camel/providers/imapx/camel-imapx-provider.c:76 -+#: ../camel/providers/imapx/camel-imapx-provider.c:81 - msgid "IMAP over SSL" - msgstr "IMAP preko SSL-a" - --#: ../camel/providers/imapx/camel-imapx-provider.c:83 -+#: ../camel/providers/imapx/camel-imapx-provider.c:88 - msgid "IMAP+" - msgstr "IMAP+" - --#: ../camel/providers/imapx/camel-imapx-provider.c:85 -+#: ../camel/providers/imapx/camel-imapx-provider.c:90 - msgid "For reading and storing mail on IMAP servers." - msgstr "Za čitanje i smeštanje pošte na IMAP servere." - --#: ../camel/providers/imapx/camel-imapx-server.c:844 -+#: ../camel/providers/imapx/camel-imapx-server.c:1009 -+#: ../camel/providers/imapx/camel-imapx-server.c:1016 - #, c-format - msgid "Not authenticated" - msgstr "Nepotvrđenog identiteta" - --#: ../camel/providers/imapx/camel-imapx-server.c:1773 -+#: ../camel/providers/imapx/camel-imapx-server.c:1713 - msgid "Server disconnected" - msgstr "Veza sa serverom je isključena" - --#: ../camel/providers/imapx/camel-imapx-server.c:2255 -+#: ../camel/providers/imapx/camel-imapx-server.c:2205 - msgid "Error writing to cache stream" - msgstr "Greška prilikom upisa u tok ostave" - --#: ../camel/providers/imapx/camel-imapx-server.c:3672 -+#: ../camel/providers/imapx/camel-imapx-server.c:3550 - msgid "Error performing IDLE" - msgstr "Greška prilikom izvršavanja IDLE-a" - --#: ../camel/providers/imapx/camel-imapx-server.c:4661 -+#: ../camel/providers/imapx/camel-imapx-server.c:4558 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: %s" - msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:4662 -+#: ../camel/providers/imapx/camel-imapx-server.c:4559 - #: ../camel/providers/smtp/camel-smtp-transport.c:215 - msgid "STARTTLS not supported" - msgstr "STARTTLS nije podržano" - --#: ../camel/providers/imapx/camel-imapx-server.c:4722 -+#: ../camel/providers/imapx/camel-imapx-server.c:4619 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: " - msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: " - --#: ../camel/providers/imapx/camel-imapx-server.c:4803 -+#: ../camel/providers/imapx/camel-imapx-server.c:4708 - #, c-format - msgid "IMAP server %s does not support %s authentication" - msgstr "IMAP server „%s“ ne podržava „%s“ prijavljivanje identiteta" - --#: ../camel/providers/imapx/camel-imapx-server.c:4833 -+#: ../camel/providers/imapx/camel-imapx-server.c:4738 - #: ../camel/providers/nntp/camel-nntp-store.c:394 - #: ../camel/providers/nntp/camel-nntp-store.c:531 - msgid "Cannot authenticate without a username" - msgstr "Ne mogu da potvrdim identitet bez korisničkog imena" - --#: ../camel/providers/imapx/camel-imapx-server.c:4842 -+#: ../camel/providers/imapx/camel-imapx-server.c:4747 - #: ../camel/providers/nntp/camel-nntp-store.c:540 - #: ../camel/providers/pop3/camel-pop3-store.c:678 - #: ../camel/providers/pop3/camel-pop3-store.c:699 - msgid "Authentication password not available" - msgstr "Lozinka potvrđivanja identiteta nije dostupna" - --#: ../camel/providers/imapx/camel-imapx-server.c:5093 -+#: ../camel/providers/imapx/camel-imapx-server.c:4983 -+#: ../camel/providers/imapx/camel-imapx-server.c:5042 - msgid "Error fetching message" - msgstr "Greška prilikom preuzimanja poruke" - --#: ../camel/providers/imapx/camel-imapx-server.c:5139 -+#: ../camel/providers/imapx/camel-imapx-server.c:5035 - msgid "Failed to close the tmp stream" - msgstr "Nisam uspeo da zatvorim privremenu datoteku" - --#: ../camel/providers/imapx/camel-imapx-server.c:5168 -+#: ../camel/providers/imapx/camel-imapx-server.c:5071 - msgid "Failed to copy the tmp file" - msgstr "Nisam uspeo da umnožim privremenu datoteku" - --#: ../camel/providers/imapx/camel-imapx-server.c:5294 -+#: ../camel/providers/imapx/camel-imapx-server.c:5212 - msgid "Error moving messages" - msgstr "Greška premeštanja poruka" - --#: ../camel/providers/imapx/camel-imapx-server.c:5298 -+#: ../camel/providers/imapx/camel-imapx-server.c:5216 - msgid "Error copying messages" - msgstr "Greška umnožavanja poruka" - --#: ../camel/providers/imapx/camel-imapx-server.c:5520 -+#: ../camel/providers/imapx/camel-imapx-server.c:5438 - msgid "Error appending message" - msgstr "Greška prikačinjanja poruka" - --#: ../camel/providers/imapx/camel-imapx-server.c:5756 -+#: ../camel/providers/imapx/camel-imapx-server.c:5674 - msgid "Error fetching message headers" - msgstr "Greška preuzimanja zaglavlja poruke" - --#: ../camel/providers/imapx/camel-imapx-server.c:5921 -+#: ../camel/providers/imapx/camel-imapx-server.c:5841 - msgid "Error retrieving message" - msgstr "Greška dovlačenja poruke" - --#: ../camel/providers/imapx/camel-imapx-server.c:6051 --#: ../camel/providers/imapx/camel-imapx-server.c:6274 -+#: ../camel/providers/imapx/camel-imapx-server.c:5975 -+#: ../camel/providers/imapx/camel-imapx-server.c:6204 - #, c-format - msgid "Fetching summary information for new messages in '%s'" - msgstr "Prikupljam pregled podataka novih poruka u „%s“" - --#: ../camel/providers/imapx/camel-imapx-server.c:6103 -+#: ../camel/providers/imapx/camel-imapx-server.c:6027 - #, c-format - msgid "Scanning for changed messages in '%s'" - msgstr "Pregledam izmenjene poruke u „%s“" - --#: ../camel/providers/imapx/camel-imapx-server.c:6155 -+#: ../camel/providers/imapx/camel-imapx-server.c:6079 - msgid "Error fetching new messages" - msgstr "Greška prilikom preuzimanja novih poruka" - --#: ../camel/providers/imapx/camel-imapx-server.c:6423 -+#: ../camel/providers/imapx/camel-imapx-server.c:6352 - msgid "Error refreshing folder" - msgstr "Greška tokom pretrage" - --#: ../camel/providers/imapx/camel-imapx-server.c:6573 -+#: ../camel/providers/imapx/camel-imapx-server.c:6502 - msgid "Error expunging message" - msgstr "Greška prilikom izbacivanja poruke" - --#: ../camel/providers/imapx/camel-imapx-server.c:6682 --#: ../camel/providers/imapx/camel-imapx-server.c:6707 -+#: ../camel/providers/imapx/camel-imapx-server.c:6617 -+#: ../camel/providers/imapx/camel-imapx-server.c:6642 - msgid "Error fetching folders" - msgstr "Greška prilikom preuzimanja fascikle" - --#: ../camel/providers/imapx/camel-imapx-server.c:6787 -+#: ../camel/providers/imapx/camel-imapx-server.c:6722 - msgid "Error creating folder" - msgstr "Greška prilikom stvaranja fascikle" - --#: ../camel/providers/imapx/camel-imapx-server.c:6839 -+#: ../camel/providers/imapx/camel-imapx-server.c:6774 - msgid "Error deleting folder" - msgstr "Greška prilikom brisanja fascikle" - --#: ../camel/providers/imapx/camel-imapx-server.c:6906 -+#: ../camel/providers/imapx/camel-imapx-server.c:6850 - msgid "Error renaming folder" - msgstr "Greška prilikom preimenovanja fascikle" - --#: ../camel/providers/imapx/camel-imapx-server.c:6993 -+#: ../camel/providers/imapx/camel-imapx-server.c:6924 - msgid "Error subscribing to folder" - msgstr "Greška prilikom prijavljivanja na fasciklu" - --#: ../camel/providers/imapx/camel-imapx-server.c:7053 --#| msgid "Error subscribing to folder" -+#: ../camel/providers/imapx/camel-imapx-server.c:6990 - msgid "Error unsubscribing from folder" - msgstr "Greška odjavljivanja sa fascikle" - --#: ../camel/providers/imapx/camel-imapx-server.c:7109 -+#: ../camel/providers/imapx/camel-imapx-server.c:7052 - msgid "Error retrieving quota information" - msgstr "Greška dovlačenja obaveštenja o količini" - --#: ../camel/providers/imapx/camel-imapx-server.c:7161 -+#: ../camel/providers/imapx/camel-imapx-server.c:7104 - msgid "Search failed" - msgstr "Pretraga nije uspela" - --#: ../camel/providers/imapx/camel-imapx-server.c:7223 -+#: ../camel/providers/imapx/camel-imapx-server.c:7166 - msgid "Error performing NOOP" - msgstr "Greška prilikom obavljanja NOOP-a" - --#: ../camel/providers/imapx/camel-imapx-server.c:7330 -+#: ../camel/providers/imapx/camel-imapx-server.c:7273 - msgid "Error syncing changes" - msgstr "Greška prilikom usklađivanja izmena" - --#: ../camel/providers/imapx/camel-imapx-server.c:8441 -+#: ../camel/providers/imapx/camel-imapx-server.c:8258 - #, c-format - msgid "Cannot get message with message ID %s: %s" - msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s" - --#: ../camel/providers/imapx/camel-imapx-server.c:8442 -+#: ../camel/providers/imapx/camel-imapx-server.c:8259 - msgid "No such message available." - msgstr "Nema takve poruke." - --#: ../camel/providers/imapx/camel-imapx-server.c:8640 --#: ../camel/providers/imapx/camel-imapx-server.c:8661 -+#: ../camel/providers/imapx/camel-imapx-server.c:8466 -+#: ../camel/providers/imapx/camel-imapx-server.c:8487 - msgid "Cannot create spool file: " - msgstr "Ne mogu da napravim datoteku pripreme: " - --#: ../camel/providers/imapx/camel-imapx-server.c:9403 -+#: ../camel/providers/imapx/camel-imapx-server.c:9228 - msgid "IMAP server does not support quotas" - msgstr "IMAP server ne podržava količine" - - #. create a dummy "." parent inbox, use to scan, then put back at the top level --#: ../camel/providers/imapx/camel-imapx-store.c:207 -+#: ../camel/providers/imapx/camel-imapx-store.c:223 - #: ../camel/providers/local/camel-maildir-folder.c:482 - #: ../camel/providers/local/camel-maildir-store.c:322 --#: ../camel/providers/local/camel-maildir-store.c:764 --#: ../camel/providers/local/camel-maildir-store.c:770 --#: ../camel/providers/local/camel-maildir-store.c:853 -+#: ../camel/providers/local/camel-maildir-store.c:784 -+#: ../camel/providers/local/camel-maildir-store.c:790 -+#: ../camel/providers/local/camel-maildir-store.c:873 - #: ../camel/providers/local/camel-spool-store.c:393 - msgid "Inbox" - msgstr "Sanduče" - --#: ../camel/providers/imapx/camel-imapx-store.c:823 -+#: ../camel/providers/imapx/camel-imapx-store.c:758 - #, c-format - msgid "IMAP server %s" - msgstr "IMAP server „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:826 -+#: ../camel/providers/imapx/camel-imapx-store.c:761 - #, c-format - msgid "IMAP service for %s on %s" - msgstr "IMAP servis za „%s“ na „%s" - --#: ../camel/providers/imapx/camel-imapx-store.c:1035 -+#: ../camel/providers/imapx/camel-imapx-store.c:836 - #: ../camel/providers/nntp/camel-nntp-provider.c:93 - #: ../camel/providers/pop3/camel-pop3-provider.c:81 - msgid "Password" - msgstr "Lozinka" - --#: ../camel/providers/imapx/camel-imapx-store.c:1037 -+#: ../camel/providers/imapx/camel-imapx-store.c:838 - msgid "This option will connect to the IMAP server using a plaintext password." - msgstr "" - "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu." - --#: ../camel/providers/imapx/camel-imapx-store.c:1112 -+#: ../camel/providers/imapx/camel-imapx-store.c:913 - #, c-format - msgid "No such folder %s" - msgstr "Nema takve fascikle „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:1507 --#, c-format, -+#: ../camel/providers/imapx/camel-imapx-store.c:1324 -+#, c-format - msgid "No IMAP namespace for folder path '%s'" - msgstr "Nema IMAP prostora naziva za putanju fascikle „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:1656 -+#: ../camel/providers/imapx/camel-imapx-store.c:1472 - #, c-format - msgid "Retrieving folder list for %s" - msgstr "Dovlačim spisak fascikle za „%s“" - --#: ../camel/providers/imapx/camel-imapx-store.c:2094 -+#: ../camel/providers/imapx/camel-imapx-store.c:1924 - #, c-format - msgid "" - "The folder name \"%s\" is invalid because it contains the character \"%c\"" - msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" - --#: ../camel/providers/imapx/camel-imapx-store.c:2615 -+#: ../camel/providers/imapx/camel-imapx-store.c:2689 - #: ../camel/providers/nntp/camel-nntp-store.c:1250 - #: ../camel/providers/pop3/camel-pop3-folder.c:450 - #: ../camel/providers/pop3/camel-pop3-folder.c:593 -@@ -3424,27 +3422,27 @@ msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" - msgid "You must be working online to complete this operation" - msgstr "Morate da budete na mreži da biste završili ovu operaciju" - --#: ../camel/providers/local/camel-local-folder.c:192 -+#: ../camel/providers/local/camel-local-folder.c:195 - #, c-format - msgid "~%s (%s)" - msgstr "~%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:202 --#: ../camel/providers/local/camel-local-folder.c:211 -+#: ../camel/providers/local/camel-local-folder.c:205 -+#: ../camel/providers/local/camel-local-folder.c:214 - #, c-format - msgid "mailbox: %s (%s)" - msgstr "poštansko sanduče:%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:220 -+#: ../camel/providers/local/camel-local-folder.c:223 - #, c-format - msgid "%s (%s)" - msgstr "%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:497 -+#: ../camel/providers/local/camel-local-folder.c:500 - msgid "_Index message body data" - msgstr "_Popiši sadržaje poruka" - --#: ../camel/providers/local/camel-local-folder.c:725 -+#: ../camel/providers/local/camel-local-folder.c:730 - #, c-format - msgid "" - "Cannot get message %s from folder %s\n" -@@ -3595,7 +3593,7 @@ msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s" - - #: ../camel/providers/local/camel-maildir-store.c:130 - #: ../camel/providers/local/camel-maildir-store.c:149 --#: ../camel/providers/local/camel-maildir-store.c:861 -+#: ../camel/providers/local/camel-maildir-store.c:881 - #, c-format - msgid "Folder %s already exists" - msgstr "Fascikla „%s“ već postoji" -@@ -3638,8 +3636,8 @@ msgstr "Ne mogu da obrišem fasciklu „%s“: %s" - msgid "not a maildir directory" - msgstr "nije direktorijum pošte" - --#: ../camel/providers/local/camel-maildir-store.c:636 --#: ../camel/providers/local/camel-maildir-store.c:1075 -+#: ../camel/providers/local/camel-maildir-store.c:637 -+#: ../camel/providers/local/camel-maildir-store.c:1095 - #: ../camel/providers/local/camel-spool-store.c:212 - #: ../camel/providers/local/camel-spool-store.c:231 - #, c-format -@@ -3660,10 +3658,10 @@ msgstr "Proveravam celovitost fascikle" - msgid "Checking for new messages" - msgstr "Vršim proveru za novim porukama" - --#: ../camel/providers/local/camel-maildir-summary.c:784 -+#: ../camel/providers/local/camel-maildir-summary.c:791 - #: ../camel/providers/local/camel-mbox-summary.c:466 --#: ../camel/providers/local/camel-mbox-summary.c:682 --#: ../camel/providers/local/camel-mbox-summary.c:831 -+#: ../camel/providers/local/camel-mbox-summary.c:687 -+#: ../camel/providers/local/camel-mbox-summary.c:836 - #: ../camel/providers/local/camel-spool-summary.c:139 - msgid "Storing folder" - msgstr "Smeštam fasciklu" -@@ -3761,48 +3759,48 @@ msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s" - msgid "Could not open folder: %s: %s" - msgstr "Ne mogu da otvorim fasciklu: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:606 -+#: ../camel/providers/local/camel-mbox-summary.c:611 - #, c-format - msgid "Cannot check folder: %s: %s" - msgstr "Ne mogu da proverim fasciklu: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:695 --#: ../camel/providers/local/camel-mbox-summary.c:840 -+#: ../camel/providers/local/camel-mbox-summary.c:700 -+#: ../camel/providers/local/camel-mbox-summary.c:845 - #: ../camel/providers/local/camel-spool-summary.c:146 - #, c-format - msgid "Could not open file: %s: %s" - msgstr "Ne mogu da otvorim datoteku: %s: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:710 -+#: ../camel/providers/local/camel-mbox-summary.c:715 - #: ../camel/providers/local/camel-spool-summary.c:161 - #, c-format - msgid "Cannot open temporary mailbox: %s" - msgstr "Ne mogu da otvorim privremeno poštansko sanduče: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:727 --#: ../camel/providers/local/camel-mbox-summary.c:962 -+#: ../camel/providers/local/camel-mbox-summary.c:732 -+#: ../camel/providers/local/camel-mbox-summary.c:967 - #, c-format - msgid "Could not close source folder %s: %s" - msgstr "Ne mogu da zatvorim izvornu fasciklu „%s“: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:740 -+#: ../camel/providers/local/camel-mbox-summary.c:745 - #, c-format - msgid "Could not close temporary folder: %s" - msgstr "Ne mogu da zatvorim privremenu fasciklu: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:759 -+#: ../camel/providers/local/camel-mbox-summary.c:764 - #, c-format - msgid "Could not rename folder: %s" - msgstr "Ne mogu da preimenujem fasciklu: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:854 --#: ../camel/providers/local/camel-mbox-summary.c:1127 -+#: ../camel/providers/local/camel-mbox-summary.c:859 -+#: ../camel/providers/local/camel-mbox-summary.c:1132 - #, c-format - msgid "Could not store folder: %s" - msgstr "Ne mogu da sačuvam fasciklu: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:893 --#: ../camel/providers/local/camel-mbox-summary.c:1167 -+#: ../camel/providers/local/camel-mbox-summary.c:898 -+#: ../camel/providers/local/camel-mbox-summary.c:1172 - #, c-format - msgid "" - "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " -@@ -3811,25 +3809,25 @@ msgstr "" - "MBOKS datoteka je oštećena, popravite je. (Očekivano je „Iz reda“, ali nisam " - "dobio.)" - --#: ../camel/providers/local/camel-mbox-summary.c:903 --#: ../camel/providers/local/camel-mbox-summary.c:1179 -+#: ../camel/providers/local/camel-mbox-summary.c:908 -+#: ../camel/providers/local/camel-mbox-summary.c:1184 - #, c-format - msgid "Summary and folder mismatch, even after a sync" - msgstr "Neslaganje pregleda i fascikle, čak i nakon usklađivanja" - --#: ../camel/providers/local/camel-mbox-summary.c:1072 -+#: ../camel/providers/local/camel-mbox-summary.c:1077 - #: ../camel/providers/local/camel-spool-summary.c:356 - #, c-format - msgid "Unknown error: %s" - msgstr "Nepoznata greška: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1237 --#: ../camel/providers/local/camel-mbox-summary.c:1267 -+#: ../camel/providers/local/camel-mbox-summary.c:1242 -+#: ../camel/providers/local/camel-mbox-summary.c:1272 - #, c-format - msgid "Writing to temporary mailbox failed: %s" - msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s" - --#: ../camel/providers/local/camel-mbox-summary.c:1256 -+#: ../camel/providers/local/camel-mbox-summary.c:1261 - #, c-format - msgid "Writing to temporary mailbox failed: %s: %s" - msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s: %s" -@@ -3950,21 +3948,21 @@ msgstr "" - "Fascikla je možda oštećena, umnožite sačuvano u „%s“" - - #: ../camel/providers/nntp/camel-nntp-folder.c:222 --#: ../camel/providers/nntp/camel-nntp-folder.c:588 -+#: ../camel/providers/nntp/camel-nntp-folder.c:590 - #, c-format - msgid "Internal error: UID in invalid format: %s" - msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:291 --#: ../camel/providers/nntp/camel-nntp-folder.c:296 -+#: ../camel/providers/nntp/camel-nntp-folder.c:292 -+#: ../camel/providers/nntp/camel-nntp-folder.c:297 - #: ../camel/providers/pop3/camel-pop3-folder.c:546 - #: ../camel/providers/pop3/camel-pop3-folder.c:945 - #, c-format - msgid "Cannot get message %s: %s" - msgstr "Ne mogu da dobavim poruku „%s“: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:303 --#: ../camel/providers/nntp/camel-nntp-folder.c:622 -+#: ../camel/providers/nntp/camel-nntp-folder.c:304 -+#: ../camel/providers/nntp/camel-nntp-folder.c:624 - #: ../camel/providers/pop3/camel-pop3-folder.c:476 - #: ../camel/providers/pop3/camel-pop3-folder.c:536 - #: ../camel/providers/pop3/camel-pop3-folder.c:555 -@@ -3978,18 +3976,17 @@ msgstr "Ne mogu da dobavim poruku „%s“: " - msgid "Posting failed: %s" - msgstr "Neuspela pošiljka: %s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:501 -+#: ../camel/providers/nntp/camel-nntp-folder.c:503 - msgid "Posting failed: " - msgstr "Neuspela pošiljka: " - --#: ../camel/providers/nntp/camel-nntp-folder.c:611 -+#: ../camel/providers/nntp/camel-nntp-folder.c:613 - #, c-format - msgid "This message is not currently available" - msgstr "Ova poruka nije trenutno dostupna" - --#: ../camel/providers/nntp/camel-nntp-folder.c:720 -+#: ../camel/providers/nntp/camel-nntp-folder.c:722 - #, c-format --#| msgid "You cannot copy messages from a NNTP folder!" - msgid "You cannot copy messages from a NNTP folder" - msgstr "Ne možete da umnožite poruke iz NNTP fascikle" - -@@ -4652,7 +4649,6 @@ msgstr "" - "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 --#| msgid "Proxy type to use" - msgid "(Deprecated) Proxy type to use" - msgstr "(Zastarelo) Vrsta posrednika za korišćenje" - -@@ -4667,69 +4663,57 @@ msgstr "" - "Evolucije. Vidite API dokumentaciju „ESourceProxy“ za pojedinosti." - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 --#| msgid "Whether to use http-proxy" - msgid "(Deprecated) Whether to use http-proxy" - msgstr "(Zastarelo) Da li da koristi http-posrednika" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 --#| msgid "Whether proxy server requires authentication" - msgid "(Deprecated) Whether proxy server requires authentication" - msgstr "(Zastarelo) Da li server posrednik zahteva potvrdu identiteta" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 --#| msgid "Host name for HTTP requests" - msgid "(Deprecated) Host name for HTTP requests" - msgstr "(Zastarelo) Naziv domaćina za HTTP zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 --#| msgid "Port number for HTTP requests" - msgid "(Deprecated) Port number for HTTP requests" - msgstr "(Zastarelo) Broj priključnika za HTTP zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 --#| msgid "Proxy authentication user name" - msgid "(Deprecated) Proxy authentication user name" - msgstr "(Zastarelo) Korisničko ime potvrde identiteta posrednika" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 --#| msgid "Proxy authentication password" - msgid "(Deprecated) Proxy authentication password" - msgstr "(Zastarelo) Lozinka potvrde identiteta posrednika" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 --#| msgid "List of hosts to connect to without proxy" - msgid "(Deprecated) List of hosts to connect to without proxy" - msgstr "(Zastarelo) Spisak domaćina za povezivanje bez posrednika" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 --#| msgid "Host name for HTTPS requests" - msgid "(Deprecated) Host name for HTTPS requests" - msgstr "(Zastarelo) Naziv domaćina za HTTPS zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 --#| msgid "Port number for HTTPS requests" - msgid "(Deprecated) Port number for HTTPS requests" - msgstr "(Zastarelo) Broj priključnika za HTTPS zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 --#| msgid "Host name for SOCKS requests" - msgid "(Deprecated) Host name for SOCKS requests" - msgstr "(Zastarelo) Naziv domaćina za SOCKS zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 --#| msgid "Port number for SOCKS requests" - msgid "(Deprecated) Port number for SOCKS requests" - msgstr "(Zastarelo) Broj priključnika za SOCKS zahteve" - - #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 --#| msgid "Automatic proxy configuration URL" - msgid "(Deprecated) Automatic proxy configuration URL" - msgstr "(Zastarelo) Adresa za samopodešavanje posrednika" - - #: ../libebackend/e-authentication-mediator.c:204 - #: ../libebackend/e-authentication-mediator.c:215 --#: ../libebackend/e-authentication-mediator.c:861 --#: ../libebackend/e-authentication-mediator.c:1198 -+#: ../libebackend/e-authentication-mediator.c:860 -+#: ../libebackend/e-authentication-mediator.c:1197 - msgid "Bus name vanished (client terminated?)" - msgstr "Naziv sabirnice je nestao (klijent je okončan?)" - -@@ -4739,8 +4723,8 @@ msgstr "Nema odgovora sa klijenta" - - #: ../libebackend/e-authentication-mediator.c:333 - #: ../libebackend/e-authentication-mediator.c:344 --#: ../libebackend/e-authentication-mediator.c:855 --#: ../libebackend/e-authentication-mediator.c:1192 -+#: ../libebackend/e-authentication-mediator.c:854 -+#: ../libebackend/e-authentication-mediator.c:1191 - msgid "Client cancelled the operation" - msgstr "Klijent je otkazao ste operaciju" - -@@ -4748,11 +4732,11 @@ msgstr "Klijent je otkazao ste operaciju" - msgid "Client reports password was rejected" - msgstr "Lozinka izveštaja klijenta je odbijena" - --#: ../libebackend/e-authentication-session.c:554 -+#: ../libebackend/e-authentication-session.c:539 - msgid "Add this password to your keyring" - msgstr "Dodajte ovu lozinku u vaš privezak" - --#: ../libebackend/e-authentication-session.c:664 -+#: ../libebackend/e-authentication-session.c:649 - msgid "Password was incorrect" - msgstr "Lozinka je neispravna" - -@@ -4761,12 +4745,12 @@ msgstr "Lozinka je neispravna" - msgid "%s does not support authentication" - msgstr "„%s“ ne podržava potvrđivanje identiteta" - --#: ../libebackend/e-collection-backend.c:900 -+#: ../libebackend/e-collection-backend.c:901 - #, c-format - msgid "%s does not support creating remote resources" - msgstr "„%s“ ne podržava stvaranje udaljenih izvorišta" - --#: ../libebackend/e-collection-backend.c:959 -+#: ../libebackend/e-collection-backend.c:960 - #, c-format - msgid "%s does not support deleting remote resources" - msgstr "„%s“ ne podržava brisanje udaljenih izvorišta" -@@ -4781,40 +4765,40 @@ msgstr "Nema pogona pozadinca za taster mešanja „%s“" - msgid "Data source is missing a [%s] group" - msgstr "Izvoru podataka nedostaje [%s] grupa" - --#: ../libebackend/e-server-side-source.c:1020 --#: ../libedataserver/e-source.c:1348 -+#: ../libebackend/e-server-side-source.c:1022 -+#: ../libedataserver/e-source.c:1394 - #, c-format - msgid "Data source '%s' does not support creating remote resources" - msgstr "Izvor podataka „%s“ ne podržava stvaranje udaljenih izvorišta" - --#: ../libebackend/e-server-side-source.c:1034 -+#: ../libebackend/e-server-side-source.c:1036 - #, c-format - msgid "" - "Data source '%s' has no collection backend to create the remote resource" - msgstr "" - "Izvor podataka „%s“ nema pozadinca zbirke da bi napravio udaljeno izvorište" - --#: ../libebackend/e-server-side-source.c:1062 --#: ../libedataserver/e-source.c:1461 -+#: ../libebackend/e-server-side-source.c:1064 -+#: ../libedataserver/e-source.c:1507 - #, c-format - msgid "Data source '%s' does not support deleting remote resources" - msgstr "Izvor podataka „%s“ ne podržava brisanje udaljenih izvorišta" - --#: ../libebackend/e-server-side-source.c:1076 -+#: ../libebackend/e-server-side-source.c:1078 - #, c-format - msgid "" - "Data source '%s' has no collection backend to delete the remote resource" - msgstr "" - "Izvor podataka „%s“ nema pozadinca zbirke da bi obrisao udaljeno izvorište" - --#: ../libebackend/e-server-side-source.c:1107 --#: ../libedataserver/e-source.c:1557 --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 -+#: ../libebackend/e-server-side-source.c:1109 -+#: ../libedataserver/e-source.c:1603 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 - #, c-format - msgid "Data source '%s' does not support OAuth 2.0 authentication" - msgstr "Izvor podataka „%s“ ne podržava OAut 2.0 potvrđivanje identiteta" - --#: ../libebackend/e-server-side-source.c:1452 -+#: ../libebackend/e-server-side-source.c:1456 - #, c-format - msgid "File must have a '.source' extension" - msgstr "Datoteka mora da ima nastavak „.source“" -@@ -5018,37 +5002,36 @@ msgstr "Unesite lozinku za spisak zaduženja „%s“." - msgid "Please enter the password for account \"%s\"." - msgstr "Unesite lozinku za nalog „%s“." - --#: ../libedataserver/e-source.c:765 -+#: ../libedataserver/e-source.c:768 - #, c-format - msgid "Source file is missing a [%s] group" - msgstr "Izvornoj datoteci nedostaje [%s] grupa" - --#: ../libedataserver/e-source.c:1128 -+#: ../libedataserver/e-source.c:1174 - #, c-format - msgid "Data source '%s' is not removable" - msgstr "Izvor podataka „%s“ se ne može ukloniti" - --#: ../libedataserver/e-source.c:1251 -+#: ../libedataserver/e-source.c:1297 - #, c-format - msgid "Data source '%s' is not writable" - msgstr "Izvor podtaka „%s“ nije upisiv" - --#: ../libedataserver/e-source.c:1864 -+#: ../libedataserver/e-source.c:1910 - msgid "Unnamed" - msgstr "Neimenovan" - --#: ../libedataserver/e-source-mail-signature.c:486 -+#: ../libedataserver/e-source-mail-signature.c:485 - #, c-format - msgid "Signature script must be a local file" - msgstr "Skripta potpisa mora da bude mesna datoteka" - - #: ../libedataserver/e-source-proxy.c:1646 - #, c-format --#| msgid "Data source '%s' does not support creating remote resources" - msgid "Source '%s' does not support proxy lookups" - msgstr "Izvor „%s“ ne podržava traženja posrednika" - --#: ../libedataserver/e-source-webdav.c:1551 -+#: ../libedataserver/e-source-webdav.c:1555 - #, c-format - msgid "" - "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " -@@ -5057,7 +5040,7 @@ msgstr "" - "SSL uverenje za domaćina „%s“, koje koristi adresar „%s“, nije od poverenja. " - "Da li želite da ga prihvatite?" - --#: ../libedataserver/e-source-webdav.c:1560 -+#: ../libedataserver/e-source-webdav.c:1564 - #, c-format - msgid "" - "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " -@@ -5066,7 +5049,7 @@ msgstr "" - "SSL uverenje za domaćina „%s“, koje koristi kalendar „%s“, nije od poverenja. " - "Da li želite da ga prihvatite?" - --#: ../libedataserver/e-source-webdav.c:1569 -+#: ../libedataserver/e-source-webdav.c:1573 - #, c-format - msgid "" - "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " -@@ -5075,7 +5058,7 @@ msgstr "" - "SSL uverenje za domaćina „%s“, koje koriste beleške „%s“, nije od poverenja. " - "Da li želite da ga prihvatite?" - --#: ../libedataserver/e-source-webdav.c:1578 -+#: ../libedataserver/e-source-webdav.c:1582 - #, c-format - msgid "" - "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " -@@ -5269,7 +5252,7 @@ msgstr "Nisam uspeo da pronađem element naloga" - msgid "Failed to find ASUrl and OABUrl in autodiscover response" - msgstr "Nisam uspeo da pronađem ASadresu i OABadresu u odgovoru samootkrivanja" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 - #, c-format - msgid "" - "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " -@@ -5278,18 +5261,23 @@ msgstr "" - "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ " - "sa koje bih dobio pristup za „%s“." - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 - #, c-format - msgid "Failed to obtain an access token for '%s': " - msgstr "Nisam uspeo da dobijem pristup za „%s“: " - --#: ../modules/google-backend/module-google-backend.c:191 -+#: ../modules/google-backend/module-google-backend.c:195 - #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 - #: ../modules/yahoo-backend/module-yahoo-backend.c:199 - msgid "Calendar" - msgstr "Kalendar" - --#: ../modules/google-backend/module-google-backend.c:260 -+#: ../modules/google-backend/module-google-backend.c:268 -+#: ../modules/yahoo-backend/module-yahoo-backend.c:226 -+msgid "Tasks" -+msgstr "Zaduženja" -+ -+#: ../modules/google-backend/module-google-backend.c:321 - #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 - #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 - msgid "Contacts" -@@ -5388,7 +5376,7 @@ msgstr "Pošta" - msgid "Integrate your mailboxes" - msgstr "Objedinite vaše sandučiće" - --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 - #, c-format - msgid "" - "Cannot find a corresponding account service in the accounts database from " -@@ -5400,7 +5388,6 @@ msgstr "" - #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 - #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 - #, c-format --#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" - msgid "" - "Expected status 200 when requesting your identity, instead got status %d (%s)" - msgstr "" -@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " - msgstr "Greška obrade odgovora kao JSON:" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'email' in JSON data" - msgstr "Nisam našao „email“ u JSON podacima" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'id' in JSON data" - msgstr "Nisam našao „id“ u JSON podacima" - - #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 --#| msgid "Didn't find email member in JSON data" - msgid "Didn't find 'emails.account' in JSON data" - msgstr "Nisam našao „emails.account“ u JSON podacima" - - #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 --#| msgid "Wants HTML Mail" - msgid "Windows Live Mail" - msgstr "Pošta Vindouza uživo" - -@@ -5440,10 +5423,6 @@ msgstr "Jahu! kalendar" - msgid "Yahoo! Mail" - msgstr "Jahu! pošta" - --#: ../modules/yahoo-backend/module-yahoo-backend.c:226 --msgid "Tasks" --msgstr "Zaduženja" -- - #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 - #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 - #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 -@@ -5500,6 +5479,10 @@ msgstr "Ne preseljavaj korisničke podatke iz prethodnih izdanja Evolucije" - msgid "_Dismiss" - msgstr "_Zanemari" - -+#~| msgid "No quota information available for folder '%s'" -+#~ msgid "No host information available" -+#~ msgstr "Nisu dostupni podaci o domaćinu" -+ - #~ msgid "You may not import keys with this cipher" - #~ msgstr "Možda nećete moći da uvezete ključeve sa ovim algoritmom" - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index e4120aa..61fb283 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -21,90 +21,90 @@ msgstr "" - "Project-Id-Version: evolution-data-server master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" --"POT-Creation-Date: 2014-01-23 12:42+0000\n" --"PO-Revision-Date: 2013-08-20 10:54+0800\n" --"Last-Translator: Luo Lei \n" -+"POT-Creation-Date: 2014-07-29 04:28+0000\n" -+"PO-Revision-Date: 2014-07-29 16:34+0800\n" -+"Last-Translator: Yunqiang Su \n" - "Language-Team: Chinese (simplified) \n" - "Language: zh_CN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Poedit 1.5.4\n" -+"X-Generator: Poedit 1.6.7\n" - --#: ../addressbook/backends/file/e-book-backend-file.c:117 -+#: ../addressbook/backends/file/e-book-backend-file.c:120 - #, c-format - msgid "Failed to remove file '%s': %s" - msgstr "删除文件“%s”失败：%s" - --#: ../addressbook/backends/file/e-book-backend-file.c:145 -+#: ../addressbook/backends/file/e-book-backend-file.c:148 - #, c-format - msgid "Failed to make directory %s: %s" - msgstr "创建目录“%s”失败：%s" - --#: ../addressbook/backends/file/e-book-backend-file.c:396 -+#: ../addressbook/backends/file/e-book-backend-file.c:419 - #, c-format - msgid "Failed to create hardlink for resource '%s': %s" - msgstr "创建资源“%s”的硬链接失败：%s" - --#: ../addressbook/backends/file/e-book-backend-file.c:501 --#: ../addressbook/backends/file/e-book-backend-file.c:1230 -+#: ../addressbook/backends/file/e-book-backend-file.c:524 -+#: ../addressbook/backends/file/e-book-backend-file.c:1253 - msgid "No UID in the contact" - msgstr "联系人没有 UID" - --#: ../addressbook/backends/file/e-book-backend-file.c:828 -+#: ../addressbook/backends/file/e-book-backend-file.c:851 - #, c-format - msgid "Conflicting UIDs found in added contacts" - msgstr "增加的联系人有 UID 冲突" - --#: ../addressbook/backends/file/e-book-backend-file.c:967 -+#: ../addressbook/backends/file/e-book-backend-file.c:990 - msgid "Loading..." - msgstr "正在载入..." - --#: ../addressbook/backends/file/e-book-backend-file.c:969 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425 -+#: ../addressbook/backends/file/e-book-backend-file.c:992 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 - msgid "Searching..." - msgstr "正在搜索..." - --#: ../addressbook/backends/file/e-book-backend-file.c:1258 -+#: ../addressbook/backends/file/e-book-backend-file.c:1281 - #, c-format - msgid "Tried to modify contact '%s' with out of sync revision" - msgstr "试图修改失去同步的联系人“%s”" - --#: ../addressbook/backends/file/e-book-backend-file.c:1449 --#: ../addressbook/backends/file/e-book-backend-file.c:1532 -+#: ../addressbook/backends/file/e-book-backend-file.c:1472 -+#: ../addressbook/backends/file/e-book-backend-file.c:1555 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 --#: ../addressbook/libedata-book/e-book-sqlite.c:6706 -+#: ../addressbook/libedata-book/e-book-sqlite.c:6711 - #, c-format - msgid "Contact '%s' not found" - msgstr "未找到联系人“%s”" - --#: ../addressbook/backends/file/e-book-backend-file.c:1592 --#: ../addressbook/backends/file/e-book-backend-file.c:1673 -+#: ../addressbook/backends/file/e-book-backend-file.c:1615 -+#: ../addressbook/backends/file/e-book-backend-file.c:1696 - #, c-format - msgid "Query '%s' not supported" - msgstr "不支持查询“%s”" - --#: ../addressbook/backends/file/e-book-backend-file.c:1601 --#: ../addressbook/backends/file/e-book-backend-file.c:1682 -+#: ../addressbook/backends/file/e-book-backend-file.c:1624 -+#: ../addressbook/backends/file/e-book-backend-file.c:1705 - #, c-format - msgid "Invalid Query '%s'" - msgstr "无效的查询：“%s”" - --#: ../addressbook/backends/file/e-book-backend-file.c:1947 -+#: ../addressbook/backends/file/e-book-backend-file.c:1970 - msgid "Requested to delete an unrelated cursor" - msgstr "请求删除一个无关的 cursor" - --#: ../addressbook/backends/file/e-book-backend-file.c:2014 -+#: ../addressbook/backends/file/e-book-backend-file.c:2041 - #, c-format - msgid "Failed to rename old database from '%s' to '%s': %s" - msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" - --#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 -+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 - #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 - #: ../addressbook/libebook-contacts/e-phone-number.c:56 - #: ../addressbook/libebook/e-book.c:1078 -@@ -119,67 +119,69 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" - #: ../addressbook/libebook/e-book-client.c:3175 - #: ../addressbook/libebook/e-book-client.c:3393 - #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 - #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 - #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 --#: ../calendar/libecal/e-cal-client.c:3237 --#: ../calendar/libecal/e-cal-client.c:3410 --#: ../calendar/libecal/e-cal-client.c:3674 --#: ../calendar/libecal/e-cal-client.c:3915 --#: ../calendar/libecal/e-cal-client.c:4103 --#: ../calendar/libecal/e-cal-client.c:4295 --#: ../calendar/libecal/e-cal-client.c:4465 --#: ../calendar/libecal/e-cal-client.c:4634 --#: ../calendar/libecal/e-cal-client.c:4837 --#: ../calendar/libecal/e-cal-client.c:4987 --#: ../calendar/libecal/e-cal-client.c:5181 --#: ../calendar/libecal/e-cal-client.c:5334 --#: ../calendar/libecal/e-cal-client.c:5551 --#: ../calendar/libecal/e-cal-client.c:5705 --#: ../calendar/libecal/e-cal-client.c:5931 --#: ../calendar/libecal/e-cal-client.c:6127 --#: ../calendar/libecal/e-cal-client.c:6490 --#: ../calendar/libecal/e-cal-client.c:6704 --#: ../camel/providers/imapx/camel-imapx-command.c:654 -+#: ../calendar/libecal/e-cal-client.c:3239 -+#: ../calendar/libecal/e-cal-client.c:3412 -+#: ../calendar/libecal/e-cal-client.c:3676 -+#: ../calendar/libecal/e-cal-client.c:3917 -+#: ../calendar/libecal/e-cal-client.c:4107 -+#: ../calendar/libecal/e-cal-client.c:4299 -+#: ../calendar/libecal/e-cal-client.c:4469 -+#: ../calendar/libecal/e-cal-client.c:4638 -+#: ../calendar/libecal/e-cal-client.c:4841 -+#: ../calendar/libecal/e-cal-client.c:4991 -+#: ../calendar/libecal/e-cal-client.c:5185 -+#: ../calendar/libecal/e-cal-client.c:5338 -+#: ../calendar/libecal/e-cal-client.c:5555 -+#: ../calendar/libecal/e-cal-client.c:5709 -+#: ../calendar/libecal/e-cal-client.c:5935 -+#: ../calendar/libecal/e-cal-client.c:6131 -+#: ../calendar/libecal/e-cal-client.c:6494 -+#: ../calendar/libecal/e-cal-client.c:6708 -+#: ../camel/providers/imapx/camel-imapx-command.c:645 -+#: ../camel/providers/imapx/camel-imapx-server.c:4769 -+#: ../camel/providers/imapx/camel-imapx-server.c:4778 - #: ../libedataserver/e-client.c:185 - msgid "Unknown error" - msgstr "未知的错误" - - #. Query for new contacts asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:836 -+#: ../addressbook/backends/google/e-book-backend-google.c:828 - msgid "Querying for updated contacts…" - msgstr "查询更新的联系人..." - - #. Run the query asynchronously --#: ../addressbook/backends/google/e-book-backend-google.c:988 -+#: ../addressbook/backends/google/e-book-backend-google.c:1010 - msgid "Querying for updated groups…" - msgstr "查询更新的组..." - --#: ../addressbook/backends/google/e-book-backend-google.c:1705 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268 -+#: ../addressbook/backends/google/e-book-backend-google.c:1757 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 - msgid "The backend does not support bulk additions" - msgstr "后端不支持批量添加" - --#: ../addressbook/backends/google/e-book-backend-google.c:1854 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370 -+#: ../addressbook/backends/google/e-book-backend-google.c:1912 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 - msgid "The backend does not support bulk modifications" - msgstr "后端不支持批量修改" - --#: ../addressbook/backends/google/e-book-backend-google.c:2054 --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462 -+#: ../addressbook/backends/google/e-book-backend-google.c:2119 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 - msgid "The backend does not support bulk removals" - msgstr "后端不支持批量删除" - --#: ../addressbook/backends/google/e-book-backend-google.c:2180 -+#: ../addressbook/backends/google/e-book-backend-google.c:2239 - msgid "Loading…" - msgstr "正在载入..." - - #. System Group: My Contacts --#: ../addressbook/backends/google/e-book-google-utils.c:1618 -+#: ../addressbook/backends/google/e-book-google-utils.c:1631 - #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 - #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 -@@ -188,129 +190,130 @@ msgid "Personal" - msgstr "个人" - - #. System Group: Friends --#: ../addressbook/backends/google/e-book-google-utils.c:1620 -+#: ../addressbook/backends/google/e-book-google-utils.c:1633 - msgid "Friends" - msgstr "朋友" - - #. System Group: Family --#: ../addressbook/backends/google/e-book-google-utils.c:1622 -+#: ../addressbook/backends/google/e-book-google-utils.c:1635 - msgid "Family" - msgstr "家人" - - #. System Group: Coworkers --#: ../addressbook/backends/google/e-book-google-utils.c:1624 -+#: ../addressbook/backends/google/e-book-google-utils.c:1637 - msgid "Coworkers" - msgstr "同事" - - #. Translators: An error message shown to a user when trying to do an - #. * operation on the LDAP address book which is not connected to the server --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 - msgid "Not connected" - msgstr "未连接。" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 - msgid "Failed to bind using either v3 or v2 binds" - msgstr "无法使用 v3 或 v2 绑定" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 - msgid "Reconnecting to LDAP server..." - msgstr "正在重新连接 LDAP 服务器..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 - msgid "Invalid DN syntax" - msgstr "无效 DN 语法" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 - #, c-format - msgid "LDAP error 0x%x (%s)" - msgstr "LDAP 错误 0x%x (%s)" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 - #, c-format - msgid "%s: NULL returned from ldap_first_entry" - msgstr "%s：ldap_first_entry 返回 NULL" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 - #, c-format - msgid "%s: Unhandled result type %d returned" - msgstr "%s：返回了未处理的结果类型 %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367 --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 - #, c-format - msgid "%s: Unhandled search result type %d returned" - msgstr "%s：返回了未处理的搜索结果类型 %d" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 - msgid "Receiving LDAP search results..." - msgstr "正在接收 LDAP 的搜索结果..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 - msgid "Error performing search" - msgstr "执行搜索错误" - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 - #, c-format - msgid "Downloading contacts (%d)..." - msgstr "正在下载联系人(%d)..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 - msgid "Adding contact to LDAP server..." - msgstr "正在将联系人添加到 LDAP 服务器..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 - msgid "Modifying contact from LDAP server..." - msgstr "正在修改 LDAP 服务器上的联系人..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 - msgid "Removing contact from LDAP server..." - msgstr "正在从 LDAP 服务器删除联系人..." - --#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669 -+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 - #, c-format - msgid "Failed to get the DN for user '%s'" - msgstr "无法获取用户“%s”的 DN" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 - msgid "Loading Addressbook summary..." - msgstr "正在加载地址簿概要..." - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 - #, c-format - msgid "PROPFIND on webdav failed with HTTP status %d (%s)" - msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 - msgid "No response body in webdav PROPFIND result" - msgstr "在 webdav PROPFIND 结果中无应答主体" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 - #, c-format - msgid "Loading Contacts (%d%%)" - msgstr "正在加载联系人(%d%%)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 - msgid "Cannot transform SoupURI to string" - msgstr "无法将 SoupURI 转为字符串" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 - #, c-format - msgid "Create resource '%s' failed with HTTP status %d (%s)" - msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 - msgid "Contact on server changed -> not modifying" - msgstr "服务器上的联系人已更改 -> 将不做更改" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 - #, c-format - msgid "Modify contact failed with HTTP status %d (%s)" - msgstr "修改联系人失败，HTTP 状态码：%d (%s)" - --#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 -+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 - #, c-format - msgid "DELETE failed with HTTP status %d" - msgstr "DELETE 失败，HTTP 状态码：%d" -@@ -914,8 +917,8 @@ msgstr "Google Talk 姓名列表" - msgid "Twitter Name List" - msgstr "Twitter 姓名列表" - --#: ../addressbook/libebook-contacts/e-contact.c:1635 --#: ../addressbook/libebook/e-destination.c:881 -+#: ../addressbook/libebook-contacts/e-contact.c:1654 -+#: ../addressbook/libebook/e-destination.c:920 - msgid "Unnamed List" - msgstr "未命名的列表" - -@@ -1008,7 +1011,7 @@ msgstr "缓存中没有保存完整的 search_contacts，无法返回电子名 - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 --#: ../addressbook/libedata-book/e-book-sqlite.c:5364 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5369 - #, c-format - msgid "Query contained unsupported elements" - msgstr "查询中包含不支持的元素" -@@ -1067,7 +1070,7 @@ msgid "Cannot sort by a field which may have multiple values" - msgstr "无法按可能有多个值的字段排序" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 --#: ../addressbook/libedata-book/e-book-sqlite.c:7376 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7381 - #, c-format - msgid "" - "Tried to step a cursor in reverse, but cursor is already at the beginning of " -@@ -1075,7 +1078,7 @@ msgid "" - msgstr "尝试对 cursor 反向步进，但 cursor 已位于联系人列表的开头" - - #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 --#: ../addressbook/libedata-book/e-book-sqlite.c:7384 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7389 - #, c-format - msgid "" - "Tried to step a cursor forwards, but cursor is already at the end of the " -@@ -1095,20 +1098,20 @@ msgstr "" - "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一" - "条记录。" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5357 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5362 - #, c-format - msgid "Invalid query: %s" - msgstr "无效的查询：%s" - --#: ../addressbook/libedata-book/e-book-sqlite.c:5532 -+#: ../addressbook/libedata-book/e-book-sqlite.c:5537 - msgid "Invalid query for EbSqlCursor" - msgstr "无效的 EbSqlCursor 查询" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7198 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7203 - msgid "At least one sort field must be specified to use an EbSqlCursor" - msgstr "要使用 EbSqlCursor 至少要指定一个排序字段" - --#: ../addressbook/libedata-book/e-book-sqlite.c:7216 -+#: ../addressbook/libedata-book/e-book-sqlite.c:7221 - msgid "Cannot sort by a field that is not a string type" - msgstr "无法按非字符串类型的字段排序" - -@@ -1316,31 +1319,35 @@ msgstr "缺少源 UID" - msgid "No such source for UID '%s'" - msgstr "没有 UID “%s”的源" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 - #, c-format - msgid "Server is unreachable (%s)" - msgstr "服务器不可用 (%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 - #, c-format - msgid "Failed to connect to a server using SSL: %s" - msgstr "无法使用 SSL 连接到服务器：%s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 - #, c-format - msgid "Unexpected HTTP status code %d returned (%s)" - msgstr "返回了意外的 HTTP 状态代码 %d(%s)" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 - msgid "CalDAV backend is not loaded yet" - msgstr "CalDAV 后端尚未加载" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 - msgid "Invalid Redirect URL" - msgstr "无效的重定向 URL" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 -+#, c-format -+msgid "Cannot create local cache folder '%s'" -+msgstr "无法创建本地缓存文件夹“%s”" -+ -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 - #, c-format - msgid "" - "Server is unreachable, calendar is opened in read-only mode.\n" -@@ -1349,32 +1356,27 @@ msgstr "" - "服务器不可用，日历将以只读模式打开。\n" - "错误消息：%s" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 --#, c-format --msgid "Cannot create local cache folder '%s'" --msgstr "无法创建本地缓存文件夹“%s”" -- --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 - msgid "CalDAV does not support bulk additions" - msgstr "CalDAV 不支持批量添加" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 - msgid "CalDAV does not support bulk modifications" - msgstr "CalDAV 不支持批量修改" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 - msgid "CalDAV does not support bulk removals" - msgstr "CalDAV 不支持批量删除" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 - msgid "Calendar doesn't support Free/Busy" - msgstr "日历不支持空闲/繁忙" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 - msgid "Schedule outbox url not found" - msgstr "未找到定时发件箱 url" - --#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 -+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 - msgid "Unexpected result in schedule-response" - msgstr "定时响应的结果异常" - -@@ -1401,27 +1403,27 @@ msgstr "无法保存日历数据：URI 格式错误。" - msgid "Cannot save calendar data" - msgstr "无法保存日历数据" - --#: ../calendar/backends/http/e-cal-backend-http.c:483 -+#: ../calendar/backends/http/e-cal-backend-http.c:491 - #, c-format - msgid "Malformed URI: %s" - msgstr "URI 格式错误：%s" - --#: ../calendar/backends/http/e-cal-backend-http.c:574 -+#: ../calendar/backends/http/e-cal-backend-http.c:582 - #, c-format - msgid "Redirected to Invalid URI" - msgstr "已重定向到无效 URI" - --#: ../calendar/backends/http/e-cal-backend-http.c:617 -+#: ../calendar/backends/http/e-cal-backend-http.c:625 - #, c-format - msgid "Bad file format." - msgstr "无效的文件格式。" - --#: ../calendar/backends/http/e-cal-backend-http.c:627 -+#: ../calendar/backends/http/e-cal-backend-http.c:635 - #, c-format - msgid "Not a calendar." - msgstr "不是日历。" - --#: ../calendar/backends/http/e-cal-backend-http.c:914 -+#: ../calendar/backends/http/e-cal-backend-http.c:925 - #: ../calendar/backends/weather/e-cal-backend-weather.c:536 - msgid "Could not create cache file" - msgstr "无法创建缓存文件" -@@ -2049,94 +2051,94 @@ msgstr "(system-flag)参数无效" - msgid "Invalid arguments to (user-tag)" - msgstr "(user-tag)参数无效" - --#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 -+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 - #, c-format - msgid "Error executing filter search: %s: %s" - msgstr "执行过滤规则搜索错误：%s：%s" - --#: ../camel/camel-folder.c:300 -+#: ../camel/camel-folder.c:323 - #, c-format - msgid "Learning new spam message in '%s'" - msgid_plural "Learning new spam messages in '%s'" - msgstr[0] "在“%s”中学习新的垃圾邮件" - --#: ../camel/camel-folder.c:340 -+#: ../camel/camel-folder.c:363 - #, c-format - msgid "Learning new ham message in '%s'" - msgid_plural "Learning new ham messages in '%s'" - msgstr[0] "在“%s”中学习新的有害邮件" - --#: ../camel/camel-folder.c:388 -+#: ../camel/camel-folder.c:411 - #, c-format - msgid "Filtering new message in '%s'" - msgid_plural "Filtering new messages in '%s'" - msgstr[0] "在“%s”中过滤新消息" - --#: ../camel/camel-folder.c:988 --#: ../camel/providers/local/camel-maildir-folder.c:319 -+#: ../camel/camel-folder.c:1011 -+#: ../camel/providers/local/camel-maildir-folder.c:330 - msgid "Moving messages" - msgstr "移动消息" - --#: ../camel/camel-folder.c:991 -+#: ../camel/camel-folder.c:1014 - msgid "Copying messages" - msgstr "复制消息" - --#: ../camel/camel-folder.c:1033 -+#: ../camel/camel-folder.c:1056 - #, c-format - msgid "Quota information not supported for folder '%s'" - msgstr "文件夹“%s”不支持配额信息" - --#: ../camel/camel-folder.c:2847 -+#: ../camel/camel-folder.c:2862 - #, c-format - msgid "Expunging folder '%s'" - msgstr "正在销毁文件夹“%s”" - --#: ../camel/camel-folder.c:2975 -+#: ../camel/camel-folder.c:2990 - #, c-format - msgid "Retrieving message '%s' in %s" - msgstr "正在获取 %2$s 中的消息“%1$s”" - --#: ../camel/camel-folder.c:3166 -+#: ../camel/camel-folder.c:3181 - #, c-format - msgid "Retrieving quota information for '%s'" - msgstr "正在获取“%s”的配额信息" - --#: ../camel/camel-folder.c:3466 -+#: ../camel/camel-folder.c:3478 - #, c-format - msgid "Refreshing folder '%s'" - msgstr "正在刷新文件夹“%s”" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 -+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 - #, c-format - msgid "(%s) requires a single bool result" - msgstr "(%s) 需要一个布尔结果" - - #. Translators: Each '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:964 -+#: ../camel/camel-folder-search.c:976 - #, c-format - msgid "(%s) not allowed inside %s" - msgstr "(%s) 不允许在 %s 中使用" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 -+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 - #, c-format - msgid "(%s) requires a match type string" - msgstr "(%s) 需要一个匹配类型字符串" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1007 -+#: ../camel/camel-folder-search.c:1019 - #, c-format - msgid "(%s) expects an array result" - msgstr "(%s) 需要一个数组结果" - - #. Translators: The '%s' is an element type name, part of an expressing language --#: ../camel/camel-folder-search.c:1017 -+#: ../camel/camel-folder-search.c:1029 - #, c-format - msgid "(%s) requires the folder set" - msgstr "(%s) 需要文件夹集" - --#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 -+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 - #, c-format - msgid "" - "Cannot parse search expression: %s:\n" -@@ -2145,7 +2147,7 @@ msgstr "" - "无法解析搜索表达式：%s：\n" - "%s" - --#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 -+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 - #, c-format - msgid "" - "Error executing search expression: %s:\n" -@@ -2379,17 +2381,17 @@ msgstr "写入邮件临时文件错误：%s" - msgid "Error copying mail temp file: %s" - msgstr "复制邮件临时文件错误：%s" - --#: ../camel/camel-multipart-signed.c:279 -+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432 - #, c-format - msgid "No content available" - msgstr "没有可用的内容" - --#: ../camel/camel-multipart-signed.c:287 -+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440 - #, c-format - msgid "No signature available" - msgstr "没有可用的签名" - --#: ../camel/camel-multipart-signed.c:636 -+#: ../camel/camel-multipart-signed.c:806 - #, c-format - msgid "parse error" - msgstr "解析错误" -@@ -2413,10 +2415,6 @@ msgstr "主机“%s”查找失败，请检查主机名是否存在拼写错误 - msgid "Host lookup '%s' failed: %s" - msgstr "查找主机“%s”失败：%s" - --#: ../camel/camel-network-service.c:1009 --msgid "No host information available" --msgstr "无可用的主机信息" -- - #: ../camel/camel-offline-folder.c:90 - msgid "Downloading new messages for offline mode" - msgstr "下载新消息以进行离线操作" -@@ -2680,7 +2678,7 @@ msgid "Invalid GType registered for protocol '%s'" - msgstr "为协议“%s”注册的 GType 无效" - - #: ../camel/camel-session.c:502 --#: ../camel/providers/imapx/camel-imapx-server.c:4629 -+#: ../camel/providers/imapx/camel-imapx-server.c:4719 - #: ../camel/providers/pop3/camel-pop3-store.c:311 - #: ../camel/providers/pop3/camel-pop3-store.c:757 - #: ../camel/providers/smtp/camel-smtp-transport.c:515 -@@ -2887,49 +2885,44 @@ msgstr "将数据添加到编码器失败" - msgid "S/MIME Decrypt: No encrypted content found" - msgstr "S/MIME 解密：没有找到加密内容" - --#: ../camel/camel-store.c:1201 --#, c-format --msgid "Cannot create folder '%s': folder exists" --msgstr "无法创建文件夹“%s”文件夹已存在" -- --#: ../camel/camel-store.c:1244 -+#: ../camel/camel-store.c:1232 - #, c-format - msgid "Opening folder '%s'" - msgstr "打开文件夹“%s”" - --#: ../camel/camel-store.c:1471 -+#: ../camel/camel-store.c:1523 - #, c-format - msgid "Scanning folders in '%s'" - msgstr "扫描“%s”中的文件夹" - --#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544 -+#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596 - #: ../camel/camel-vtrash-folder.c:46 - msgid "Trash" - msgstr "回收站" - --#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561 -+#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613 - #: ../camel/camel-vtrash-folder.c:48 - msgid "Junk" - msgstr "垃圾" - --#: ../camel/camel-store.c:2162 -+#: ../camel/camel-store.c:2214 - #, c-format - msgid "Cannot create folder: %s: folder exists" - msgstr "无法创建文件夹：%s：文件夹已存在" - --#: ../camel/camel-store.c:2169 -+#: ../camel/camel-store.c:2221 - #, c-format - msgid "Creating folder '%s'" - msgstr "创建文件夹“%s”" - --#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416 --#: ../camel/providers/local/camel-maildir-store.c:320 -+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 -+#: ../camel/providers/local/camel-maildir-store.c:321 - #, c-format - msgid "Cannot delete folder: %s: Invalid operation" - msgstr "无法删除文件夹：%s：无效操作" - --#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467 --#: ../camel/providers/local/camel-maildir-store.c:851 -+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 -+#: ../camel/providers/local/camel-maildir-store.c:872 - #, c-format - msgid "Cannot rename folder: %s: Invalid operation" - msgstr "无法重命名文件夹：%s：无效操作" -@@ -3002,17 +2995,17 @@ msgstr "自动更新源文件夹中的更改(_U)" - msgid "Unmatched" - msgstr "无匹配" - --#: ../camel/camel-vee-store.c:442 -+#: ../camel/camel-vee-store.c:436 - #, c-format - msgid "Cannot delete folder: %s: No such folder" - msgstr "无法删除文件夹：%s：没有该文件夹" - --#: ../camel/camel-vee-store.c:477 -+#: ../camel/camel-vee-store.c:471 - #, c-format - msgid "Cannot rename folder: %s: No such folder" - msgstr "无法重命名文件夹：%s：没有该文件夹" - --#: ../camel/camel-vee-store.c:539 -+#: ../camel/camel-vee-store.c:533 - msgid "Enable _Unmatched folder" - msgstr "启用不匹配的文件夹(_U)" - -@@ -3024,45 +3017,50 @@ msgstr "无法将消息复制到回收站文件夹" - msgid "Cannot copy messages to the Junk folder" - msgstr "无法将消息复制到垃圾邮件文件夹" - --#: ../camel/providers/imapx/camel-imapx-folder.c:654 -+#: ../camel/providers/imapx/camel-imapx-folder.c:796 - #, c-format - msgid "No quota information available for folder '%s'" - msgstr "文件夹“%s”配额信息未定义" - --#: ../camel/providers/imapx/camel-imapx-folder.c:768 --#: ../camel/providers/imapx/camel-imapx-folder.c:861 -+#: ../camel/providers/imapx/camel-imapx-folder.c:936 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1029 - #, c-format - msgid "No destination folder specified" - msgstr "目标文件夹未指定" - --#: ../camel/providers/imapx/camel-imapx-folder.c:796 -+#: ../camel/providers/imapx/camel-imapx-folder.c:964 - msgid "Unable to move junk messages" - msgstr "无法移动垃圾信息" - --#: ../camel/providers/imapx/camel-imapx-folder.c:889 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1057 - msgid "Unable to move deleted messages" - msgstr "无法移动已删除信息" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1115 --#: ../camel/providers/nntp/camel-nntp-folder.c:758 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1374 -+#: ../camel/providers/nntp/camel-nntp-folder.c:760 - msgid "Apply message _filters to this folder" - msgstr "对这个文件夹应用消息过滤器(_F)" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1221 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1485 - #, c-format - msgid "Could not create folder summary for %s" - msgstr "无法为 %s 创建文件夹概要" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1230 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1494 - #, c-format - msgid "Could not create cache for %s: " - msgstr "无法为 %s 创建缓存：" - --#: ../camel/providers/imapx/camel-imapx-folder.c:1415 -+#: ../camel/providers/imapx/camel-imapx-folder.c:1709 - #, c-format - msgid "No IMAP mailbox available for folder '%s'" - msgstr "文件夹“%s”没有可用的 IMAP 邮箱" - -+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 -+#, c-format -+msgid "Source stream returned no data" -+msgstr "源流没返回数据" -+ - #: ../camel/providers/imapx/camel-imapx-provider.c:38 - msgid "Checking for New Mail" - msgstr "检查新邮件" -@@ -3084,23 +3082,33 @@ msgid "_Listen for server change notifications" - msgstr "监听服务器变化提醒(_L)" - - #: ../camel/providers/imapx/camel-imapx-provider.c:49 -+#| msgid "Lost connection to IMAP server" -+msgid "Connection to Server" -+msgstr "到服务器的连接" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+#| msgid "Numbe_r of cached connections to use" -+msgid "Numbe_r of concurrent connections to use" -+msgstr "使用的并发连接的数目(_R)" -+ -+#: ../camel/providers/imapx/camel-imapx-provider.c:54 - #: ../camel/providers/nntp/camel-nntp-provider.c:44 - msgid "Folders" - msgstr "文件夹" - --#: ../camel/providers/imapx/camel-imapx-provider.c:51 -+#: ../camel/providers/imapx/camel-imapx-provider.c:56 - msgid "_Show only subscribed folders" - msgstr "只显示订阅了的文件夹(_S)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:54 -+#: ../camel/providers/imapx/camel-imapx-provider.c:59 - msgid "O_verride server-supplied folder namespace" - msgstr "覆盖服务器提供的文件夹命名空间(_V)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:56 -+#: ../camel/providers/imapx/camel-imapx-provider.c:61 - msgid "Namespace:" - msgstr "命名空间：" - --#: ../camel/providers/imapx/camel-imapx-provider.c:59 -+#: ../camel/providers/imapx/camel-imapx-provider.c:64 - #: ../camel/providers/local/camel-local-provider.c:39 - #: ../camel/providers/local/camel-local-provider.c:79 - #: ../camel/providers/local/camel-local-provider.c:99 -@@ -3108,311 +3116,297 @@ msgstr "命名空间：" - msgid "Options" - msgstr "选项" - --#: ../camel/providers/imapx/camel-imapx-provider.c:61 -+#: ../camel/providers/imapx/camel-imapx-provider.c:66 - #: ../camel/providers/nntp/camel-nntp-provider.c:41 - msgid "Apply _filters to new messages in all folders" - msgstr "对所有文件夹中的新消息应用过滤规则(_F)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:63 -+#: ../camel/providers/imapx/camel-imapx-provider.c:68 - msgid "_Apply filters to new messages in Inbox on this server" - msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:65 -+#: ../camel/providers/imapx/camel-imapx-provider.c:70 - msgid "Check new messages for _Junk contents" - msgstr "检查新消息的垃圾内容(_J)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:67 -+#: ../camel/providers/imapx/camel-imapx-provider.c:72 - msgid "Only check for Junk messages in the IN_BOX folder" - msgstr "仅在收件箱中检查垃圾邮件(_B)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:69 -+#: ../camel/providers/imapx/camel-imapx-provider.c:74 - msgid "Automatically synchroni_ze remote mail locally" - msgstr "自动将远程邮件同步到本地(_Z)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:75 -+#: ../camel/providers/imapx/camel-imapx-provider.c:80 - msgid "Default IMAP port" - msgstr "默认的 IMAP 端口" - --#: ../camel/providers/imapx/camel-imapx-provider.c:76 -+#: ../camel/providers/imapx/camel-imapx-provider.c:81 - msgid "IMAP over SSL" - msgstr "IMAP (SSL 加密)" - --#: ../camel/providers/imapx/camel-imapx-provider.c:83 -+#: ../camel/providers/imapx/camel-imapx-provider.c:88 - msgid "IMAP+" - msgstr "IMAP+" - --#: ../camel/providers/imapx/camel-imapx-provider.c:85 -+#: ../camel/providers/imapx/camel-imapx-provider.c:90 - msgid "For reading and storing mail on IMAP servers." - msgstr "IMAP 服务器上的邮件的读写。" - --#: ../camel/providers/imapx/camel-imapx-server.c:819 -+#: ../camel/providers/imapx/camel-imapx-server.c:1009 -+#: ../camel/providers/imapx/camel-imapx-server.c:1016 - #, c-format - msgid "Not authenticated" - msgstr "没有验证" - --#: ../camel/providers/imapx/camel-imapx-server.c:1763 -+#: ../camel/providers/imapx/camel-imapx-server.c:1713 - msgid "Server disconnected" - msgstr "服务器断开连接" - --#: ../camel/providers/imapx/camel-imapx-server.c:2226 -+#: ../camel/providers/imapx/camel-imapx-server.c:2205 - msgid "Error writing to cache stream" - msgstr "写入缓存流错误" - --#: ../camel/providers/imapx/camel-imapx-server.c:3596 -+#: ../camel/providers/imapx/camel-imapx-server.c:3550 - msgid "Error performing IDLE" - msgstr "执行 IDLE 命令出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:4490 -+#: ../camel/providers/imapx/camel-imapx-server.c:4558 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: %s" - msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" - --#: ../camel/providers/imapx/camel-imapx-server.c:4491 -+#: ../camel/providers/imapx/camel-imapx-server.c:4559 - #: ../camel/providers/smtp/camel-smtp-transport.c:215 - msgid "STARTTLS not supported" - msgstr "不支持 STARTTLS" - --#: ../camel/providers/imapx/camel-imapx-server.c:4538 -+#: ../camel/providers/imapx/camel-imapx-server.c:4619 - #, c-format - msgid "Failed to connect to IMAP server %s in secure mode: " - msgstr "以安全模式连接到 IMAP 服务器 %s 失败：" - --#: ../camel/providers/imapx/camel-imapx-server.c:4618 -+#: ../camel/providers/imapx/camel-imapx-server.c:4708 - #, c-format - msgid "IMAP server %s does not support %s authentication" - msgstr "IMAP 服务器 %s 不支持 %s 认证" - --#: ../camel/providers/imapx/camel-imapx-server.c:4648 -+#: ../camel/providers/imapx/camel-imapx-server.c:4738 - #: ../camel/providers/nntp/camel-nntp-store.c:394 - #: ../camel/providers/nntp/camel-nntp-store.c:531 - msgid "Cannot authenticate without a username" - msgstr "无法进行无用户名的认证" - --#: ../camel/providers/imapx/camel-imapx-server.c:4657 -+#: ../camel/providers/imapx/camel-imapx-server.c:4747 - #: ../camel/providers/nntp/camel-nntp-store.c:540 - #: ../camel/providers/pop3/camel-pop3-store.c:678 - #: ../camel/providers/pop3/camel-pop3-store.c:699 - msgid "Authentication password not available" - msgstr "密码认证不可用" - --#: ../camel/providers/imapx/camel-imapx-server.c:4908 -+#: ../camel/providers/imapx/camel-imapx-server.c:4983 -+#: ../camel/providers/imapx/camel-imapx-server.c:5042 - msgid "Error fetching message" - msgstr "取回消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:4954 --#: ../camel/providers/imapx/camel-imapx-server.c:4961 -+#: ../camel/providers/imapx/camel-imapx-server.c:5035 - msgid "Failed to close the tmp stream" - msgstr "无法关闭临时流" - --#: ../camel/providers/imapx/camel-imapx-server.c:4996 -+#: ../camel/providers/imapx/camel-imapx-server.c:5071 - msgid "Failed to copy the tmp file" - msgstr "无法复制临时文件" - --#: ../camel/providers/imapx/camel-imapx-server.c:5122 -+#: ../camel/providers/imapx/camel-imapx-server.c:5212 - msgid "Error moving messages" - msgstr "移动消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:5126 -+#: ../camel/providers/imapx/camel-imapx-server.c:5216 - msgid "Error copying messages" - msgstr "复制消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:5285 -+#: ../camel/providers/imapx/camel-imapx-server.c:5438 - msgid "Error appending message" - msgstr "追加消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:5479 -+#: ../camel/providers/imapx/camel-imapx-server.c:5674 - msgid "Error fetching message headers" - msgstr "取回消息头出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:5644 -+#: ../camel/providers/imapx/camel-imapx-server.c:5841 - msgid "Error retrieving message" - msgstr "收取消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:5774 --#: ../camel/providers/imapx/camel-imapx-server.c:5997 -+#: ../camel/providers/imapx/camel-imapx-server.c:5975 -+#: ../camel/providers/imapx/camel-imapx-server.c:6204 - #, c-format - msgid "Fetching summary information for new messages in '%s'" - msgstr "获取“%s”中新消息的概要信息" - --#: ../camel/providers/imapx/camel-imapx-server.c:5826 -+#: ../camel/providers/imapx/camel-imapx-server.c:6027 - #, c-format - msgid "Scanning for changed messages in '%s'" - msgstr "扫描“%s”中更改了的消息" - --#: ../camel/providers/imapx/camel-imapx-server.c:5878 -+#: ../camel/providers/imapx/camel-imapx-server.c:6079 - msgid "Error fetching new messages" - msgstr "取回新消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6146 -+#: ../camel/providers/imapx/camel-imapx-server.c:6352 - msgid "Error refreshing folder" - msgstr "刷新文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6296 -+#: ../camel/providers/imapx/camel-imapx-server.c:6502 - msgid "Error expunging message" - msgstr "销毁消息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6405 --#: ../camel/providers/imapx/camel-imapx-server.c:6430 -+#: ../camel/providers/imapx/camel-imapx-server.c:6617 -+#: ../camel/providers/imapx/camel-imapx-server.c:6642 - msgid "Error fetching folders" - msgstr "取回文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6510 -+#: ../camel/providers/imapx/camel-imapx-server.c:6722 - msgid "Error creating folder" - msgstr "创建文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6562 -+#: ../camel/providers/imapx/camel-imapx-server.c:6774 - msgid "Error deleting folder" - msgstr "删除文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6629 -+#: ../camel/providers/imapx/camel-imapx-server.c:6850 - msgid "Error renaming folder" - msgstr "重命名文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6716 -+#: ../camel/providers/imapx/camel-imapx-server.c:6924 - msgid "Error subscribing to folder" - msgstr "订阅文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6776 -+#: ../camel/providers/imapx/camel-imapx-server.c:6990 - msgid "Error unsubscribing from folder" - msgstr "取消订阅文件夹出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6832 -+#: ../camel/providers/imapx/camel-imapx-server.c:7052 - msgid "Error retrieving quota information" - msgstr "获取配额信息出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:6884 -+#: ../camel/providers/imapx/camel-imapx-server.c:7104 - msgid "Search failed" - msgstr "搜索失败" - --#: ../camel/providers/imapx/camel-imapx-server.c:6946 -+#: ../camel/providers/imapx/camel-imapx-server.c:7166 - msgid "Error performing NOOP" - msgstr "执行 NOOP 出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:7053 -+#: ../camel/providers/imapx/camel-imapx-server.c:7273 - msgid "Error syncing changes" - msgstr "同步变更出错" - --#: ../camel/providers/imapx/camel-imapx-server.c:7340 --msgid "Lost connection to IMAP server" --msgstr "与 IMAP 服务器的连接中断" -- --#: ../camel/providers/imapx/camel-imapx-server.c:8190 -+#: ../camel/providers/imapx/camel-imapx-server.c:8258 - #, c-format - msgid "Cannot get message with message ID %s: %s" - msgstr "无法获取消息 ID %s：%s" - --#: ../camel/providers/imapx/camel-imapx-server.c:8191 -+#: ../camel/providers/imapx/camel-imapx-server.c:8259 - msgid "No such message available." - msgstr "没有该消息。" - --#: ../camel/providers/imapx/camel-imapx-server.c:8390 --#: ../camel/providers/imapx/camel-imapx-server.c:8405 -+#: ../camel/providers/imapx/camel-imapx-server.c:8466 -+#: ../camel/providers/imapx/camel-imapx-server.c:8487 - msgid "Cannot create spool file: " - msgstr "无法创建离线文件：" - --#: ../camel/providers/imapx/camel-imapx-server.c:9110 -+#: ../camel/providers/imapx/camel-imapx-server.c:9228 - msgid "IMAP server does not support quotas" - msgstr "IMAP 服务器不支持配额" - - #. create a dummy "." parent inbox, use to scan, then put back at the top level --#: ../camel/providers/imapx/camel-imapx-store.c:207 --#: ../camel/providers/local/camel-maildir-folder.c:471 --#: ../camel/providers/local/camel-maildir-store.c:321 --#: ../camel/providers/local/camel-maildir-store.c:763 --#: ../camel/providers/local/camel-maildir-store.c:769 --#: ../camel/providers/local/camel-maildir-store.c:852 -+#: ../camel/providers/imapx/camel-imapx-store.c:223 -+#: ../camel/providers/local/camel-maildir-folder.c:482 -+#: ../camel/providers/local/camel-maildir-store.c:322 -+#: ../camel/providers/local/camel-maildir-store.c:784 -+#: ../camel/providers/local/camel-maildir-store.c:790 -+#: ../camel/providers/local/camel-maildir-store.c:873 - #: ../camel/providers/local/camel-spool-store.c:393 - msgid "Inbox" - msgstr "收件箱" - --#: ../camel/providers/imapx/camel-imapx-store.c:823 -+#: ../camel/providers/imapx/camel-imapx-store.c:758 - #, c-format - msgid "IMAP server %s" - msgstr "IMAP 服务器 %s" - --#: ../camel/providers/imapx/camel-imapx-store.c:826 -+#: ../camel/providers/imapx/camel-imapx-store.c:761 - #, c-format - msgid "IMAP service for %s on %s" - msgstr "%2$s 为 %1$s 提供的 IMAP 服务" - --#: ../camel/providers/imapx/camel-imapx-store.c:1035 -+#: ../camel/providers/imapx/camel-imapx-store.c:836 - #: ../camel/providers/nntp/camel-nntp-provider.c:93 - #: ../camel/providers/pop3/camel-pop3-provider.c:81 - msgid "Password" - msgstr "密码" - --#: ../camel/providers/imapx/camel-imapx-store.c:1037 -+#: ../camel/providers/imapx/camel-imapx-store.c:838 - msgid "This option will connect to the IMAP server using a plaintext password." - msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。" - --#: ../camel/providers/imapx/camel-imapx-store.c:1062 --#: ../camel/providers/imapx/camel-imapx-store.c:2600 --#: ../camel/providers/nntp/camel-nntp-store.c:1250 --#: ../camel/providers/pop3/camel-pop3-folder.c:450 --#: ../camel/providers/pop3/camel-pop3-folder.c:593 --#: ../camel/providers/pop3/camel-pop3-folder.c:789 --#: ../camel/providers/pop3/camel-pop3-folder.c:987 --#: ../camel/providers/pop3/camel-pop3-store.c:299 --#: ../camel/providers/pop3/camel-pop3-store.c:528 --#: ../camel/providers/pop3/camel-pop3-store.c:576 --#: ../camel/providers/pop3/camel-pop3-store.c:668 --#: ../camel/providers/pop3/camel-pop3-store.c:1072 --#, c-format --msgid "You must be working online to complete this operation" --msgstr "您必须在线工作以便完成该操作" -- --#: ../camel/providers/imapx/camel-imapx-store.c:1129 -+#: ../camel/providers/imapx/camel-imapx-store.c:913 - #, c-format - msgid "No such folder %s" - msgstr "没有文件夹 %s" - --#: ../camel/providers/imapx/camel-imapx-store.c:1524 -+#: ../camel/providers/imapx/camel-imapx-store.c:1324 - #, c-format - msgid "No IMAP namespace for folder path '%s'" - msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间" - --#: ../camel/providers/imapx/camel-imapx-store.c:1673 -+#: ../camel/providers/imapx/camel-imapx-store.c:1472 - #, c-format - msgid "Retrieving folder list for %s" - msgstr "正在获取“%s”的文件夹列表" - --#: ../camel/providers/imapx/camel-imapx-store.c:2079 -+#: ../camel/providers/imapx/camel-imapx-store.c:1924 - #, c-format - msgid "" - "The folder name \"%s\" is invalid because it contains the character \"%c\"" - msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" - --#: ../camel/providers/imapx/camel-imapx-stream.c:96 --#, c-format --msgid "Source stream returned no data" --msgstr "源流没返回数据" -- --#: ../camel/providers/imapx/camel-imapx-stream.c:105 -+#: ../camel/providers/imapx/camel-imapx-store.c:2689 -+#: ../camel/providers/nntp/camel-nntp-store.c:1250 -+#: ../camel/providers/pop3/camel-pop3-folder.c:450 -+#: ../camel/providers/pop3/camel-pop3-folder.c:593 -+#: ../camel/providers/pop3/camel-pop3-folder.c:789 -+#: ../camel/providers/pop3/camel-pop3-folder.c:987 -+#: ../camel/providers/pop3/camel-pop3-store.c:299 -+#: ../camel/providers/pop3/camel-pop3-store.c:528 -+#: ../camel/providers/pop3/camel-pop3-store.c:576 -+#: ../camel/providers/pop3/camel-pop3-store.c:668 -+#: ../camel/providers/pop3/camel-pop3-store.c:1072 - #, c-format --msgid "Source stream unavailable" --msgstr "源流不可用" -+msgid "You must be working online to complete this operation" -+msgstr "您必须在线工作以便完成该操作" - --#: ../camel/providers/local/camel-local-folder.c:192 -+#: ../camel/providers/local/camel-local-folder.c:195 - #, c-format - msgid "~%s (%s)" - msgstr "~%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:202 --#: ../camel/providers/local/camel-local-folder.c:211 -+#: ../camel/providers/local/camel-local-folder.c:205 -+#: ../camel/providers/local/camel-local-folder.c:214 - #, c-format - msgid "mailbox: %s (%s)" - msgstr "邮件箱：%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:220 -+#: ../camel/providers/local/camel-local-folder.c:223 - #, c-format - msgid "%s (%s)" - msgstr "%s (%s)" - --#: ../camel/providers/local/camel-local-folder.c:497 -+#: ../camel/providers/local/camel-local-folder.c:500 - msgid "_Index message body data" - msgstr "索引消息正文(_I)" - --#: ../camel/providers/local/camel-local-folder.c:725 -+#: ../camel/providers/local/camel-local-folder.c:730 - #, c-format - msgid "" - "Cannot get message %s from folder %s\n" -@@ -3492,7 +3486,7 @@ msgstr "本地邮件文件 %s" - #: ../camel/providers/local/camel-local-store.c:221 - #: ../camel/providers/local/camel-local-store.c:381 - #: ../camel/providers/local/camel-maildir-store.c:122 --#: ../camel/providers/local/camel-mbox-store.c:579 -+#: ../camel/providers/local/camel-mbox-store.c:572 - #: ../camel/providers/local/camel-spool-store.c:87 - #, c-format - msgid "Store root %s is not an absolute path" -@@ -3506,7 +3500,7 @@ msgstr "存储根目录 %s 不是普通目录" - #: ../camel/providers/local/camel-local-store.c:242 - #: ../camel/providers/local/camel-local-store.c:252 - #: ../camel/providers/local/camel-local-store.c:394 --#: ../camel/providers/local/camel-maildir-store.c:150 -+#: ../camel/providers/local/camel-maildir-store.c:156 - #, c-format - msgid "Cannot get folder: %s: %s" - msgstr "无法获取文件夹：%s：%s" -@@ -3517,13 +3511,13 @@ msgid "Local stores do not have an inbox" - msgstr "本地存储没有收件箱" - - #: ../camel/providers/local/camel-local-store.c:454 --#: ../camel/providers/local/camel-mbox-store.c:746 -+#: ../camel/providers/local/camel-mbox-store.c:739 - #, c-format - msgid "Could not delete folder index file '%s': %s" - msgstr "无法删除文件夹索引文件“%s”：%s" - - #: ../camel/providers/local/camel-local-store.c:482 --#: ../camel/providers/local/camel-mbox-store.c:776 -+#: ../camel/providers/local/camel-mbox-store.c:769 - #, c-format - msgid "Could not delete folder meta file '%s': %s" - msgstr "无法删除文件夹元文件“%s”：%s" -@@ -3533,86 +3527,80 @@ msgstr "无法删除文件夹元文件“%s”：%s" - msgid "Could not rename '%s': %s" - msgstr "无法重命名“%s”：%s" - --#: ../camel/providers/local/camel-maildir-folder.c:98 --#: ../camel/providers/local/camel-maildir-folder.c:333 --#: ../camel/providers/local/camel-mbox-folder.c:115 --#: ../camel/providers/local/camel-mbox-folder.c:328 -+#: ../camel/providers/local/camel-maildir-folder.c:109 -+#: ../camel/providers/local/camel-maildir-folder.c:344 -+#: ../camel/providers/local/camel-mbox-folder.c:126 -+#: ../camel/providers/local/camel-mbox-folder.c:339 - #: ../camel/providers/local/camel-mh-folder.c:157 - msgid "No such message" - msgstr "没有该消息" - --#: ../camel/providers/local/camel-maildir-folder.c:223 -+#: ../camel/providers/local/camel-maildir-folder.c:234 - #, c-format - msgid "Cannot append message to maildir folder: %s: " - msgstr "无法将消息附加到邮件目录文件夹：%s：" - --#: ../camel/providers/local/camel-maildir-folder.c:271 --#: ../camel/providers/local/camel-maildir-folder.c:281 --#: ../camel/providers/local/camel-mbox-folder.c:389 -+#: ../camel/providers/local/camel-maildir-folder.c:282 -+#: ../camel/providers/local/camel-maildir-folder.c:292 -+#: ../camel/providers/local/camel-mbox-folder.c:400 - #: ../camel/providers/local/camel-mh-folder.c:169 - #: ../camel/providers/local/camel-mh-folder.c:179 - #, c-format - msgid "Cannot get message %s from folder %s: " - msgstr "无法从文件夹 %2$s 获取消息 %1$s：" - --#: ../camel/providers/local/camel-maildir-folder.c:351 -+#: ../camel/providers/local/camel-maildir-folder.c:362 - #, c-format - msgid "Cannot transfer message to destination folder: %s" - msgstr "无法将消息转移到目标文件夹：%s" - - #: ../camel/providers/local/camel-maildir-store.c:130 --#: ../camel/providers/local/camel-maildir-store.c:860 -+#: ../camel/providers/local/camel-maildir-store.c:149 -+#: ../camel/providers/local/camel-maildir-store.c:881 - #, c-format - msgid "Folder %s already exists" - msgstr "文件夹 %s 已经存在" - --#: ../camel/providers/local/camel-maildir-store.c:235 --#: ../camel/providers/local/camel-maildir-store.c:266 -+#: ../camel/providers/local/camel-maildir-store.c:241 -+#: ../camel/providers/local/camel-maildir-store.c:272 - #: ../camel/providers/local/camel-mbox-store.c:401 - #: ../camel/providers/local/camel-mbox-store.c:422 - #, c-format - msgid "Cannot create folder '%s': %s" - msgstr "无法创建文件夹“%s”：%s" - --#: ../camel/providers/local/camel-maildir-store.c:250 -+#: ../camel/providers/local/camel-maildir-store.c:256 - #: ../camel/providers/local/camel-mbox-store.c:367 - #: ../camel/providers/local/camel-mh-store.c:523 - #, c-format - msgid "Cannot get folder '%s': %s" - msgstr "无法获取文件夹“%s”：%s" - --#: ../camel/providers/local/camel-maildir-store.c:256 -+#: ../camel/providers/local/camel-maildir-store.c:262 - #: ../camel/providers/local/camel-mbox-store.c:377 - #: ../camel/providers/local/camel-mh-store.c:532 - #, c-format - msgid "Cannot get folder '%s': folder does not exist." - msgstr "无法获得文件夹“%s”：文件夹不存在。" - --#: ../camel/providers/local/camel-maildir-store.c:283 -+#: ../camel/providers/local/camel-maildir-store.c:289 - #, c-format - msgid "Cannot get folder '%s': not a maildir directory." - msgstr "无法获取文件夹“%s”：不是 maildir 目录。" - --#: ../camel/providers/local/camel-maildir-store.c:288 --#: ../camel/providers/local/camel-mbox-store.c:440 --#: ../camel/providers/local/camel-mh-store.c:565 --#, c-format --msgid "Cannot create folder '%s': folder exists." --msgstr "无法创建文件夹“%s”：文件夹已存在。" -- --#: ../camel/providers/local/camel-maildir-store.c:352 --#: ../camel/providers/local/camel-maildir-store.c:392 --#: ../camel/providers/local/camel-mh-store.c:683 -+#: ../camel/providers/local/camel-maildir-store.c:353 -+#: ../camel/providers/local/camel-maildir-store.c:393 -+#: ../camel/providers/local/camel-mh-store.c:676 - #, c-format - msgid "Could not delete folder '%s': %s" - msgstr "无法删除文件夹“%s”：%s" - --#: ../camel/providers/local/camel-maildir-store.c:354 -+#: ../camel/providers/local/camel-maildir-store.c:355 - msgid "not a maildir directory" - msgstr "不是 maildir 目录" - --#: ../camel/providers/local/camel-maildir-store.c:635 --#: ../camel/providers/local/camel-maildir-store.c:1074 -+#: ../camel/providers/local/camel-maildir-store.c:637 -+#: ../camel/providers/local/camel-maildir-store.c:1095 - #: ../camel/providers/local/camel-spool-store.c:212 - #: ../camel/providers/local/camel-spool-store.c:231 - #, c-format -@@ -3633,36 +3621,36 @@ msgstr "检查文件夹一致性" - msgid "Checking for new messages" - msgstr "检查新消息" - --#: ../camel/providers/local/camel-maildir-summary.c:784 -+#: ../camel/providers/local/camel-maildir-summary.c:791 - #: ../camel/providers/local/camel-mbox-summary.c:466 --#: ../camel/providers/local/camel-mbox-summary.c:682 --#: ../camel/providers/local/camel-mbox-summary.c:831 -+#: ../camel/providers/local/camel-mbox-summary.c:687 -+#: ../camel/providers/local/camel-mbox-summary.c:836 - #: ../camel/providers/local/camel-spool-summary.c:139 - msgid "Storing folder" - msgstr "存储文件夹" - --#: ../camel/providers/local/camel-mbox-folder.c:185 -+#: ../camel/providers/local/camel-mbox-folder.c:196 - #, c-format - msgid "Cannot open mailbox: %s: " - msgstr "无法打开邮件箱：%s：" - --#: ../camel/providers/local/camel-mbox-folder.c:251 -+#: ../camel/providers/local/camel-mbox-folder.c:262 - #, c-format - msgid "Cannot append message to mbox file: %s: " - msgstr "无法将消息附加到邮件箱文件：%s：" - --#: ../camel/providers/local/camel-mbox-folder.c:381 -+#: ../camel/providers/local/camel-mbox-folder.c:392 - msgid "The folder appears to be irrecoverably corrupted." - msgstr "文件夹好像已经被不可恢复地破坏了。" - --#: ../camel/providers/local/camel-mbox-folder.c:438 -+#: ../camel/providers/local/camel-mbox-folder.c:449 - #: ../camel/providers/local/camel-spool-folder.c:67 - #, c-format - msgid "Cannot create folder lock on %s: %s" - msgstr "无法在 %s 创建文件夹锁：%s" - - #: ../camel/providers/local/camel-mbox-store.c:389 --#: ../camel/providers/local/camel-mbox-store.c:587 -+#: ../camel/providers/local/camel-mbox-store.c:580 - #, c-format - msgid "Cannot create a folder by this name." - msgstr "无法以此名称创建文件夹。" -@@ -3672,23 +3660,23 @@ msgstr "无法以此名称创建文件夹。" - msgid "Cannot get folder '%s': not a regular file." - msgstr "无法获取文件夹“%s”：不是普通文件" - --#: ../camel/providers/local/camel-mbox-store.c:603 -+#: ../camel/providers/local/camel-mbox-store.c:596 - #, c-format - msgid "Cannot create directory '%s': %s." - msgstr "无法创建目录“%s”：%s" - --#: ../camel/providers/local/camel-mbox-store.c:615 -+#: ../camel/providers/local/camel-mbox-store.c:608 - #, c-format - msgid "Cannot create folder: %s: %s" - msgstr "无法创建文件夹：%s：%s" - --#: ../camel/providers/local/camel-mbox-store.c:617 -+#: ../camel/providers/local/camel-mbox-store.c:610 - msgid "Folder already exists" - msgstr "文件夹已经存在" - --#: ../camel/providers/local/camel-mbox-store.c:657 --#: ../camel/providers/local/camel-mbox-store.c:670 --#: ../camel/providers/local/camel-mbox-store.c:699 -+#: ../camel/providers/local/camel-mbox-store.c:650 -+#: ../camel/providers/local/camel-mbox-store.c:663 -+#: ../camel/providers/local/camel-mbox-store.c:692 - #, c-format - msgid "" - "Could not delete folder '%s':\n" -@@ -3697,33 +3685,33 @@ msgstr "" - "无法删除文件夹“%s”：\n" - "%s" - --#: ../camel/providers/local/camel-mbox-store.c:680 -+#: ../camel/providers/local/camel-mbox-store.c:673 - #, c-format - msgid "'%s' is not a regular file." - msgstr "“%s”并不是普通文件。" - --#: ../camel/providers/local/camel-mbox-store.c:689 -+#: ../camel/providers/local/camel-mbox-store.c:682 - #, c-format - msgid "Folder '%s' is not empty. Not deleted." - msgstr "文件夹“%s”非空。没有删除。" - --#: ../camel/providers/local/camel-mbox-store.c:716 --#: ../camel/providers/local/camel-mbox-store.c:731 -+#: ../camel/providers/local/camel-mbox-store.c:709 -+#: ../camel/providers/local/camel-mbox-store.c:724 - #, c-format - msgid "Could not delete folder summary file '%s': %s" - msgstr "无法删除文件夹概要文件“%s”：%s" - --#: ../camel/providers/local/camel-mbox-store.c:813 -+#: ../camel/providers/local/camel-mbox-store.c:806 - #, c-format - msgid "The new folder name is illegal." - msgstr "指定的文件夹名称不合法。" - --#: ../camel/providers/local/camel-mbox-store.c:829 -+#: ../camel/providers/local/camel-mbox-store.c:822 - #, c-format - msgid "Could not rename '%s': '%s': %s" - msgstr "无法重命名“%s”：“%s”：%s" - --#: ../camel/providers/local/camel-mbox-store.c:913 -+#: ../camel/providers/local/camel-mbox-store.c:906 - #, c-format - msgid "Could not rename '%s' to %s: %s" - msgstr "无法将“%s”重命名为 %s：%s" -@@ -3733,73 +3721,73 @@ msgstr "无法将“%s”重命名为 %s：%s" - msgid "Could not open folder: %s: %s" - msgstr "无法打开文件夹：%s：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:606 -+#: ../camel/providers/local/camel-mbox-summary.c:611 - #, c-format - msgid "Cannot check folder: %s: %s" - msgstr "无法检查文件夹：%s：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:695 --#: ../camel/providers/local/camel-mbox-summary.c:840 -+#: ../camel/providers/local/camel-mbox-summary.c:700 -+#: ../camel/providers/local/camel-mbox-summary.c:845 - #: ../camel/providers/local/camel-spool-summary.c:146 - #, c-format - msgid "Could not open file: %s: %s" - msgstr "无法打开文件：%s：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:710 -+#: ../camel/providers/local/camel-mbox-summary.c:715 - #: ../camel/providers/local/camel-spool-summary.c:161 - #, c-format - msgid "Cannot open temporary mailbox: %s" - msgstr "无法打开临时邮件箱：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:727 --#: ../camel/providers/local/camel-mbox-summary.c:962 -+#: ../camel/providers/local/camel-mbox-summary.c:732 -+#: ../camel/providers/local/camel-mbox-summary.c:967 - #, c-format - msgid "Could not close source folder %s: %s" - msgstr "无法关闭来源文件夹 %s：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:740 -+#: ../camel/providers/local/camel-mbox-summary.c:745 - #, c-format - msgid "Could not close temporary folder: %s" - msgstr "无法关闭临时文件夹：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:759 -+#: ../camel/providers/local/camel-mbox-summary.c:764 - #, c-format - msgid "Could not rename folder: %s" - msgstr "无法重命名文件夹：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:854 --#: ../camel/providers/local/camel-mbox-summary.c:1127 -+#: ../camel/providers/local/camel-mbox-summary.c:859 -+#: ../camel/providers/local/camel-mbox-summary.c:1132 - #, c-format - msgid "Could not store folder: %s" - msgstr "无法存储文件夹：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:893 --#: ../camel/providers/local/camel-mbox-summary.c:1167 -+#: ../camel/providers/local/camel-mbox-summary.c:898 -+#: ../camel/providers/local/camel-mbox-summary.c:1172 - #, c-format - msgid "" - "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " - "it.)" - msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)" - --#: ../camel/providers/local/camel-mbox-summary.c:903 --#: ../camel/providers/local/camel-mbox-summary.c:1179 -+#: ../camel/providers/local/camel-mbox-summary.c:908 -+#: ../camel/providers/local/camel-mbox-summary.c:1184 - #, c-format - msgid "Summary and folder mismatch, even after a sync" - msgstr "即使同步后，概要和文件夹仍然不匹配" - --#: ../camel/providers/local/camel-mbox-summary.c:1072 -+#: ../camel/providers/local/camel-mbox-summary.c:1077 - #: ../camel/providers/local/camel-spool-summary.c:356 - #, c-format - msgid "Unknown error: %s" - msgstr "未知的错误：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:1237 --#: ../camel/providers/local/camel-mbox-summary.c:1267 -+#: ../camel/providers/local/camel-mbox-summary.c:1242 -+#: ../camel/providers/local/camel-mbox-summary.c:1272 - #, c-format - msgid "Writing to temporary mailbox failed: %s" - msgstr "写入临时 mailbox 失败：%s" - --#: ../camel/providers/local/camel-mbox-summary.c:1256 -+#: ../camel/providers/local/camel-mbox-summary.c:1261 - #, c-format - msgid "Writing to temporary mailbox failed: %s: %s" - msgstr "写入临时 mailbox 失败：%s：%s" -@@ -3920,21 +3908,21 @@ msgstr "" - "文件夹可能已损坏，副本已存放在 '%s'" - - #: ../camel/providers/nntp/camel-nntp-folder.c:222 --#: ../camel/providers/nntp/camel-nntp-folder.c:588 -+#: ../camel/providers/nntp/camel-nntp-folder.c:590 - #, c-format - msgid "Internal error: UID in invalid format: %s" - msgstr "内部错误：UID 的格式无效：%s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:291 --#: ../camel/providers/nntp/camel-nntp-folder.c:296 -+#: ../camel/providers/nntp/camel-nntp-folder.c:292 -+#: ../camel/providers/nntp/camel-nntp-folder.c:297 - #: ../camel/providers/pop3/camel-pop3-folder.c:546 - #: ../camel/providers/pop3/camel-pop3-folder.c:945 - #, c-format - msgid "Cannot get message %s: %s" - msgstr "无法获取消息 %s：%s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:303 --#: ../camel/providers/nntp/camel-nntp-folder.c:622 -+#: ../camel/providers/nntp/camel-nntp-folder.c:304 -+#: ../camel/providers/nntp/camel-nntp-folder.c:624 - #: ../camel/providers/pop3/camel-pop3-folder.c:476 - #: ../camel/providers/pop3/camel-pop3-folder.c:536 - #: ../camel/providers/pop3/camel-pop3-folder.c:555 -@@ -3948,16 +3936,16 @@ msgstr "无法获取消息 %s：" - msgid "Posting failed: %s" - msgstr "发送失败：%s" - --#: ../camel/providers/nntp/camel-nntp-folder.c:501 -+#: ../camel/providers/nntp/camel-nntp-folder.c:503 - msgid "Posting failed: " - msgstr "发送失败：" - --#: ../camel/providers/nntp/camel-nntp-folder.c:611 -+#: ../camel/providers/nntp/camel-nntp-folder.c:613 - #, c-format - msgid "This message is not currently available" - msgstr "该消息目前不可用" - --#: ../camel/providers/nntp/camel-nntp-folder.c:720 -+#: ../camel/providers/nntp/camel-nntp-folder.c:722 - #, c-format - msgid "You cannot copy messages from a NNTP folder" - msgstr "您不能从 NNTP 文件夹复制信息" -@@ -4674,8 +4662,8 @@ msgstr "(已废弃) 自动代理配置 URL" - - #: ../libebackend/e-authentication-mediator.c:204 - #: ../libebackend/e-authentication-mediator.c:215 --#: ../libebackend/e-authentication-mediator.c:861 --#: ../libebackend/e-authentication-mediator.c:1198 -+#: ../libebackend/e-authentication-mediator.c:860 -+#: ../libebackend/e-authentication-mediator.c:1197 - msgid "Bus name vanished (client terminated?)" - msgstr "Bus 名称消失(客户端终止了？)" - -@@ -4685,8 +4673,8 @@ msgstr "客户端无响应" - - #: ../libebackend/e-authentication-mediator.c:333 - #: ../libebackend/e-authentication-mediator.c:344 --#: ../libebackend/e-authentication-mediator.c:855 --#: ../libebackend/e-authentication-mediator.c:1192 -+#: ../libebackend/e-authentication-mediator.c:854 -+#: ../libebackend/e-authentication-mediator.c:1191 - msgid "Client cancelled the operation" - msgstr "客户端已取消操作" - -@@ -4694,11 +4682,11 @@ msgstr "客户端已取消操作" - msgid "Client reports password was rejected" - msgstr "客户端报告密码被拒绝" - --#: ../libebackend/e-authentication-session.c:568 -+#: ../libebackend/e-authentication-session.c:539 - msgid "Add this password to your keyring" - msgstr "将该密码添加到您的密钥环" - --#: ../libebackend/e-authentication-session.c:673 -+#: ../libebackend/e-authentication-session.c:649 - msgid "Password was incorrect" - msgstr "密码错误" - -@@ -4707,12 +4695,12 @@ msgstr "密码错误" - msgid "%s does not support authentication" - msgstr "%s 不支持认证" - --#: ../libebackend/e-collection-backend.c:900 -+#: ../libebackend/e-collection-backend.c:901 - #, c-format - msgid "%s does not support creating remote resources" - msgstr "%s 不支持创建远程资源" - --#: ../libebackend/e-collection-backend.c:959 -+#: ../libebackend/e-collection-backend.c:960 - #, c-format - msgid "%s does not support deleting remote resources" - msgstr "%s 不支持删除远程资源" -@@ -4727,45 +4715,45 @@ msgstr "散列键“%s”没有对应的后端工厂" - msgid "Data source is missing a [%s] group" - msgstr "数据源缺少一个 [%s] 组" - --#: ../libebackend/e-server-side-source.c:1007 --#: ../libedataserver/e-source.c:1252 -+#: ../libebackend/e-server-side-source.c:1022 -+#: ../libedataserver/e-source.c:1394 - #, c-format - msgid "Data source '%s' does not support creating remote resources" - msgstr "数据源“%s”不支持创建远程资源" - - # collection backend，如何翻译更好？ --#: ../libebackend/e-server-side-source.c:1021 -+#: ../libebackend/e-server-side-source.c:1036 - #, c-format - msgid "" - "Data source '%s' has no collection backend to create the remote resource" - msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源" - --#: ../libebackend/e-server-side-source.c:1049 --#: ../libedataserver/e-source.c:1365 -+#: ../libebackend/e-server-side-source.c:1064 -+#: ../libedataserver/e-source.c:1507 - #, c-format - msgid "Data source '%s' does not support deleting remote resources" - msgstr "数据源“%s”不支持删除远程资源" - --#: ../libebackend/e-server-side-source.c:1063 -+#: ../libebackend/e-server-side-source.c:1078 - #, c-format - msgid "" - "Data source '%s' has no collection backend to delete the remote resource" - msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源" - --#: ../libebackend/e-server-side-source.c:1094 --#: ../libedataserver/e-source.c:1461 --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 -+#: ../libebackend/e-server-side-source.c:1109 -+#: ../libedataserver/e-source.c:1603 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 - #, c-format - msgid "Data source '%s' does not support OAuth 2.0 authentication" - msgstr "数据源“%s”不支持 OAuth 2.0 认证" - --#: ../libebackend/e-server-side-source.c:1439 -+#: ../libebackend/e-server-side-source.c:1456 - #, c-format - msgid "File must have a '.source' extension" - msgstr "文件扩展名必须为“.source”" - - #: ../libebackend/e-source-registry-server.c:531 --#: ../libedataserver/e-source-registry.c:1878 -+#: ../libedataserver/e-source-registry.c:1957 - msgid "The user declined to authenticate" - msgstr "用户拒绝认证" - -@@ -4962,26 +4950,26 @@ msgstr "请输入任务列表“%s”的密码。" - msgid "Please enter the password for account \"%s\"." - msgstr "请输入帐号“%s”的密码。" - --#: ../libedataserver/e-source.c:669 -+#: ../libedataserver/e-source.c:768 - #, c-format - msgid "Source file is missing a [%s] group" - msgstr "源文件缺少一个 [%s] 组" - --#: ../libedataserver/e-source.c:1032 -+#: ../libedataserver/e-source.c:1174 - #, c-format - msgid "Data source '%s' is not removable" - msgstr "数据源“%s”不是可删除的" - --#: ../libedataserver/e-source.c:1155 -+#: ../libedataserver/e-source.c:1297 - #, c-format - msgid "Data source '%s' is not writable" - msgstr "数据源“%s”不是可写的" - --#: ../libedataserver/e-source.c:1768 -+#: ../libedataserver/e-source.c:1910 - msgid "Unnamed" - msgstr "未命名" - --#: ../libedataserver/e-source-mail-signature.c:486 -+#: ../libedataserver/e-source-mail-signature.c:485 - #, c-format - msgid "Signature script must be a local file" - msgstr "签名脚本必须为本地文件" -@@ -4991,28 +4979,28 @@ msgstr "签名脚本必须为本地文件" - msgid "Source '%s' does not support proxy lookups" - msgstr "数据源“%s”不支持代理查找" - --#: ../libedataserver/e-source-webdav.c:1551 -+#: ../libedataserver/e-source-webdav.c:1555 - #, c-format - msgid "" - "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " - "you wish to accept it?" - msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" - --#: ../libedataserver/e-source-webdav.c:1560 -+#: ../libedataserver/e-source-webdav.c:1564 - #, c-format - msgid "" - "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " - "wish to accept it?" - msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" - --#: ../libedataserver/e-source-webdav.c:1569 -+#: ../libedataserver/e-source-webdav.c:1573 - #, c-format - msgid "" - "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " - "you wish to accept it?" - msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" - --#: ../libedataserver/e-source-webdav.c:1578 -+#: ../libedataserver/e-source-webdav.c:1582 - #, c-format - msgid "" - "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " -@@ -5203,25 +5191,30 @@ msgstr "无法找到帐号元素" - msgid "Failed to find ASUrl and OABUrl in autodiscover response" - msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 - #, c-format - msgid "" - "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " - "from which to obtain an access token for '%s'" - msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌" - --#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267 -+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 - #, c-format - msgid "Failed to obtain an access token for '%s': " - msgstr "无法获取“%s”的访问令牌：" - --#: ../modules/google-backend/module-google-backend.c:191 -+#: ../modules/google-backend/module-google-backend.c:195 - #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 - #: ../modules/yahoo-backend/module-yahoo-backend.c:199 - msgid "Calendar" - msgstr "日历" - --#: ../modules/google-backend/module-google-backend.c:260 -+#: ../modules/google-backend/module-google-backend.c:268 -+#: ../modules/yahoo-backend/module-yahoo-backend.c:226 -+msgid "Tasks" -+msgstr "任务" -+ -+#: ../modules/google-backend/module-google-backend.c:321 - #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 - #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 - msgid "Contacts" -@@ -5320,7 +5313,7 @@ msgstr "邮件" - msgid "Integrate your mailboxes" - msgstr "集成您的邮箱" - --#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 -+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 - #, c-format - msgid "" - "Cannot find a corresponding account service in the accounts database from " -@@ -5363,10 +5356,6 @@ msgstr "Yahoo! 日历" - msgid "Yahoo! Mail" - msgstr "Yahoo! 邮箱" - --#: ../modules/yahoo-backend/module-yahoo-backend.c:226 --msgid "Tasks" --msgstr "任务" -- - #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 - #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 - #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 -@@ -5423,6 +5412,18 @@ msgstr "不从先前版本的 Evolution 迁移用户数据" - msgid "_Dismiss" - msgstr "解除(_D)" - -+#~ msgid "No host information available" -+#~ msgstr "无可用的主机信息" -+ -+#~ msgid "Cannot create folder '%s': folder exists" -+#~ msgstr "无法创建文件夹“%s”文件夹已存在" -+ -+#~ msgid "Source stream unavailable" -+#~ msgstr "源流不可用" -+ -+#~ msgid "Cannot create folder '%s': folder exists." -+#~ msgstr "无法创建文件夹“%s”：文件夹已存在。" -+ - #~ msgid "You may not import keys with this cipher" - #~ msgstr "您不能用此密码导入密钥" - -@@ -6217,9 +6218,6 @@ msgstr "解除(_D)" - #~ msgid "Command:" - #~ msgstr "命令：" - --#~ msgid "Numbe_r of cached connections to use" --#~ msgstr "使用的缓存连接的数目(_R)" -- - #~ msgid "Closing tmp stream failed: " - #~ msgstr "关闭临时流失败：" - diff --git a/nonprism/evolution-data-server/PKGBUILD b/nonprism/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..ba85ed48e --- /dev/null +++ b/nonprism/evolution-data-server/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 220453 2014-08-20 20:13:44Z heftig $ +# Maintainer (Arch): Jan de Groot + +pkgname=evolution-data-server +pkgver=3.12.5 +pkgrel=1.nonprism1 +pkgdesc="Centralized access to appointments and contacts, without libgdata support" +arch=(i686 x86_64) +depends=(gnome-online-accounts nss krb5 libgweather libical db) +makedepends=(intltool gperf gobject-introspection vala python2) +install=$pkgname.install +url="https://wiki.gnome.org/Apps/Evolution" +license=(GPL) +replaces=("${pkgname}-coherence" "${pkgname}-nonprism") +conflicts=("${pkgname}-coherence" "${pkgname}-nonprism") +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr \ + --without-libgdata \ + --disable-google \ + --enable-vala-bindings --disable-uoa + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/nonprism/evolution-data-server/evolution-data-server.install b/nonprism/evolution-data-server/evolution-data-server.install new file mode 100644 index 000000000..e75920e11 --- /dev/null +++ b/nonprism/evolution-data-server/evolution-data-server.install @@ -0,0 +1,11 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade () { + post_install +} + +post_remove () { + post_install +} \ No newline at end of file diff --git a/nonprism/evolution-data-server/git-fixes.patch b/nonprism/evolution-data-server/git-fixes.patch new file mode 100644 index 000000000..88c0a1fb6 --- /dev/null +++ b/nonprism/evolution-data-server/git-fixes.patch @@ -0,0 +1,7856 @@ +diff --git a/addressbook/backends/google/e-gdata-oauth2-authorizer.c b/addressbook/backends/google/e-gdata-oauth2-authorizer.c +index 8b1bca5..9bd5c38 100644 +--- a/addressbook/backends/google/e-gdata-oauth2-authorizer.c ++++ b/addressbook/backends/google/e-gdata-oauth2-authorizer.c +@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) + GList *domains; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); + + priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); + +diff --git a/addressbook/backends/ldap/e-source-ldap.c b/addressbook/backends/ldap/e-source-ldap.c +index 24f4a1e..fe6c349 100644 +--- a/addressbook/backends/ldap/e-source-ldap.c ++++ b/addressbook/backends/ldap/e-source-ldap.c +@@ -241,6 +241,9 @@ source_ldap_constructed (GObject *object) + ESourceExtension *other_extension; + const gchar *extension_name; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (e_source_ldap_parent_class)->constructed (object); ++ + this_extension = E_SOURCE_EXTENSION (object); + source = e_source_extension_ref_source (this_extension); + +diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c +index dce1e0e..7a59169 100644 +--- a/addressbook/libebook-contacts/e-contact.c ++++ b/addressbook/libebook-contacts/e-contact.c +@@ -1457,6 +1457,25 @@ e_contact_vcard_attribute (EContactField field_id) + } + + /** ++ * e_contact_field_is_string: ++ * @field_id: an #EContactField ++ * ++ * Returns whether the @field_id is of a string type, ++ * thus it can be used with e_contact_get_const(). ++ * ++ * Returns: Whether the @field_id is of a string type. ++ * ++ * Since: 3.14 ++ **/ ++gboolean ++e_contact_field_is_string (EContactField field_id) ++{ ++ g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, FALSE); ++ ++ return (field_info[field_id].t & E_CONTACT_FIELD_TYPE_STRING) != 0; ++} ++ ++/** + * e_contact_field_id: + * @field_name: a string representing a contact field + * +@@ -1711,7 +1730,8 @@ e_contact_get (EContact *contact, + * @field_id: an #EContactField + * + * Gets the value of @contact's field specified by @field_id, caching +- * the result so it can be freed later. ++ * the result so it can be freed later. Use e_contact_field_is_string() ++ * to check whether the field can be used here. + * + * Returns: (transfer none): Depends on the field's type, owned by the + * #EContact. +diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h +index dbd9778..22ac45c 100644 +--- a/addressbook/libebook-contacts/e-contact.h ++++ b/addressbook/libebook-contacts/e-contact.h +@@ -421,6 +421,7 @@ GType e_contact_field_type (EContactField field_id); + const gchar * e_contact_field_name (EContactField field_id); + const gchar * e_contact_pretty_name (EContactField field_id); + const gchar * e_contact_vcard_attribute (EContactField field_id); ++gboolean e_contact_field_is_string (EContactField field_id); + EContactField e_contact_field_id (const gchar *field_name); + EContactField e_contact_field_id_from_vcard (const gchar *vcard_field); + +diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c +index e0bf16c..c99ef09 100644 +--- a/addressbook/libedata-book/e-book-backend-sexp.c ++++ b/addressbook/libedata-book/e-book-backend-sexp.c +@@ -962,7 +962,7 @@ func_exists (struct _ESExp *f, + + if (argc == 1 + && argv[0]->type == ESEXP_RES_STRING) { +- gchar *propname; ++ const gchar *propname; + struct prop_info *info = NULL; + gint i; + gboolean saw_any = FALSE; +@@ -1013,15 +1013,22 @@ func_exists (struct _ESExp *f, + * against value in this field only */ + EContactField fid = e_contact_field_id (propname); + +- if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) { ++ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST && ++ e_contact_field_is_string (fid)) { + const gchar *prop = e_contact_get_const (ctx->contact, fid); + + if (prop && *prop) + truth = TRUE; + } else { + /* is is not a known EContact field, try with EVCard attributes */ +- EVCardAttribute *attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); +- GList *l, *values = attr ? e_vcard_attribute_get_values (attr) : NULL; ++ EVCardAttribute *attr; ++ GList *l, *values; ++ ++ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) ++ propname = e_contact_vcard_attribute (fid); ++ ++ attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); ++ values = attr ? e_vcard_attribute_get_values (attr) : NULL; + + for (l = values; l && !truth; l = l->next) { + const gchar *value = l->data; +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index b7c07b9..f189126 100644 +--- a/calendar/backends/caldav/e-cal-backend-caldav.c ++++ b/calendar/backends/caldav/e-cal-backend-caldav.c +@@ -5239,14 +5239,6 @@ e_cal_backend_caldav_finalize (GObject *object) + } + + static void +-cal_backend_caldav_constructed (GObject *object) +-{ +- /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_caldav_parent_class)-> +- constructed (object); +-} +- +-static void + e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) + { + SoupSessionFeature *feature; +@@ -5325,7 +5317,6 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class) + + object_class->dispose = e_cal_backend_caldav_dispose; + object_class->finalize = e_cal_backend_caldav_finalize; +- object_class->constructed = cal_backend_caldav_constructed; + + backend_class->get_backend_property = caldav_get_backend_property; + backend_class->shutdown = caldav_shutdown; +diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c +index d5fca99..4c2b67e 100644 +--- a/calendar/backends/contacts/e-cal-backend-contacts.c ++++ b/calendar/backends/contacts/e-cal-backend-contacts.c +@@ -1290,8 +1290,7 @@ e_cal_backend_contacts_constructed (GObject *object) + (GDestroyNotify) g_object_unref); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->constructed (object); + } + + /* Object initialization function for the contacts backend */ +diff --git a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c +index d65b934..c1c5632 100644 +--- a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c ++++ b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c +@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) + GList *domains; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); + + priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); + +diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c +index e84cea7..b0a47dd 100644 +--- a/calendar/libedata-cal/e-cal-backend-store.c ++++ b/calendar/libedata-cal/e-cal-backend-store.c +@@ -619,8 +619,7 @@ cal_backend_store_constructed (GObject *object) + g_object_unref (timezone_cache); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_store_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_cal_backend_store_parent_class)->constructed (object); + } + + static gboolean +diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c +index 4faa992..983682f 100644 +--- a/camel/camel-folder-search.c ++++ b/camel/camel-folder-search.c +@@ -754,8 +754,7 @@ folder_search_constructed (GObject *object) + gint ii; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (camel_folder_search_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (camel_folder_search_parent_class)->constructed (object); + + search = CAMEL_FOLDER_SEARCH (object); + class = CAMEL_FOLDER_SEARCH_GET_CLASS (search); +diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c +index fbaafcb..c56ed94 100644 +--- a/camel/camel-offline-store.c ++++ b/camel/camel-offline-store.c +@@ -61,8 +61,7 @@ offline_store_constructed (GObject *object) + priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (camel_offline_store_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (camel_offline_store_parent_class)->constructed (object); + + session = camel_service_ref_session (CAMEL_SERVICE (object)); + priv->online = camel_session_get_online (session); +diff --git a/camel/providers/imapx/camel-imapx-input-stream.c b/camel/providers/imapx/camel-imapx-input-stream.c +index 2a383c7..02983f3 100644 +--- a/camel/providers/imapx/camel-imapx-input-stream.c ++++ b/camel/providers/imapx/camel-imapx-input-stream.c +@@ -679,6 +679,7 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + guchar *o, *p, *e; + guint literal; + gint digits; ++ gboolean is_literal8 = FALSE; + + g_return_val_if_fail (CAMEL_IS_IMAPX_INPUT_STREAM (is), IMAPX_TOK_ERROR); + g_return_val_if_fail (data != NULL, IMAPX_TOK_ERROR); +@@ -711,6 +712,21 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + c = *p++; + } while (c == ' ' || c == '\r'); + ++ if (c == '~') { ++ if (p >= e) { ++ is->priv->ptr = p; ++ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) ++ return IMAPX_TOK_ERROR; ++ p = is->priv->ptr; ++ e = is->priv->end; ++ } ++ ++ if (*p == '{') { ++ c = *p++; ++ is_literal8 = TRUE; ++ } ++ } ++ + /*strchr("\n*()[]+", c)*/ + if (imapx_is_token_char (c)) { + is->priv->ptr = p; +@@ -723,6 +739,18 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + c = *p++; + if (isdigit (c) && literal < (UINT_MAX / 10)) { + literal = literal * 10 + (c - '0'); ++ } else if (is_literal8 && c == '+') { ++ if (p >= e) { ++ is->priv->ptr = p; ++ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) ++ return IMAPX_TOK_ERROR; ++ p = is->priv->ptr; ++ e = is->priv->end; ++ } ++ ++ /* The '+' can be only at the end of the literal8 token */ ++ if (*p != '}') ++ goto protocol_error; + } else if (c == '}') { + while (1) { + while (p < e) { +diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c +index 63b6f65..cfff143 100644 +--- a/camel/providers/imapx/camel-imapx-server.c ++++ b/camel/providers/imapx/camel-imapx-server.c +@@ -320,6 +320,7 @@ typedef enum { + IMAPX_IDLE_STARTED, /* IDLE continuation received; IDLE active */ + IMAPX_IDLE_CANCEL, /* Cancelled from ISSUED state; need to send + DONE as soon as we receive continuation */ ++ IMAPX_IDLE_WAIT_DONE /* DONE was issued, waiting for a confirmation response */ + } CamelIMAPXIdleState; + + #define IMAPX_IDLE_DWELL_TIME 2 /* Number of seconds to remain in PENDING +@@ -390,7 +391,7 @@ struct _CamelIMAPXServerPrivate { + gchar inbox_separator; + + /* IDLE support */ +- GMutex idle_lock; ++ GRecMutex idle_lock; + GThread *idle_thread; + GMainLoop *idle_main_loop; + GMainContext *idle_main_context; +@@ -1472,7 +1473,7 @@ imapx_command_start_next (CamelIMAPXServer *is) + "waiting for idle to stop \n"); + /* if there are more pending commands, + * then they should be processed too */ +- break; ++ return; + + case IMAPX_IDLE_STOP_ERROR: + return; +@@ -3054,25 +3055,27 @@ imapx_continuation (CamelIMAPXServer *is, + return FALSE; + + c (is->tagprefix, "Got continuation response for IDLE \n"); +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + /* We might have actually sent the DONE already! */ +- if (is->priv->idle_state == IMAPX_IDLE_ISSUED) ++ if (is->priv->idle_state == IMAPX_IDLE_ISSUED) { + is->priv->idle_state = IMAPX_IDLE_STARTED; +- else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { ++ } else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { + /* IDLE got cancelled after we sent the command, while + * we were waiting for this continuation. Send DONE + * immediately. */ + if (!imapx_command_idle_stop (is, error)) { +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + return FALSE; + } +- is->priv->idle_state = IMAPX_IDLE_OFF; ++ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; ++ } else if (is->priv->idle_state == IMAPX_IDLE_WAIT_DONE) { ++ /* Do nothing, just wait */ + } else { + c ( + is->tagprefix, "idle starts in wrong state %d\n", + is->priv->idle_state); + } +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + QUEUE_LOCK (is); + is->literal = NULL; +@@ -3548,9 +3551,9 @@ imapx_command_idle_done (CamelIMAPXServer *is, + camel_imapx_job_take_error (job, local_error); + } + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + is->priv->idle_state = IMAPX_IDLE_OFF; +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + imapx_unregister_job (is, job); + } +@@ -3579,29 +3582,23 @@ imapx_job_idle_start (CamelIMAPXJob *job, + cp = g_queue_peek_head (&ic->parts); + cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION; + +- g_mutex_lock (&is->priv->idle_lock); ++ QUEUE_LOCK (is); ++ g_rec_mutex_lock (&is->priv->idle_lock); + /* Don't issue it if the idle was cancelled already */ + if (is->priv->idle_state == IMAPX_IDLE_PENDING) { + is->priv->idle_state = IMAPX_IDLE_ISSUED; +- g_mutex_unlock (&is->priv->idle_lock); + +- QUEUE_LOCK (is); +- /* It can be that another thread started a command between +- the two locks above had been interchanged, thus also test +- whether the active command queue is empty, before starting +- the IDLE command. */ + if (camel_imapx_command_queue_is_empty (is->active)) { + imapx_command_start (is, ic); + } else { + c (is->tagprefix, "finally cancelling IDLE, other command was quicker\n"); ++ is->priv->idle_state = IMAPX_IDLE_OFF; + imapx_unregister_job (is, job); + } + } else { +- g_mutex_unlock (&is->priv->idle_lock); +- +- QUEUE_LOCK (is); + imapx_unregister_job (is, job); + } ++ g_rec_mutex_unlock (&is->priv->idle_lock); + QUEUE_UNLOCK (is); + + camel_imapx_command_unref (ic); +@@ -3690,13 +3687,16 @@ imapx_call_idle (gpointer data) + goto exit; + + /* XXX Rename to 'pending_lock'? */ +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + g_source_unref (is->priv->idle_pending); + is->priv->idle_pending = NULL; +- g_mutex_unlock (&is->priv->idle_lock); + +- if (is->priv->idle_state != IMAPX_IDLE_PENDING) ++ if (is->priv->idle_state != IMAPX_IDLE_PENDING) { ++ g_rec_mutex_unlock (&is->priv->idle_lock); + goto exit; ++ } ++ ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + g_mutex_lock (&is->priv->select_lock); + mailbox = g_weak_ref_get (&is->priv->select_mailbox); +@@ -3765,7 +3765,7 @@ imapx_idle_thread (gpointer data) + * regressions. + */ + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + g_warn_if_fail (is->priv->idle_pending == NULL); + pending = g_timeout_source_new_seconds (IMAPX_IDLE_DWELL_TIME); +@@ -3778,7 +3778,7 @@ imapx_idle_thread (gpointer data) + is->priv->idle_pending = g_source_ref (pending); + g_source_unref (pending); + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + g_main_loop_run (is->priv->idle_main_loop); + +@@ -3798,36 +3798,40 @@ imapx_stop_idle (CamelIMAPXServer *is, + + time (&now); + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + switch (is->priv->idle_state) { + case IMAPX_IDLE_ISSUED: + is->priv->idle_state = IMAPX_IDLE_CANCEL; +- /* fall through */ ++ result = IMAPX_IDLE_STOP_SUCCESS; ++ break; + + case IMAPX_IDLE_CANCEL: ++ case IMAPX_IDLE_WAIT_DONE: + result = IMAPX_IDLE_STOP_SUCCESS; + break; + + case IMAPX_IDLE_STARTED: + if (imapx_command_idle_stop (is, error)) { + result = IMAPX_IDLE_STOP_SUCCESS; ++ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; + } else { + result = IMAPX_IDLE_STOP_ERROR; ++ is->priv->idle_state = IMAPX_IDLE_OFF; + goto exit; + } +- /* fall through */ ++ break; + + case IMAPX_IDLE_PENDING: + is->priv->idle_state = IMAPX_IDLE_OFF; +- /* fall through */ ++ break; + + case IMAPX_IDLE_OFF: + break; + } + + exit: +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + return result; + } +@@ -3838,9 +3842,14 @@ imapx_start_idle (CamelIMAPXServer *is) + if (camel_application_is_exiting) + return; + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); ++ ++ if (is->priv->idle_state != IMAPX_IDLE_OFF) { ++ g_warn_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); ++ g_rec_mutex_unlock (&is->priv->idle_lock); ++ return; ++ } + +- g_return_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); + is->priv->idle_state = IMAPX_IDLE_PENDING; + + if (is->priv->idle_thread == NULL) { +@@ -3861,7 +3870,7 @@ imapx_start_idle (CamelIMAPXServer *is) + g_source_unref (pending); + } + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + } + + static gboolean +@@ -3869,12 +3878,12 @@ imapx_in_idle (CamelIMAPXServer *is) + { + gboolean in_idle = FALSE; + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + if (is->priv->idle_thread != NULL) + in_idle = (is->priv->idle_state > IMAPX_IDLE_OFF); + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + return in_idle; + } +@@ -3918,7 +3927,7 @@ imapx_command_select_done (CamelIMAPXServer *is, + GQueue trash = G_QUEUE_INIT; + GList *list, *link; + +- c (is->tagprefix, "Select failed\n"); ++ c (is->tagprefix, "Select failed: %s\n", local_error ? local_error->message : "Unknown error"); + + g_mutex_lock (&is->priv->select_lock); + select_closing = g_weak_ref_get (&is->priv->select_closing); +@@ -4192,7 +4201,7 @@ imapx_server_set_streams (CamelIMAPXServer *is, + } + + #if GLIB_CHECK_VERSION(2,39,0) +-#ifndef G_OS_WIN32 ++#ifdef G_OS_UNIX + static void + imapx_server_child_process_setup (gpointer user_data) + { +@@ -4210,7 +4219,7 @@ imapx_server_child_process_setup (gpointer user_data) + } + #endif /* TIOCNOTTY */ + } +-#endif /* G_OS_WIN32 */ ++#endif /* G_OS_UNIX */ + #endif + + static gboolean +@@ -4242,7 +4251,7 @@ connect_to_server_process (CamelIMAPXServer *is, + G_SUBPROCESS_FLAGS_STDOUT_PIPE | + G_SUBPROCESS_FLAGS_STDERR_SILENCE); + +-#ifndef G_OS_WIN32 ++#ifdef G_OS_UNIX + g_subprocess_launcher_set_child_setup ( + launcher, imapx_server_child_process_setup, + NULL, (GDestroyNotify) NULL); +@@ -7809,7 +7818,7 @@ imapx_server_finalize (GObject *object) + g_hash_table_destroy (is->priv->known_alerts); + g_mutex_clear (&is->priv->known_alerts_lock); + +- g_mutex_clear (&is->priv->idle_lock); ++ g_rec_mutex_clear (&is->priv->idle_lock); + g_main_loop_unref (is->priv->idle_main_loop); + g_main_context_unref (is->priv->idle_main_context); + +@@ -7835,6 +7844,9 @@ imapx_server_constructed (GObject *object) + CamelIMAPXServer *server; + CamelIMAPXServerClass *class; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (camel_imapx_server_parent_class)->constructed (object); ++ + server = CAMEL_IMAPX_SERVER (object); + class = CAMEL_IMAPX_SERVER_GET_CLASS (server); + +@@ -7993,7 +8005,7 @@ camel_imapx_server_init (CamelIMAPXServer *is) + + main_context = g_main_context_new (); + +- g_mutex_init (&is->priv->idle_lock); ++ g_rec_mutex_init (&is->priv->idle_lock); + is->priv->idle_main_loop = g_main_loop_new (main_context, FALSE); + is->priv->idle_main_context = g_main_context_ref (main_context); + +diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c +index 373f27d..482983d 100644 +--- a/camel/providers/local/camel-local-folder.c ++++ b/camel/providers/local/camel-local-folder.c +@@ -164,6 +164,9 @@ local_folder_constructed (GObject *object) + gchar *root_path; + gchar *path; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (camel_local_folder_parent_class)->constructed (object); ++ + folder = CAMEL_FOLDER (object); + full_name = camel_folder_get_full_name (folder); + parent_store = camel_folder_get_parent_store (folder); +diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c +index 9d36933..b6f2e3b 100644 +--- a/libebackend/e-authentication-mediator.c ++++ b/libebackend/e-authentication-mediator.c +@@ -718,8 +718,7 @@ authentication_mediator_constructed (GObject *object) + mediator, (GDestroyNotify) NULL); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_authentication_mediator_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_authentication_mediator_parent_class)->constructed (object); + } + + static gboolean +diff --git a/libebackend/e-authentication-session.c b/libebackend/e-authentication-session.c +index bfec0e3..f664a30 100644 +--- a/libebackend/e-authentication-session.c ++++ b/libebackend/e-authentication-session.c +@@ -322,8 +322,7 @@ authentication_session_constructed (GObject *object) + session = E_AUTHENTICATION_SESSION (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_authentication_session_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_authentication_session_parent_class)->constructed (object); + + /* If the server knows about the data source UID we've been + * given, then we can auto-configure our own prompt strings. */ +diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c +index 66c836c..d41998d 100644 +--- a/libebackend/e-collection-backend.c ++++ b/libebackend/e-collection-backend.c +@@ -680,8 +680,7 @@ collection_backend_constructed (GObject *object) + backend = E_COLLECTION_BACKEND (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_collection_backend_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_collection_backend_parent_class)->constructed (object); + + server = e_collection_backend_ref_server (backend); + source = e_backend_get_source (E_BACKEND (backend)); +diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c +index 9b74a0c..5348327 100644 +--- a/libebackend/e-user-prompter-server.c ++++ b/libebackend/e-user-prompter-server.c +@@ -326,8 +326,7 @@ static void + user_prompter_server_constructed (GObject *object) + { + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_user_prompter_server_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_user_prompter_server_parent_class)->constructed (object); + + e_extensible_load_extensions (E_EXTENSIBLE (object)); + } +diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c +index bb5660a..b040e49 100644 +--- a/libedataserver/e-source-camel.c ++++ b/libedataserver/e-source-camel.c +@@ -369,8 +369,7 @@ source_camel_constructed (GObject *object) + guint array_index = 0; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_source_camel_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_source_camel_parent_class)->constructed (object); + + class = E_SOURCE_CAMEL_GET_CLASS (object); + priv = E_SOURCE_CAMEL_GET_PRIVATE (object); +diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c +index 39f56a9..3dd4b5b 100644 +--- a/libedataserver/e-source-mail-signature.c ++++ b/libedataserver/e-source-mail-signature.c +@@ -169,8 +169,7 @@ source_mail_signature_constructed (GObject *object) + priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_source_mail_signature_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_source_mail_signature_parent_class)->constructed (object); + + extension = E_SOURCE_EXTENSION (object); + source = e_source_extension_ref_source (extension); +diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c +index 98eede2..0a97fa4 100644 +--- a/modules/gnome-online-accounts/goaewsclient.c ++++ b/modules/gnome-online-accounts/goaewsclient.c +@@ -515,6 +515,7 @@ goa_ews_autodiscover (GoaObject *goa_object, + data->session, data->msgs[1], + ews_autodiscover_response_cb, simple); + } else { ++ g_dbus_error_strip_remote_error (error); + g_simple_async_result_take_error (simple, error); + g_simple_async_result_complete_in_idle (simple); + g_object_unref (simple); +diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c +index 973d182..99a6b1e 100644 +--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c ++++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c +@@ -1235,8 +1235,7 @@ gnome_online_accounts_constructed (GObject *object) + extension); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)->constructed (object); + } + + static gboolean +@@ -1283,6 +1282,9 @@ gnome_online_accounts_get_access_token_sync (EOAuth2Support *support, + g_object_unref (goa_account); + g_object_unref (goa_object); + ++ if (error && *error) ++ g_dbus_error_strip_remote_error (*error); ++ + g_prefix_error ( + error, + _("Failed to obtain an access token for '%s': "), +diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c +index 3e16146..130951a 100644 +--- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c ++++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c +@@ -899,8 +899,7 @@ ubuntu_online_accounts_constructed (GObject *object) + extension); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)->constructed (object); + } + + static gboolean +diff --git a/po/nb.po b/po/nb.po +index 066e1eb..071a4e3 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -6,10 +6,10 @@ + # Torstein Adolf Winterseth , 2010. + msgid "" + msgstr "" +-"Project-Id-Version: evolution-data-server 3.11.x\n" ++"Project-Id-Version: evolution-data-server 3.12.x\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2014-03-05 07:35+0100\n" +-"PO-Revision-Date: 2014-03-05 17:58+0100\n" ++"POT-Creation-Date: 2014-07-23 14:37+0200\n" ++"PO-Revision-Date: 2014-07-23 14:39+0200\n" + "Last-Translator: Kjartan Maraas \n" + "Language-Team: Norwegian bokmål \n" + "Language: nb\n" +@@ -18,79 +18,79 @@ msgstr "" + "Content-Transfer-Encoding: 8-bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Klarte ikke å fjerne fil «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Klarte ikke å opprette katalog %s: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Klarte ikke å opprette hard lenke for ressurs «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Ingen UID i kontakten" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "UID'er som er i konflikt ble funnet i tillagte kontakter" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Laster …" + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Søker …" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Prøvde å endre kontakt «%s» med revisjon som ikke er synkronisert" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Kontakt «%s» ble ikke funnet" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Spørring «%s» er ikke støttet" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Ugyldig spørring «%s»" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Forespørsel om å slette en ikke-relatert markør" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -105,67 +105,69 @@ msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Ukjent feil" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Spør etter oppdaterte kontakter …" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Spør etter oppdaterte grupper …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1273 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1375 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1467 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Kalender støtter ikke fjerning av mange oppføringer" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Laster …" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -174,129 +176,130 @@ msgid "Personal" + msgstr "Personlig" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Venner" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Familie" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Kolleger" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Ikke tilkoblet" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Klarte ikke å koble til med hverken v3 eller v2 binding" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Kobler til LDAP-tjener på nytt …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Ugyldig DN-syntaks" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP-feil 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: NULL returnert fra ldap_first_entry" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Uhåndtert resultat type %d returnert" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Ikke håndtert søkeresultat av type %d ble returnert" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Mottar søkeresultater fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Feil ved utføring av søk" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Laster ned kontakter (%d) …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Legger til kontakt på LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Endrer kontakt fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Fjerner kontakt fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Klarte ikke å hente DN for bruker «%s»" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Laster sammendrag for adressebok …" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "PROPFIND på webdav feilet med HTTP-status: %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Ingen svarkropp i resultat av WebDAV PROPFIND kommando" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Laster kontakter (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1196 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Kan ikke transformere SoupURI til streng" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1306 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Oppretting av ressurs «%s» feilet med HTTP-status %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Kontakt på tjener endret -> endrer ikke" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1412 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Endring av kontakt feilet med HTTP-status %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1488 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE feilet med HTTP-status: %d" +@@ -900,8 +903,8 @@ msgstr "Liste med Google Talk navn" + msgid "Twitter Name List" + msgstr "Liste med Twitter-navn" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:881 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Liste uten navn" + +@@ -995,7 +998,7 @@ msgstr "Hele search_contacts lagres ikke i buffer. vcard kan ikke returneres." + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Spørringen innehold elementer som ikke støttes" +@@ -1038,7 +1041,7 @@ msgstr "Klarte ikke å fjerne databasefil: errno %d" + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442 + #, c-format + msgid "Only summary queries are supported by EbSdbCursor" +-msgstr "" ++msgstr "EbSdbCursor støtter bare spørringer på sammendrag" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049 + #, c-format +@@ -1056,7 +1059,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Kan ikke sortere på et felt som kan ha flere verdier" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1064,7 +1067,7 @@ msgid "" + msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1082,20 +1085,20 @@ msgid "" + "addressbook. Delete one of the entries in the 'folders' table first." + msgstr "" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format + msgid "Invalid query: %s" + msgstr "Ugyldig spørring: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Ugyldig spørring for EbSqlCursor" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Kan ikke sortere på et felt som ikke er av type streng" + +@@ -1303,31 +1306,35 @@ msgstr "Mangler UID for kilde" + msgid "No such source for UID '%s'" + msgstr "Kilden eksisterer ikke for UID «%s»" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Tjener kan ikke nås (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Klarte ikke å koble til en tjener med SSL: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Uventet HTTP-statuskode %d mottatt (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "CalDAV-motor er ikke lastet ennå" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Ugyldig objekt for omdirigering" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Kan ikke opprette lokal buffermappe «%s»" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1336,32 +1343,27 @@ msgstr "" + "Tjeneren kan ikke nås. Kalender åpnes i skrivebeskyttet modus.\n" + "Feilmelding: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Kan ikke opprette lokal buffermappe «%s»" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV støtter ikke å legge til flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV støtter ikke å endre flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV støtter ikke fjerning av flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Kalender støtter ikke ledig/opptatt" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "URL for kalenderutboks" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Uventet resultat i schedule-response" + +@@ -1388,27 +1390,27 @@ msgstr "Kan ikke lagre kalenderdata: Feil i URI." + msgid "Cannot save calendar data" + msgstr "Kan ikke lagre kalenderdata" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Feilutformet URI: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Omdirigert til ugyldig URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Ugyldig filformat." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Ikke en kalender." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Kunne ikke opprette bufferfil" +@@ -1456,25 +1458,25 @@ msgstr "Vær: Tordenvær" + #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN) + #: ../calendar/backends/weather/e-cal-backend-weather.c:329 + #, c-format +-msgid "%.1f °F" +-msgstr "" ++msgid "%.1f ےF" ++msgstr "%.1f ےF" + + #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN) + #: ../calendar/backends/weather/e-cal-backend-weather.c:332 + #, c-format +-msgid "%.1f °C" +-msgstr "" ++msgid "%.1f ےC" ++msgstr "%.1f ےC" + + #. TRANSLATOR: This is the temperature in kelvin + #: ../calendar/backends/weather/e-cal-backend-weather.c:335 + #, c-format + msgid "%.1f K" +-msgstr "" ++msgstr "%.1f K" + + #: ../calendar/backends/weather/e-cal-backend-weather.c:341 + #, c-format + msgid "%.1f" +-msgstr "" ++msgstr "%.1f" + + #: ../calendar/backends/weather/e-cal-backend-weather.c:452 + msgid "Forecast" +@@ -2038,7 +2040,7 @@ msgstr "Ugyldige argumenter til (system-flag)" + msgid "Invalid arguments to (user-tag)" + msgstr "Ugyldige argumenter til (user-tag)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Feil under lagring av filtersøk: %s: %s" +@@ -2065,7 +2067,7 @@ msgstr[0] "Filtrerer ny melding i «%s»" + msgstr[1] "Filtrerer nye meldinger i «%s»" + + #: ../camel/camel-folder.c:1011 +-#: ../camel/providers/local/camel-maildir-folder.c:319 ++#: ../camel/providers/local/camel-maildir-folder.c:330 + msgid "Moving messages" + msgstr "Flytter meldinger" + +@@ -2078,57 +2080,57 @@ msgstr "Kopierer meldinger" + msgid "Quota information not supported for folder '%s'" + msgstr "Kvoteinformasjon er ikke støttet for mappe «%s»" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Tømmer mappe «%s»" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Henter melding «%s» i %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Henter kvoteinformasjon for «%s»" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Oppdaterer mappe «%s»" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) krever et enkelt bolsk resultat" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) tillates ikke inne i %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) krever en streng for trefftype" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) forventer resultat på tabellform" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) krever et mappesett" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2137,7 +2139,7 @@ msgstr "" + "Kan ikke tolke uttrykket: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2383,7 +2385,7 @@ msgstr "Ikke noe innhold tilgjengelig" + msgid "No signature available" + msgstr "Ingen signatur tilgjengelig" + +-#: ../camel/camel-multipart-signed.c:779 ++#: ../camel/camel-multipart-signed.c:806 + #, c-format + msgid "parse error" + msgstr "lesefeil" +@@ -2407,10 +2409,6 @@ msgstr "Navneoppslag «%s» feilet. Sjekk vertsnavnet for stavefeil." + msgid "Host lookup '%s' failed: %s" + msgstr "Navneoppslag «%s» feilet: %s" + +-#: ../camel/camel-network-service.c:1009 +-msgid "No host information available" +-msgstr "Ingen vertsinformasjon tilgjengelig" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Laster ned nye meldinger for frakoblet modus" +@@ -2691,7 +2689,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Ugyldig GType registrert for protokoll «%s»" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2930,14 +2928,14 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer" + msgid "Creating folder '%s'" + msgstr "Lager mappe «%s»" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 +-#: ../camel/providers/local/camel-maildir-store.c:315 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 ++#: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:846 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon" +@@ -3010,17 +3008,17 @@ msgstr "_Oppdater automatisk ved endring i kildemapper" + msgid "Unmatched" + msgstr "Ingen treff" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Kan ikke slette mappe: %s: Ingen slik mappe" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Slå på _mappe uten treff" + +@@ -3032,46 +3030,46 @@ msgstr "Kan ikke kopiere meldinger til papirkurvmappen" + msgid "Cannot copy messages to the Junk folder" + msgstr "Kan ikke kopiere meldinger til søppelmappen" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe «%s»" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Ingen målmappe oppgitt" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Kan ikke flytte uønskede meldinger" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Kan ikke flytte slettede meldinger" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Bruk mappe_filter på denne mappen" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Kunne ikke lage sammendrag for mappe %s" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Kunne ikke lage mellomlager for %s: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Ingen IMAP-postboks tilgjengelig for mappe «%s»" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Kildestrøm returnerte ingen data" +@@ -3097,23 +3095,31 @@ msgid "_Listen for server change notifications" + msgstr "_Lytt etter endringsvarsling fra tjener" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++msgid "Connection to Server" ++msgstr "Tilkobling til tjener" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "Antall samtidige tilkoblinger som skal b_rukes" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Vi_s kun abonnerte mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "O_verstyr tjeners navneområde for mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Navneområde:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3121,262 +3127,264 @@ msgstr "Navneområde:" + msgid "Options" + msgstr "Alternativer" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Bruk filtre for nye meldinger i alle mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Bruk filtre for nye meldinger i Innboks på denne tjeneren" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Se etter søppelinn_hold i nye meldinger" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Se kun etter søppelinnhold i nye meldinger i inn_boksen" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Forvalgt port for IMAP" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP over SSL" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "For lesing og lagring av e-post på IMAP-tjenere." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Ikke autentisert" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Tjener frakoblet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Feil ved skriving til mellomlagerstrøm" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Feil ved utføring av IDLE" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "STARTTLS er ikke støttet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Klarte ikke å koble til IMAP-tjener %s i sikker modus: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP-tjener %s støtter ikke autentiseringstype %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Kan ikke autentisere uten brukernavn" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Passord for autentisering er ikke tilgjengelig" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Feil ved henting av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Klarte ikke å lukke midlertidig strøm" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Klarte ikke å kopiere midlertidig fil" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Feil ved flytting av meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Feil ved kopiering av meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Feil ved forsøk på å legge til en melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Feil ved henting av meldingshoder" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Feil ved henting av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Henter sammendragsinformasjon for nye meldinger i «%s»" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Søker etter endrede meldinger i «%s»" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Feil ved henting av nye meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Feil ved oppdatering av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Feil ved tømming av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Feil ved henting av mapper" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Feil ved oppretting av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Feil ved sletting av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Feil ved endring av navn på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Feil ved abonnering på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Feil ved fjerning av abonnement på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Feil ved henting av kvoteinformasjon" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Søk feilet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Feil ved utføring av NOOP" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Feil ved synkronisering av endringer" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Kan ikke hente melding med meldings-ID %s: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Ingen slik melding tilgjengelig." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8658 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Kan ikke spool-fil: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9400 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP-tjener støtter ikke kvoter" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 +-#: ../camel/providers/local/camel-maildir-folder.c:471 +-#: ../camel/providers/local/camel-maildir-store.c:316 +-#: ../camel/providers/local/camel-maildir-store.c:758 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:847 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:482 ++#: ../camel/providers/local/camel-maildir-store.c:322 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Innboks" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP-tjener %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP-tjeneste for %s på %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Passord" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-" + "passord." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Mappen %s eksisterer ikke" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 + #, c-format + msgid "No IMAP namespace for folder path '%s'" +-msgstr "" ++msgstr "IMAP-navneområde for mappesti «%s» finnes ikke" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Henter mappeliste for %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3391,27 +3399,27 @@ msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" + msgid "You must be working online to complete this operation" + msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "postboks: %s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Indekser data i meldingskropp" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3505,7 +3513,7 @@ msgstr "Lagerrot %s er ikke en vanlig katalog" + #: ../camel/providers/local/camel-local-store.c:242 + #: ../camel/providers/local/camel-local-store.c:252 + #: ../camel/providers/local/camel-local-store.c:394 +-#: ../camel/providers/local/camel-maildir-store.c:150 ++#: ../camel/providers/local/camel-maildir-store.c:156 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Finner ikke mappe: %s: %s" +@@ -3532,79 +3540,80 @@ msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s" + msgid "Could not rename '%s': %s" + msgstr "Kunne ikke endre navn på «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-folder.c:98 +-#: ../camel/providers/local/camel-maildir-folder.c:333 +-#: ../camel/providers/local/camel-mbox-folder.c:115 +-#: ../camel/providers/local/camel-mbox-folder.c:328 ++#: ../camel/providers/local/camel-maildir-folder.c:109 ++#: ../camel/providers/local/camel-maildir-folder.c:344 ++#: ../camel/providers/local/camel-mbox-folder.c:126 ++#: ../camel/providers/local/camel-mbox-folder.c:339 + #: ../camel/providers/local/camel-mh-folder.c:157 + msgid "No such message" + msgstr "Ingen slik melding" + +-#: ../camel/providers/local/camel-maildir-folder.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:234 + #, c-format + msgid "Cannot append message to maildir folder: %s: " + msgstr "Kan ikke legge til melding i maildir mappe: %s: " + +-#: ../camel/providers/local/camel-maildir-folder.c:271 +-#: ../camel/providers/local/camel-maildir-folder.c:281 +-#: ../camel/providers/local/camel-mbox-folder.c:389 ++#: ../camel/providers/local/camel-maildir-folder.c:282 ++#: ../camel/providers/local/camel-maildir-folder.c:292 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + #: ../camel/providers/local/camel-mh-folder.c:169 + #: ../camel/providers/local/camel-mh-folder.c:179 + #, c-format + msgid "Cannot get message %s from folder %s: " + msgstr "Kan ikke hente melding %s fra mappe %s: " + +-#: ../camel/providers/local/camel-maildir-folder.c:351 ++#: ../camel/providers/local/camel-maildir-folder.c:362 + #, c-format + msgid "Cannot transfer message to destination folder: %s" + msgstr "Kan ikke overføre melding til målmappe: %s" + + #: ../camel/providers/local/camel-maildir-store.c:130 +-#: ../camel/providers/local/camel-maildir-store.c:855 ++#: ../camel/providers/local/camel-maildir-store.c:149 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Mappen %s eksisterer allerede" + +-#: ../camel/providers/local/camel-maildir-store.c:235 +-#: ../camel/providers/local/camel-maildir-store.c:266 ++#: ../camel/providers/local/camel-maildir-store.c:241 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mbox-store.c:401 + #: ../camel/providers/local/camel-mbox-store.c:422 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "Kan ikke opprette mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:250 ++#: ../camel/providers/local/camel-maildir-store.c:256 + #: ../camel/providers/local/camel-mbox-store.c:367 + #: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "Finner ikke mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:256 ++#: ../camel/providers/local/camel-maildir-store.c:262 + #: ../camel/providers/local/camel-mbox-store.c:377 + #: ../camel/providers/local/camel-mh-store.c:532 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "Finner ikke mappe «%s»: mappen eksisterer ikke." + +-#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-maildir-store.c:289 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "Kan ikke hente mappe «%s»: ikke en maildir katalog." + +-#: ../camel/providers/local/camel-maildir-store.c:347 +-#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-maildir-store.c:353 ++#: ../camel/providers/local/camel-maildir-store.c:393 + #: ../camel/providers/local/camel-mh-store.c:676 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "Kunne ikke slette mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:349 ++#: ../camel/providers/local/camel-maildir-store.c:355 + msgid "not a maildir directory" + msgstr "ikke en maildir katalog" + +-#: ../camel/providers/local/camel-maildir-store.c:630 +-#: ../camel/providers/local/camel-maildir-store.c:1069 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3625,29 +3634,29 @@ msgstr "Sjekker om mappen er konsistent" + msgid "Checking for new messages" + msgstr "Ser etter nye meldinger" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Lagrer mappe" + +-#: ../camel/providers/local/camel-mbox-folder.c:185 ++#: ../camel/providers/local/camel-mbox-folder.c:196 + #, c-format + msgid "Cannot open mailbox: %s: " + msgstr "Kan ikke åpne postboks: %s: " + +-#: ../camel/providers/local/camel-mbox-folder.c:251 ++#: ../camel/providers/local/camel-mbox-folder.c:262 + #, c-format + msgid "Cannot append message to mbox file: %s: " + msgstr "Kan ikke legge til melding i mbox-fil: %s: " + +-#: ../camel/providers/local/camel-mbox-folder.c:381 ++#: ../camel/providers/local/camel-mbox-folder.c:392 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres." + +-#: ../camel/providers/local/camel-mbox-folder.c:438 ++#: ../camel/providers/local/camel-mbox-folder.c:449 + #: ../camel/providers/local/camel-spool-folder.c:67 + #, c-format + msgid "Cannot create folder lock on %s: %s" +@@ -3725,48 +3734,48 @@ msgstr "Kunne ikke endre navn på «%s» til %s: %s" + msgid "Could not open folder: %s: %s" + msgstr "Kunne ikke åpne mappe %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Kan ikke sjekke mappe: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Kunne ikke åpne fil %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Kan ikke åpne midlertidig postboks: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Kunne ikke lukke kildemappe %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Kunne ikke lukke midlertidig mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Kunne ikke endre navn på mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Kunne ikke lagre mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3775,25 +3784,25 @@ msgstr "" + "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, " + "men fant den ikke.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Sammendrag og mappe stemmer ikke overens selv etter synkronisering" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Ukjent feil: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Skriving til midlertidig postboks feilet: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Skriving til midlertidig postboks feilet: %s: %s" +@@ -3914,21 +3923,21 @@ msgstr "" + "Mappen kan være korrupt, kopi lagret i «%s»" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Intern feil: UID har ugyldig format: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Kan ikke hente melding %s: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3942,16 +3951,16 @@ msgstr "Kan ikke hente melding %s: " + msgid "Posting failed: %s" + msgstr "Posting feilet: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Posting feilet: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Denne meldingen er ikke tilgjengelig" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format + msgid "You cannot copy messages from a NNTP folder" + msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe" +@@ -4678,8 +4687,8 @@ msgstr "(Utfaset) URL for automatisk konfigurasjon av proxy" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Navn på bussen forsvang (klient terminert?)" + +@@ -4689,8 +4698,8 @@ msgstr "Ingen svar fra klient" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Klienten avbrøt operasjon" + +@@ -4698,11 +4707,11 @@ msgstr "Klienten avbrøt operasjon" + msgid "Client reports password was rejected" + msgstr "Klienten rapporterer at passordet ble avvist" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Legg til dette passordet i nøkkelringen" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Passordet var ikke korrekt" + +@@ -4711,12 +4720,12 @@ msgstr "Passordet var ikke korrekt" + msgid "%s does not support authentication" + msgstr "%s støtter ikke autentisering" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s støtter ikke å lage eksterne ressurser" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s støtter ikke sletting av eksterne ressurser" +@@ -4731,38 +4740,38 @@ msgstr "Ingen fabrikk for motor for hash-nøkkel «%s»" + msgid "Data source is missing a [%s] group" + msgstr "Datakilden mangler en [%s]-gruppe" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Datakilde «%s» støtter ikke å lage eksterne ressurser" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "Datakilde «%s» har ingen samlingsmotor for å lage ekstern ressurs" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Datakilde «%s» støtter ikke sletting av eksterne ressurser" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "Datakilde «%s» har ingen samlingsmotor for å slette ekstern ressurs" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Datakilde «%s» støtter ikke OAuth 2.0 autentisering" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Filen må ha en «.source»-filtype" +@@ -4965,26 +4974,26 @@ msgstr "Vennligst oppgi passordet for oppgaveliste «%s»." + msgid "Please enter the password for account \"%s\"." + msgstr "Vennligst oppgi passordet for konto «%s»." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Kildefilen mangler en [%s]-gruppe" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Datakilde «%s» kan ikke fjernes" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Datakilde «%s» er ikke skrivbar" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Uten navn" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Signaturskriptet må være en lokal fil" +@@ -4994,7 +5003,7 @@ msgstr "Signaturskriptet må være en lokal fil" + msgid "Source '%s' does not support proxy lookups" + msgstr "Kilde «%s» støtter ikke oppslag via proxy" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5003,7 +5012,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av adressebok «%s». " + "Vil du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5012,7 +5021,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av kalender «%s». Vil " + "du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5021,7 +5030,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av notatliste «%s». " + "Vil du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5215,7 +5224,7 @@ msgstr "Klarte ikke å finne kontoelement" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Klarte ikke å finne ASUrl og OABUrl i svar fra automatisk gjenkjenning" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5224,18 +5233,23 @@ msgstr "" + "Kan ikke finne samsvarende konto å finne tilgangstegn for «%s» i org.gnome." + "OnlineAccounts-tjenesten" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Klarte ikke å hente et adgangstegn for «%s»: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Kalender" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Oppgaver" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5338,7 +5352,7 @@ msgstr "E-post" + msgid "Integrate your mailboxes" + msgstr "Integrer dine postbokser" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5352,7 +5366,9 @@ msgstr "" + #, c-format + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" +-msgstr "Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status %d (%s)" ++msgstr "" ++"Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status " ++"%d (%s)" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:101 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:298 +@@ -5383,10 +5399,6 @@ msgstr "Yahoo! kalender" + msgid "Yahoo! Mail" + msgstr "Yahoo! e-post" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Oppgaver" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +diff --git a/po/sr.po b/po/sr.po +index f6c4725..08a921c 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -9,8 +9,8 @@ msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" + "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-03-17 17:45+0000\n" +-"PO-Revision-Date: 2014-03-17 23:19+0200\n" ++"POT-Creation-Date: 2014-07-22 04:28+0000\n" ++"PO-Revision-Date: 2014-07-22 11:22+0200\n" + "Last-Translator: Мирослав Николић \n" + "Language-Team: Serbian \n" + "Language: sr\n" +@@ -21,79 +21,79 @@ msgstr "" + "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + "X-Project-Style: gnome\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Нисам успео да уклоним датотеку „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Нисам успео да направим директоријум „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Нисам успео да направим чврсту везу за извор „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Нема КИБ-а у контакту" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "Пронађени су сукобљавајући КИБ-ови у додатим контактима" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Учитавам..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Претражујем..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Покушах да изменим контакт „%s“ са прегледом који није усклађен" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Контакт „%s“ није пронађен" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Упит „%s“ није подржан" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Неисправан упит „%s“" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Затражили сте брисање неодносног курзора" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Нисам успео да преименујем стару базу података „%s“ у „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -108,67 +108,69 @@ msgstr "Нисам успео да преименујем стару базу п + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Непозната грешка" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Пропитујем за ажурираним контактима…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Пропитујем за ажурираним групама…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Позадинац не подржава групно додавање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Позадинац не подржава групно уређивање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Позадинац не подржава групно уклањање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Учитавам…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -177,131 +179,131 @@ msgid "Personal" + msgstr "Лично" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Пријатељи" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Породица" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Сарадници" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Нисам повезан" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Нисам успео да повежем користећи ни в3 ни в2 везице" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Поново се повезујем на ЛДАП сервер..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Неисправна ДН синтакса" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "Грешка ЛДАП-а 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: „NULL“ је враћено са првог уноса лдапа (ldap_first_entry)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Враћена је непозната врста резултата %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Враћена је непозната врста резултата претраге %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Примам резултате претраге са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Грешка током претраге" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Преузимам контакте (%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Додајем контакт на ЛДАП сервер..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Мењам контакт са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Уклањам контакт са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Нисам успео да добавим ДН за корисника „%s“" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Учитавам сажетак адресара..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "" + "Није успело налажење својства (PROPFIND) на вебдаву са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Нема тела одговора у резултатима налажења својстава вебдава" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Учитавам контакте (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Не могу да преобратим Соуп адресу у ниску" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Измењен је контакт на серверу —> не мењам" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Измена контакта није успела са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "Није успело брисање (DELETE) са ХТТП стањем %d" +@@ -905,8 +907,8 @@ msgstr "Списак имена Гугл разговора" + msgid "Twitter Name List" + msgstr "Списак Твитер имена" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:917 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Неименовани списак" + +@@ -1002,7 +1004,7 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Упит је садржао неподржане елементе" +@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Не могу да поређам према пољу које може имати више вредности" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1074,7 +1076,7 @@ msgstr "" + "Покушах да померим курзор уназад, али је он већ на почетку списка контакта" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1084,7 +1086,6 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-sqlite.c:524 + #, c-format +-#| msgid "Invalid contact field '%d' specified in summary" + msgid "Unsupported contact field '%d' specified in summary" + msgstr "Неподржано поље контакта „%d“ је наведено у сажетку" + +@@ -1096,22 +1097,20 @@ msgstr "" + "Не могу да надоградим базу података контаката из старе базе података са више " + "од једним адресаром. Обришите прво један од уноса у табели „фасцикли“." + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format +-#| msgid "Invalid query: " + msgid "Invalid query: %s" + msgstr "Неисправан упит: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 +-#| msgid "Invalid query: " ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Неисправан упит за ЕбСдбКурзор" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "За коришћење ЕбСкулКурзор-а мора бити наведено барем једно поље ређања" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Не могу да поређам према пољу које није врста ниске" + +@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " + msgstr "Не могу да уклоним контакте: " + + #: ../addressbook/libedata-book/e-data-book-cursor.c:772 +-#| msgid "%s does not support creating remote resources" + msgid "Cursor does not support setting the search expression" + msgstr "Курзор не подржава подешавање израза претраге" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:855 +-#| msgid "Store does not support an INBOX" + msgid "Cursor does not support step" + msgstr "Курзор не подржава корак" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:938 +-#| msgid "%s does not support authentication" + msgid "Cursor does not support alphabetic indexes" + msgstr "Курзор не подржава азбучне индексе" + +@@ -1322,31 +1318,35 @@ msgstr "Недостаје КИБ извора" + msgid "No such source for UID '%s'" + msgstr "Нема таквог извора за КИБ „%s“" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Сервер је недоступан (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Нисам успео да се повежем на сервер користећи ССЛ: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "Позадинац КолДАВ-а још увек није учитан" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Неисправна адреса преусмеравања" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Не могу да направим фасциклу месне оставе „%s“" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1355,32 +1355,27 @@ msgstr "" + "Сервер је недоступан, календар је отворен у режиму само за читање.\n" + "Порука грешке: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Не могу да направим фасциклу месне оставе „%s“" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "КолДАВ не подржава групно додавање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "КолДАВ не подржава групно уређивање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "КолДАВ не подржава групно уклањање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Календар не подржава Слободно / Заузето" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "Није пронађена адреса отпремног сандучета распореда" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Неочекиван резултат у распореду-одговору" + +@@ -1407,27 +1402,27 @@ msgstr "Не могу да сачувам податак из календара + msgid "Cannot save calendar data" + msgstr "Не могу да сачувам податке календара" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Лоша адреса: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Преусмерено на неисправну адресу" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Лош облик датотеке." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Није календар." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Не могу да направим датотеку за оставу" +@@ -2057,7 +2052,7 @@ msgstr "Неисправни аргументи за (системска-озн + msgid "Invalid arguments to (user-tag)" + msgstr "Неисправни аргументи за (корисничка-ознака)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Грешка у примени филтера за претрагу: %s: %s" +@@ -2103,57 +2098,57 @@ msgstr "Умножавам поруке" + msgid "Quota information not supported for folder '%s'" + msgstr "Обавештење о количини није подржано за фасциклу „%s“" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Празним фасциклу „%s“" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Довлачим поруку „%s“ у %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Довлачим обавештење о количини за „%s“" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Освежавам фасциклу „%s“" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) захтева само један логички резултат" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) није дозвољено унутар %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) захтева ниску са типом поклапања" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) очекује низ као резултат" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) захтева скуп фасцикли" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2162,7 +2157,7 @@ msgstr "" + "Не могу да анализирам израз претраге: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2436,11 +2431,6 @@ msgstr "" + msgid "Host lookup '%s' failed: %s" + msgstr "Није успело тражење домаћина „%s“: %s" + +-#: ../camel/camel-network-service.c:1009 +-#| msgid "No quota information available for folder '%s'" +-msgid "No host information available" +-msgstr "Нису доступни подаци о домаћину" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Преузимам нове поруке за рад ван мреже" +@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Неисправна Гврста регистрована за протокол „%s“" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2961,21 +2951,20 @@ msgstr "Не могу да направим фасциклу: %s: фасцикл + msgid "Creating folder '%s'" + msgstr "Стварам фасциклу „%s“" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 + #: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Не могу да обришем фасциклу: %s: неисправна операција" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Не могу да преименујем фасциклу: %s: неисправна операција" + + #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 + #, c-format +-#| msgid "Data source '%s' is not removable" + msgid "Stream type '%s' is not seekable" + msgstr "Врста тока „%s“ се не може премотати" + +@@ -3042,17 +3031,17 @@ msgstr "Сам _ажурирај ори измени у изворним фас + msgid "Unmatched" + msgstr "Непоклопљено" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Не могу да обришем фасциклу: %s: нема такве фасцикле" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Укључи _непоклопљене фасцикле" + +@@ -3064,47 +3053,46 @@ msgstr "Не могу да умножим поруке у фасциклу за + msgid "Cannot copy messages to the Junk folder" + msgstr "Не могу да умножим поруке у фасциклу за ђубре" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Обавештење о количини није доступно за фасциклу „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Није наведена фасцикла одредишта" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Не могу да преместим непожељне поруке" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Не могу да преместим обрисане поруке" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Примени _филтере поруке над овом фасциклом" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Не могу да направим сажетак фасцикле за „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Не могу да направим оставу за „%s“: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format +-#| msgid "No quota information available for folder '%s'" + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Ниједно ИМАП сандуче није доступно за фасциклу „%s“" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Одговор изворног тока је без података" +@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" + msgstr "_Ослушкуј за обавештењима о изменама сервера" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Evolution Data Server" ++msgid "Connection to Server" ++msgstr "Повезивање на сервер" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "_Број тренутних веза за коришћење" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Прик_ажи само пријављене фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "П_ремости облик имена фасцикле које даје сервер" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Облик имена:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3154,262 +3151,263 @@ msgstr "Облик имена:" + msgid "Options" + msgstr "Опције" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Примени филтере на нове поруке у свим _фасциклама" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Примени пропуснике на нове поруке у сандучету овог сервера" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Провери да нема _ђубрета међу новим порукама" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Провери да нема ђубрета само у фасцикли САН_ДУЧЕ" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Сам усклади уд_аљену пошту са локалном" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Основни порт ИМАП-а" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "ИМАП преко ССЛ-а" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "ИМАП+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "За читање и смештање поште на ИМАП сервере." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Непотврђеног идентитета" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Веза са сервером је искључена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Грешка приликом уписа у ток оставе" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Грешка приликом извршавања ИДЛЕ-а" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "СТАРТТЛС није подржано" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "ИМАП сервер „%s“ не подржава „%s“ пријављивање идентитета" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Не могу да потврдим идентитет без корисничког имена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Лозинка потврђивања идентитета није доступна" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Грешка приликом преузимања поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Нисам успео да затворим привремену датотеку" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Нисам успео да умножим привремену датотеку" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Грешка премештања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Грешка умножавања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Грешка прикачињања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Грешка преузимања заглавља поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Грешка довлачења поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Прикупљам преглед података нових порука у „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Прегледам измењене поруке у „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Грешка приликом преузимања нових порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Грешка током претраге" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Грешка приликом избацивања поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Грешка приликом преузимања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Грешка приликом стварања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Грешка приликом брисања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Грешка приликом преименовања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Грешка приликом пријављивања на фасциклу" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 +-#| msgid "Error subscribing to folder" ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Грешка одјављивања са фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Грешка довлачења обавештења о количини" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Претрага није успела" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Грешка приликом обављања НООП-а" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Грешка приликом усклађивања измена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Не могу да набавим поруку са ИБ „%s“: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Нема такве поруке." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8661 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Не могу да направим датотеку припреме: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9403 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "ИМАП сервер не подржава количине" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 + #: ../camel/providers/local/camel-maildir-folder.c:482 + #: ../camel/providers/local/camel-maildir-store.c:322 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:770 +-#: ../camel/providers/local/camel-maildir-store.c:853 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Сандуче" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "ИМАП сервер „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "ИМАП сервис за „%s“ на „%s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Лозинка" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Ова опција ће повезати на ИМАП сервер коришћењем лозинке у обичном тексту." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Нема такве фасцикле „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 +-#, c-format, ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 ++#, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "Нема ИМАП простора назива за путању фасцикле „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Довлачим списак фасцикле за „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3424,27 +3422,27 @@ msgstr "Име фасцикле „%s“ није исправно јер сад + msgid "You must be working online to complete this operation" + msgstr "Морате да будете на мрежи да бисте завршили ову операцију" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "поштанско сандуче:%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Попиши садржаје порука" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3595,7 +3593,7 @@ msgstr "Не могу да пребацим поруку у одредишну + + #: ../camel/providers/local/camel-maildir-store.c:130 + #: ../camel/providers/local/camel-maildir-store.c:149 +-#: ../camel/providers/local/camel-maildir-store.c:861 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Фасцикла „%s“ већ постоји" +@@ -3638,8 +3636,8 @@ msgstr "Не могу да обришем фасциклу „%s“: %s" + msgid "not a maildir directory" + msgstr "није директоријум поште" + +-#: ../camel/providers/local/camel-maildir-store.c:636 +-#: ../camel/providers/local/camel-maildir-store.c:1075 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3660,10 +3658,10 @@ msgstr "Проверавам целовитост фасцикле" + msgid "Checking for new messages" + msgstr "Вршим проверу за новим порукама" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Смештам фасциклу" +@@ -3761,48 +3759,48 @@ msgstr "Не могу да преименујем „%s“ у „%s“: %s" + msgid "Could not open folder: %s: %s" + msgstr "Не могу да отворим фасциклу: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Не могу да проверим фасциклу: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Не могу да отворим датотеку: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Не могу да отворим привремено поштанско сандуче: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Не могу да затворим изворну фасциклу „%s“: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Не могу да затворим привремену фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Не могу да преименујем фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Не могу да сачувам фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3811,25 +3809,25 @@ msgstr "" + "МБОКС датотека је оштећена, поправите је. (Очекивано је „Из реда“, али нисам " + "добио.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Неслагање прегледа и фасцикле, чак и након усклађивања" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Непозната грешка: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s: %s" +@@ -3950,21 +3948,21 @@ msgstr "" + "Фасцикла је можда оштећена, умножите сачувано у „%s“" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Унутрашња грешка: КИБ у неисправном облику: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Не могу да добавим поруку „%s“: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3978,18 +3976,17 @@ msgstr "Не могу да добавим поруку „%s“: " + msgid "Posting failed: %s" + msgstr "Неуспела пошиљка: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Неуспела пошиљка: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Ова порука није тренутно доступна" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format +-#| msgid "You cannot copy messages from a NNTP folder!" + msgid "You cannot copy messages from a NNTP folder" + msgstr "Не можете да умножите поруке из ННТП фасцикле" + +@@ -4652,7 +4649,6 @@ msgstr "" + "Јединице за подсетник на рођендане или годишњице, „минути“, „сати“ или „дани“" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 +-#| msgid "Proxy type to use" + msgid "(Deprecated) Proxy type to use" + msgstr "(Застарело) Врста посредника за коришћење" + +@@ -4667,69 +4663,57 @@ msgstr "" + "Еволуције. Видите АПИ документацију „ESourceProxy“ за појединости." + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 +-#| msgid "Whether to use http-proxy" + msgid "(Deprecated) Whether to use http-proxy" + msgstr "(Застарело) Да ли да користи хттп-посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 +-#| msgid "Whether proxy server requires authentication" + msgid "(Deprecated) Whether proxy server requires authentication" + msgstr "(Застарело) Да ли сервер посредник захтева потврду идентитета" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 +-#| msgid "Host name for HTTP requests" + msgid "(Deprecated) Host name for HTTP requests" + msgstr "(Застарело) Назив домаћина за ХТТП захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Port number for HTTP requests" + msgid "(Deprecated) Port number for HTTP requests" + msgstr "(Застарело) Број прикључника за ХТТП захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 +-#| msgid "Proxy authentication user name" + msgid "(Deprecated) Proxy authentication user name" + msgstr "(Застарело) Корисничко име потврде идентитета посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 +-#| msgid "Proxy authentication password" + msgid "(Deprecated) Proxy authentication password" + msgstr "(Застарело) Лозинка потврде идентитета посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 +-#| msgid "List of hosts to connect to without proxy" + msgid "(Deprecated) List of hosts to connect to without proxy" + msgstr "(Застарело) Списак домаћина за повезивање без посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 +-#| msgid "Host name for HTTPS requests" + msgid "(Deprecated) Host name for HTTPS requests" + msgstr "(Застарело) Назив домаћина за ХТТПС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 +-#| msgid "Port number for HTTPS requests" + msgid "(Deprecated) Port number for HTTPS requests" + msgstr "(Застарело) Број прикључника за ХТТПС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 +-#| msgid "Host name for SOCKS requests" + msgid "(Deprecated) Host name for SOCKS requests" + msgstr "(Застарело) Назив домаћина за СОЦКС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 +-#| msgid "Port number for SOCKS requests" + msgid "(Deprecated) Port number for SOCKS requests" + msgstr "(Застарело) Број прикључника за СОЦКС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 +-#| msgid "Automatic proxy configuration URL" + msgid "(Deprecated) Automatic proxy configuration URL" + msgstr "(Застарело) Адреса за самоподешавање посредника" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Назив сабирнице је нестао (клијент је окончан?)" + +@@ -4739,8 +4723,8 @@ msgstr "Нема одговора са клијента" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Клијент је отказао сте операцију" + +@@ -4748,11 +4732,11 @@ msgstr "Клијент је отказао сте операцију" + msgid "Client reports password was rejected" + msgstr "Лозинка извештаја клијента је одбијена" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Додајте ову лозинку у ваш привезак" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Лозинка је неисправна" + +@@ -4761,12 +4745,12 @@ msgstr "Лозинка је неисправна" + msgid "%s does not support authentication" + msgstr "„%s“ не подржава потврђивање идентитета" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "„%s“ не подржава стварање удаљених изворишта" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "„%s“ не подржава брисање удаљених изворишта" +@@ -4781,40 +4765,40 @@ msgstr "Нема погона позадинца за тастер мешања + msgid "Data source is missing a [%s] group" + msgstr "Извору података недостаје [%s] група" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Извор података „%s“ не подржава стварање удаљених изворишта" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "" + "Извор података „%s“ нема позадинца збирке да би направио удаљено извориште" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Извор података „%s“ не подржава брисање удаљених изворишта" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "" + "Извор података „%s“ нема позадинца збирке да би обрисао удаљено извориште" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Извор података „%s“ не подржава ОАут 2.0 потврђивање идентитета" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Датотека мора да има наставак „.source“" +@@ -5018,37 +5002,36 @@ msgstr "Унесите лозинку за списак задужења „%s + msgid "Please enter the password for account \"%s\"." + msgstr "Унесите лозинку за налог „%s“." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Изворној датотеци недостаје [%s] група" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Извор података „%s“ се не може уклонити" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Извор подтака „%s“ није уписив" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Неименован" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Скрипта потписа мора да буде месна датотека" + + #: ../libedataserver/e-source-proxy.c:1646 + #, c-format +-#| msgid "Data source '%s' does not support creating remote resources" + msgid "Source '%s' does not support proxy lookups" + msgstr "Извор „%s“ не подржава тражења посредника" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5057,7 +5040,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користи адресар „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5066,7 +5049,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користи календар „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5075,7 +5058,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користе белешке „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5269,7 +5252,7 @@ msgstr "Нисам успео да пронађем елемент налога" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Нисам успео да пронађем АСадресу и ОАБадресу у одговору самооткривања" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5278,18 +5261,23 @@ msgstr "" + "Не могу да пронађем одговарајући налог на услузи „орг.гном.Налози на мрежи“ " + "са које бих добио приступ за „%s“." + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Нисам успео да добијем приступ за „%s“: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Календар" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Задужења" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5388,7 +5376,7 @@ msgstr "Пошта" + msgid "Integrate your mailboxes" + msgstr "Обједините ваше сандучиће" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5400,7 +5388,6 @@ msgstr "" + #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 + #, c-format +-#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" + msgstr "" +@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " + msgstr "Грешка обраде одговора као ЈСОН:" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'email' in JSON data" + msgstr "Нисам нашао „email“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'id' in JSON data" + msgstr "Нисам нашао „id“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'emails.account' in JSON data" + msgstr "Нисам нашао „emails.account“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 +-#| msgid "Wants HTML Mail" + msgid "Windows Live Mail" + msgstr "Пошта Виндоуза уживо" + +@@ -5440,10 +5423,6 @@ msgstr "Јаху! календар" + msgid "Yahoo! Mail" + msgstr "Јаху! пошта" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Задужења" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5500,6 +5479,10 @@ msgstr "Не пресељавај корисничке податке из пр + msgid "_Dismiss" + msgstr "_Занемари" + ++#~| msgid "No quota information available for folder '%s'" ++#~ msgid "No host information available" ++#~ msgstr "Нису доступни подаци о домаћину" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "Можда нећете моћи да увезете кључеве са овим алгоритмом" + +diff --git a/po/sr@latin.po b/po/sr@latin.po +index c238a0e..2b70068 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -9,8 +9,8 @@ msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" + "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-03-17 17:45+0000\n" +-"PO-Revision-Date: 2014-03-17 23:19+0200\n" ++"POT-Creation-Date: 2014-07-22 04:28+0000\n" ++"PO-Revision-Date: 2014-07-22 11:22+0200\n" + "Last-Translator: Miroslav Nikolić \n" + "Language-Team: Serbian \n" + "Language: sr\n" +@@ -21,79 +21,79 @@ msgstr "" + "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + "X-Project-Style: gnome\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Nisam uspeo da uklonim datoteku „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Nisam uspeo da napravim direktorijum „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Nisam uspeo da napravim čvrstu vezu za izvor „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Nema KIB-a u kontaktu" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "Pronađeni su sukobljavajući KIB-ovi u dodatim kontaktima" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Učitavam..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Pretražujem..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Pokušah da izmenim kontakt „%s“ sa pregledom koji nije usklađen" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Kontakt „%s“ nije pronađen" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Upit „%s“ nije podržan" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Neispravan upit „%s“" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Zatražili ste brisanje neodnosnog kurzora" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -108,67 +108,69 @@ msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Nepoznata greška" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Propitujem za ažuriranim kontaktima…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Propitujem za ažuriranim grupama…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Pozadinac ne podržava grupno dodavanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Pozadinac ne podržava grupno uređivanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Pozadinac ne podržava grupno uklanjanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Učitavam…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -177,131 +179,131 @@ msgid "Personal" + msgstr "Lično" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Prijatelji" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Porodica" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Saradnici" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Nisam povezan" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Nisam uspeo da povežem koristeći ni v3 ni v2 vezice" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Ponovo se povezujem na LDAP server..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Neispravna DN sintaksa" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "Greška LDAP-a 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa (ldap_first_entry)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Vraćena je nepoznata vrsta rezultata %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Vraćena je nepoznata vrsta rezultata pretrage %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Primam rezultate pretrage sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Greška tokom pretrage" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Preuzimam kontakte (%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Dodajem kontakt na LDAP server..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Menjam kontakt sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Uklanjam kontakt sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Nisam uspeo da dobavim DN za korisnika „%s“" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Učitavam sažetak adresara..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "" + "Nije uspelo nalaženje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Nema tela odgovora u rezultatima nalaženja svojstava vebdava" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Učitavam kontakte (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Ne mogu da preobratim Soup adresu u nisku" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Izmenjen je kontakt na serveru —> ne menjam" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Izmena kontakta nije uspela sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d" +@@ -905,8 +907,8 @@ msgstr "Spisak imena Gugl razgovora" + msgid "Twitter Name List" + msgstr "Spisak Tviter imena" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:917 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Neimenovani spisak" + +@@ -1002,7 +1004,7 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Upit je sadržao nepodržane elemente" +@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Ne mogu da poređam prema polju koje može imati više vrednosti" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1074,7 +1076,7 @@ msgstr "" + "Pokušah da pomerim kurzor unazad, ali je on već na početku spiska kontakta" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1084,7 +1086,6 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-sqlite.c:524 + #, c-format +-#| msgid "Invalid contact field '%d' specified in summary" + msgid "Unsupported contact field '%d' specified in summary" + msgstr "Nepodržano polje kontakta „%d“ je navedeno u sažetku" + +@@ -1096,22 +1097,20 @@ msgstr "" + "Ne mogu da nadogradim bazu podataka kontakata iz stare baze podataka sa više " + "od jednim adresarom. Obrišite prvo jedan od unosa u tabeli „fascikli“." + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format +-#| msgid "Invalid query: " + msgid "Invalid query: %s" + msgstr "Neispravan upit: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 +-#| msgid "Invalid query: " ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Neispravan upit za EbSdbKurzor" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "Za korišćenje EbSkulKurzor-a mora biti navedeno barem jedno polje ređanja" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Ne mogu da poređam prema polju koje nije vrsta niske" + +@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " + msgstr "Ne mogu da uklonim kontakte: " + + #: ../addressbook/libedata-book/e-data-book-cursor.c:772 +-#| msgid "%s does not support creating remote resources" + msgid "Cursor does not support setting the search expression" + msgstr "Kurzor ne podržava podešavanje izraza pretrage" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:855 +-#| msgid "Store does not support an INBOX" + msgid "Cursor does not support step" + msgstr "Kurzor ne podržava korak" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:938 +-#| msgid "%s does not support authentication" + msgid "Cursor does not support alphabetic indexes" + msgstr "Kurzor ne podržava azbučne indekse" + +@@ -1322,31 +1318,35 @@ msgstr "Nedostaje KIB izvora" + msgid "No such source for UID '%s'" + msgstr "Nema takvog izvora za KIB „%s“" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Server je nedostupan (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Nisam uspeo da se povežem na server koristeći SSL: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "Pozadinac KolDAV-a još uvek nije učitan" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Neispravna adresa preusmeravanja" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1355,32 +1355,27 @@ msgstr "" + "Server je nedostupan, kalendar je otvoren u režimu samo za čitanje.\n" + "Poruka greške: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "KolDAV ne podržava grupno dodavanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "KolDAV ne podržava grupno uređivanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "KolDAV ne podržava grupno uklanjanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Kalendar ne podržava Slobodno / Zauzeto" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "Nije pronađena adresa otpremnog sandučeta rasporeda" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Neočekivan rezultat u rasporedu-odgovoru" + +@@ -1407,27 +1402,27 @@ msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa." + msgid "Cannot save calendar data" + msgstr "Ne mogu da sačuvam podatke kalendara" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Loša adresa: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Preusmereno na neispravnu adresu" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Loš oblik datoteke." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Nije kalendar." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Ne mogu da napravim datoteku za ostavu" +@@ -2057,7 +2052,7 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)" + msgid "Invalid arguments to (user-tag)" + msgstr "Neispravni argumenti za (korisnička-oznaka)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Greška u primeni filtera za pretragu: %s: %s" +@@ -2103,57 +2098,57 @@ msgstr "Umnožavam poruke" + msgid "Quota information not supported for folder '%s'" + msgstr "Obaveštenje o količini nije podržano za fasciklu „%s“" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Praznim fasciklu „%s“" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Dovlačim poruku „%s“ u %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Dovlačim obaveštenje o količini za „%s“" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Osvežavam fasciklu „%s“" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) zahteva samo jedan logički rezultat" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) nije dozvoljeno unutar %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) zahteva nisku sa tipom poklapanja" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) očekuje niz kao rezultat" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) zahteva skup fascikli" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2162,7 +2157,7 @@ msgstr "" + "Ne mogu da analiziram izraz pretrage: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2436,11 +2431,6 @@ msgstr "" + msgid "Host lookup '%s' failed: %s" + msgstr "Nije uspelo traženje domaćina „%s“: %s" + +-#: ../camel/camel-network-service.c:1009 +-#| msgid "No quota information available for folder '%s'" +-msgid "No host information available" +-msgstr "Nisu dostupni podaci o domaćinu" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Preuzimam nove poruke za rad van mreže" +@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Neispravna Gvrsta registrovana za protokol „%s“" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2961,21 +2951,20 @@ msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji" + msgid "Creating folder '%s'" + msgstr "Stvaram fasciklu „%s“" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 + #: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija" + + #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 + #, c-format +-#| msgid "Data source '%s' is not removable" + msgid "Stream type '%s' is not seekable" + msgstr "Vrsta toka „%s“ se ne može premotati" + +@@ -3042,17 +3031,17 @@ msgstr "Sam _ažuriraj ori izmeni u izvornim fasciklama" + msgid "Unmatched" + msgstr "Nepoklopljeno" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Uključi _nepoklopljene fascikle" + +@@ -3064,47 +3053,46 @@ msgstr "Ne mogu da umnožim poruke u fasciklu za smeće" + msgid "Cannot copy messages to the Junk folder" + msgstr "Ne mogu da umnožim poruke u fasciklu za đubre" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Nije navedena fascikla odredišta" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Ne mogu da premestim nepoželjne poruke" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Ne mogu da premestim obrisane poruke" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Primeni _filtere poruke nad ovom fasciklom" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Ne mogu da napravim sažetak fascikle za „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Ne mogu da napravim ostavu za „%s“: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format +-#| msgid "No quota information available for folder '%s'" + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Nijedno IMAP sanduče nije dostupno za fasciklu „%s“" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Odgovor izvornog toka je bez podataka" +@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" + msgstr "_Osluškuj za obaveštenjima o izmenama servera" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Evolution Data Server" ++msgid "Connection to Server" ++msgstr "Povezivanje na server" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "_Broj trenutnih veza za korišćenje" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Fascikle" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Prik_aži samo prijavljene fascikle" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "P_remosti oblik imena fascikle koje daje server" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Oblik imena:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3154,262 +3151,263 @@ msgstr "Oblik imena:" + msgid "Options" + msgstr "Opcije" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Primeni filtere na nove poruke u svim _fasciklama" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Primeni propusnike na nove poruke u sandučetu ovog servera" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Proveri da nema _đubreta među novim porukama" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Proveri da nema đubreta samo u fascikli SAN_DUČE" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Sam uskladi ud_aljenu poštu sa lokalnom" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Osnovni port IMAP-a" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP preko SSL-a" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "Za čitanje i smeštanje pošte na IMAP servere." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Nepotvrđenog identiteta" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Veza sa serverom je isključena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Greška prilikom upisa u tok ostave" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Greška prilikom izvršavanja IDLE-a" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "STARTTLS nije podržano" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP server „%s“ ne podržava „%s“ prijavljivanje identiteta" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Ne mogu da potvrdim identitet bez korisničkog imena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Lozinka potvrđivanja identiteta nije dostupna" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Greška prilikom preuzimanja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Nisam uspeo da zatvorim privremenu datoteku" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Nisam uspeo da umnožim privremenu datoteku" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Greška premeštanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Greška umnožavanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Greška prikačinjanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Greška preuzimanja zaglavlja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Greška dovlačenja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Prikupljam pregled podataka novih poruka u „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Pregledam izmenjene poruke u „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Greška prilikom preuzimanja novih poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Greška tokom pretrage" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Greška prilikom izbacivanja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Greška prilikom preuzimanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Greška prilikom stvaranja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Greška prilikom brisanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Greška prilikom preimenovanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Greška prilikom prijavljivanja na fasciklu" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 +-#| msgid "Error subscribing to folder" ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Greška odjavljivanja sa fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Greška dovlačenja obaveštenja o količini" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Pretraga nije uspela" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Greška prilikom obavljanja NOOP-a" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Greška prilikom usklađivanja izmena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Nema takve poruke." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8661 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Ne mogu da napravim datoteku pripreme: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9403 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP server ne podržava količine" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 + #: ../camel/providers/local/camel-maildir-folder.c:482 + #: ../camel/providers/local/camel-maildir-store.c:322 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:770 +-#: ../camel/providers/local/camel-maildir-store.c:853 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Sanduče" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP server „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP servis za „%s“ na „%s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Lozinka" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Nema takve fascikle „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 +-#, c-format, ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 ++#, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "Nema IMAP prostora naziva za putanju fascikle „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Dovlačim spisak fascikle za „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3424,27 +3422,27 @@ msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" + msgid "You must be working online to complete this operation" + msgstr "Morate da budete na mreži da biste završili ovu operaciju" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "poštansko sanduče:%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Popiši sadržaje poruka" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3595,7 +3593,7 @@ msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s" + + #: ../camel/providers/local/camel-maildir-store.c:130 + #: ../camel/providers/local/camel-maildir-store.c:149 +-#: ../camel/providers/local/camel-maildir-store.c:861 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Fascikla „%s“ već postoji" +@@ -3638,8 +3636,8 @@ msgstr "Ne mogu da obrišem fasciklu „%s“: %s" + msgid "not a maildir directory" + msgstr "nije direktorijum pošte" + +-#: ../camel/providers/local/camel-maildir-store.c:636 +-#: ../camel/providers/local/camel-maildir-store.c:1075 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3660,10 +3658,10 @@ msgstr "Proveravam celovitost fascikle" + msgid "Checking for new messages" + msgstr "Vršim proveru za novim porukama" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Smeštam fasciklu" +@@ -3761,48 +3759,48 @@ msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s" + msgid "Could not open folder: %s: %s" + msgstr "Ne mogu da otvorim fasciklu: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Ne mogu da proverim fasciklu: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Ne mogu da otvorim datoteku: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Ne mogu da otvorim privremeno poštansko sanduče: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Ne mogu da zatvorim izvornu fasciklu „%s“: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Ne mogu da zatvorim privremenu fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Ne mogu da preimenujem fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Ne mogu da sačuvam fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3811,25 +3809,25 @@ msgstr "" + "MBOKS datoteka je oštećena, popravite je. (Očekivano je „Iz reda“, ali nisam " + "dobio.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Neslaganje pregleda i fascikle, čak i nakon usklađivanja" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Nepoznata greška: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s: %s" +@@ -3950,21 +3948,21 @@ msgstr "" + "Fascikla je možda oštećena, umnožite sačuvano u „%s“" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Ne mogu da dobavim poruku „%s“: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3978,18 +3976,17 @@ msgstr "Ne mogu da dobavim poruku „%s“: " + msgid "Posting failed: %s" + msgstr "Neuspela pošiljka: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Neuspela pošiljka: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Ova poruka nije trenutno dostupna" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format +-#| msgid "You cannot copy messages from a NNTP folder!" + msgid "You cannot copy messages from a NNTP folder" + msgstr "Ne možete da umnožite poruke iz NNTP fascikle" + +@@ -4652,7 +4649,6 @@ msgstr "" + "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 +-#| msgid "Proxy type to use" + msgid "(Deprecated) Proxy type to use" + msgstr "(Zastarelo) Vrsta posrednika za korišćenje" + +@@ -4667,69 +4663,57 @@ msgstr "" + "Evolucije. Vidite API dokumentaciju „ESourceProxy“ za pojedinosti." + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 +-#| msgid "Whether to use http-proxy" + msgid "(Deprecated) Whether to use http-proxy" + msgstr "(Zastarelo) Da li da koristi http-posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 +-#| msgid "Whether proxy server requires authentication" + msgid "(Deprecated) Whether proxy server requires authentication" + msgstr "(Zastarelo) Da li server posrednik zahteva potvrdu identiteta" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 +-#| msgid "Host name for HTTP requests" + msgid "(Deprecated) Host name for HTTP requests" + msgstr "(Zastarelo) Naziv domaćina za HTTP zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Port number for HTTP requests" + msgid "(Deprecated) Port number for HTTP requests" + msgstr "(Zastarelo) Broj priključnika za HTTP zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 +-#| msgid "Proxy authentication user name" + msgid "(Deprecated) Proxy authentication user name" + msgstr "(Zastarelo) Korisničko ime potvrde identiteta posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 +-#| msgid "Proxy authentication password" + msgid "(Deprecated) Proxy authentication password" + msgstr "(Zastarelo) Lozinka potvrde identiteta posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 +-#| msgid "List of hosts to connect to without proxy" + msgid "(Deprecated) List of hosts to connect to without proxy" + msgstr "(Zastarelo) Spisak domaćina za povezivanje bez posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 +-#| msgid "Host name for HTTPS requests" + msgid "(Deprecated) Host name for HTTPS requests" + msgstr "(Zastarelo) Naziv domaćina za HTTPS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 +-#| msgid "Port number for HTTPS requests" + msgid "(Deprecated) Port number for HTTPS requests" + msgstr "(Zastarelo) Broj priključnika za HTTPS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 +-#| msgid "Host name for SOCKS requests" + msgid "(Deprecated) Host name for SOCKS requests" + msgstr "(Zastarelo) Naziv domaćina za SOCKS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 +-#| msgid "Port number for SOCKS requests" + msgid "(Deprecated) Port number for SOCKS requests" + msgstr "(Zastarelo) Broj priključnika za SOCKS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 +-#| msgid "Automatic proxy configuration URL" + msgid "(Deprecated) Automatic proxy configuration URL" + msgstr "(Zastarelo) Adresa za samopodešavanje posrednika" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Naziv sabirnice je nestao (klijent je okončan?)" + +@@ -4739,8 +4723,8 @@ msgstr "Nema odgovora sa klijenta" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Klijent je otkazao ste operaciju" + +@@ -4748,11 +4732,11 @@ msgstr "Klijent je otkazao ste operaciju" + msgid "Client reports password was rejected" + msgstr "Lozinka izveštaja klijenta je odbijena" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Dodajte ovu lozinku u vaš privezak" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Lozinka je neispravna" + +@@ -4761,12 +4745,12 @@ msgstr "Lozinka je neispravna" + msgid "%s does not support authentication" + msgstr "„%s“ ne podržava potvrđivanje identiteta" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "„%s“ ne podržava stvaranje udaljenih izvorišta" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "„%s“ ne podržava brisanje udaljenih izvorišta" +@@ -4781,40 +4765,40 @@ msgstr "Nema pogona pozadinca za taster mešanja „%s“" + msgid "Data source is missing a [%s] group" + msgstr "Izvoru podataka nedostaje [%s] grupa" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Izvor podataka „%s“ ne podržava stvaranje udaljenih izvorišta" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "" + "Izvor podataka „%s“ nema pozadinca zbirke da bi napravio udaljeno izvorište" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Izvor podataka „%s“ ne podržava brisanje udaljenih izvorišta" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "" + "Izvor podataka „%s“ nema pozadinca zbirke da bi obrisao udaljeno izvorište" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Izvor podataka „%s“ ne podržava OAut 2.0 potvrđivanje identiteta" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Datoteka mora da ima nastavak „.source“" +@@ -5018,37 +5002,36 @@ msgstr "Unesite lozinku za spisak zaduženja „%s“." + msgid "Please enter the password for account \"%s\"." + msgstr "Unesite lozinku za nalog „%s“." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Izvornoj datoteci nedostaje [%s] grupa" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Izvor podataka „%s“ se ne može ukloniti" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Izvor podtaka „%s“ nije upisiv" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Neimenovan" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Skripta potpisa mora da bude mesna datoteka" + + #: ../libedataserver/e-source-proxy.c:1646 + #, c-format +-#| msgid "Data source '%s' does not support creating remote resources" + msgid "Source '%s' does not support proxy lookups" + msgstr "Izvor „%s“ ne podržava traženja posrednika" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5057,7 +5040,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koristi adresar „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5066,7 +5049,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koristi kalendar „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5075,7 +5058,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koriste beleške „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5269,7 +5252,7 @@ msgstr "Nisam uspeo da pronađem element naloga" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Nisam uspeo da pronađem ASadresu i OABadresu u odgovoru samootkrivanja" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5278,18 +5261,23 @@ msgstr "" + "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ " + "sa koje bih dobio pristup za „%s“." + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Nisam uspeo da dobijem pristup za „%s“: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Kalendar" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Zaduženja" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5388,7 +5376,7 @@ msgstr "Pošta" + msgid "Integrate your mailboxes" + msgstr "Objedinite vaše sandučiće" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5400,7 +5388,6 @@ msgstr "" + #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 + #, c-format +-#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" + msgstr "" +@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " + msgstr "Greška obrade odgovora kao JSON:" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'email' in JSON data" + msgstr "Nisam našao „email“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'id' in JSON data" + msgstr "Nisam našao „id“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'emails.account' in JSON data" + msgstr "Nisam našao „emails.account“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 +-#| msgid "Wants HTML Mail" + msgid "Windows Live Mail" + msgstr "Pošta Vindouza uživo" + +@@ -5440,10 +5423,6 @@ msgstr "Jahu! kalendar" + msgid "Yahoo! Mail" + msgstr "Jahu! pošta" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Zaduženja" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5500,6 +5479,10 @@ msgstr "Ne preseljavaj korisničke podatke iz prethodnih izdanja Evolucije" + msgid "_Dismiss" + msgstr "_Zanemari" + ++#~| msgid "No quota information available for folder '%s'" ++#~ msgid "No host information available" ++#~ msgstr "Nisu dostupni podaci o domaćinu" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "Možda nećete moći da uvezete ključeve sa ovim algoritmom" + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index e4120aa..61fb283 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -21,90 +21,90 @@ msgstr "" + "Project-Id-Version: evolution-data-server master\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" + "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-01-23 12:42+0000\n" +-"PO-Revision-Date: 2013-08-20 10:54+0800\n" +-"Last-Translator: Luo Lei \n" ++"POT-Creation-Date: 2014-07-29 04:28+0000\n" ++"PO-Revision-Date: 2014-07-29 16:34+0800\n" ++"Last-Translator: Yunqiang Su \n" + "Language-Team: Chinese (simplified) \n" + "Language: zh_CN\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 1.5.4\n" ++"X-Generator: Poedit 1.6.7\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "删除文件“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "创建目录“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "创建资源“%s”的硬链接失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "联系人没有 UID" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "增加的联系人有 UID 冲突" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "正在载入..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "正在搜索..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "试图修改失去同步的联系人“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "未找到联系人“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "不支持查询“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "无效的查询：“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "请求删除一个无关的 cursor" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -119,67 +119,69 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 +-#: ../calendar/libecal/e-cal-client.c:3237 +-#: ../calendar/libecal/e-cal-client.c:3410 +-#: ../calendar/libecal/e-cal-client.c:3674 +-#: ../calendar/libecal/e-cal-client.c:3915 +-#: ../calendar/libecal/e-cal-client.c:4103 +-#: ../calendar/libecal/e-cal-client.c:4295 +-#: ../calendar/libecal/e-cal-client.c:4465 +-#: ../calendar/libecal/e-cal-client.c:4634 +-#: ../calendar/libecal/e-cal-client.c:4837 +-#: ../calendar/libecal/e-cal-client.c:4987 +-#: ../calendar/libecal/e-cal-client.c:5181 +-#: ../calendar/libecal/e-cal-client.c:5334 +-#: ../calendar/libecal/e-cal-client.c:5551 +-#: ../calendar/libecal/e-cal-client.c:5705 +-#: ../calendar/libecal/e-cal-client.c:5931 +-#: ../calendar/libecal/e-cal-client.c:6127 +-#: ../calendar/libecal/e-cal-client.c:6490 +-#: ../calendar/libecal/e-cal-client.c:6704 +-#: ../camel/providers/imapx/camel-imapx-command.c:654 ++#: ../calendar/libecal/e-cal-client.c:3239 ++#: ../calendar/libecal/e-cal-client.c:3412 ++#: ../calendar/libecal/e-cal-client.c:3676 ++#: ../calendar/libecal/e-cal-client.c:3917 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "未知的错误" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "查询更新的联系人..." + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "查询更新的组..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "后端不支持批量添加" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "后端不支持批量修改" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "后端不支持批量删除" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "正在载入..." + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -188,129 +190,130 @@ msgid "Personal" + msgstr "个人" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "朋友" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "家人" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "同事" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "未连接。" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "无法使用 v3 或 v2 绑定" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "正在重新连接 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "无效 DN 语法" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP 错误 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s：ldap_first_entry 返回 NULL" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s：返回了未处理的结果类型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s：返回了未处理的搜索结果类型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "正在接收 LDAP 的搜索结果..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "执行搜索错误" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "正在下载联系人(%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "正在将联系人添加到 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "正在修改 LDAP 服务器上的联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "正在从 LDAP 服务器删除联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "无法获取用户“%s”的 DN" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "正在加载地址簿概要..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "在 webdav PROPFIND 结果中无应答主体" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "正在加载联系人(%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "无法将 SoupURI 转为字符串" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "服务器上的联系人已更改 -> 将不做更改" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "修改联系人失败，HTTP 状态码：%d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE 失败，HTTP 状态码：%d" +@@ -914,8 +917,8 @@ msgstr "Google Talk 姓名列表" + msgid "Twitter Name List" + msgstr "Twitter 姓名列表" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:881 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "未命名的列表" + +@@ -1008,7 +1011,7 @@ msgstr "缓存中没有保存完整的 search_contacts，无法返回电子名 + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "查询中包含不支持的元素" +@@ -1067,7 +1070,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "无法按可能有多个值的字段排序" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1075,7 +1078,7 @@ msgid "" + msgstr "尝试对 cursor 反向步进，但 cursor 已位于联系人列表的开头" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1095,20 +1098,20 @@ msgstr "" + "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一" + "条记录。" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format + msgid "Invalid query: %s" + msgstr "无效的查询：%s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "无效的 EbSqlCursor 查询" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "要使用 EbSqlCursor 至少要指定一个排序字段" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "无法按非字符串类型的字段排序" + +@@ -1316,31 +1319,35 @@ msgstr "缺少源 UID" + msgid "No such source for UID '%s'" + msgstr "没有 UID “%s”的源" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "服务器不可用 (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "无法使用 SSL 连接到服务器：%s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "返回了意外的 HTTP 状态代码 %d(%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "CalDAV 后端尚未加载" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "无效的重定向 URL" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "无法创建本地缓存文件夹“%s”" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1349,32 +1356,27 @@ msgstr "" + "服务器不可用，日历将以只读模式打开。\n" + "错误消息：%s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "无法创建本地缓存文件夹“%s”" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV 不支持批量添加" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV 不支持批量修改" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV 不支持批量删除" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "日历不支持空闲/繁忙" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "未找到定时发件箱 url" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "定时响应的结果异常" + +@@ -1401,27 +1403,27 @@ msgstr "无法保存日历数据：URI 格式错误。" + msgid "Cannot save calendar data" + msgstr "无法保存日历数据" + +-#: ../calendar/backends/http/e-cal-backend-http.c:483 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "URI 格式错误：%s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:574 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "已重定向到无效 URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:617 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "无效的文件格式。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:627 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "不是日历。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:914 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "无法创建缓存文件" +@@ -2049,94 +2051,94 @@ msgstr "(system-flag)参数无效" + msgid "Invalid arguments to (user-tag)" + msgstr "(user-tag)参数无效" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "执行过滤规则搜索错误：%s：%s" + +-#: ../camel/camel-folder.c:300 ++#: ../camel/camel-folder.c:323 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "在“%s”中学习新的垃圾邮件" + +-#: ../camel/camel-folder.c:340 ++#: ../camel/camel-folder.c:363 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "在“%s”中学习新的有害邮件" + +-#: ../camel/camel-folder.c:388 ++#: ../camel/camel-folder.c:411 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "在“%s”中过滤新消息" + +-#: ../camel/camel-folder.c:988 +-#: ../camel/providers/local/camel-maildir-folder.c:319 ++#: ../camel/camel-folder.c:1011 ++#: ../camel/providers/local/camel-maildir-folder.c:330 + msgid "Moving messages" + msgstr "移动消息" + +-#: ../camel/camel-folder.c:991 ++#: ../camel/camel-folder.c:1014 + msgid "Copying messages" + msgstr "复制消息" + +-#: ../camel/camel-folder.c:1033 ++#: ../camel/camel-folder.c:1056 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "文件夹“%s”不支持配额信息" + +-#: ../camel/camel-folder.c:2847 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "正在销毁文件夹“%s”" + +-#: ../camel/camel-folder.c:2975 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "正在获取 %2$s 中的消息“%1$s”" + +-#: ../camel/camel-folder.c:3166 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "正在获取“%s”的配额信息" + +-#: ../camel/camel-folder.c:3466 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "正在刷新文件夹“%s”" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) 需要一个布尔结果" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) 不允许在 %s 中使用" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) 需要一个匹配类型字符串" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) 需要一个数组结果" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) 需要文件夹集" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2145,7 +2147,7 @@ msgstr "" + "无法解析搜索表达式：%s：\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2379,17 +2381,17 @@ msgstr "写入邮件临时文件错误：%s" + msgid "Error copying mail temp file: %s" + msgstr "复制邮件临时文件错误：%s" + +-#: ../camel/camel-multipart-signed.c:279 ++#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432 + #, c-format + msgid "No content available" + msgstr "没有可用的内容" + +-#: ../camel/camel-multipart-signed.c:287 ++#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440 + #, c-format + msgid "No signature available" + msgstr "没有可用的签名" + +-#: ../camel/camel-multipart-signed.c:636 ++#: ../camel/camel-multipart-signed.c:806 + #, c-format + msgid "parse error" + msgstr "解析错误" +@@ -2413,10 +2415,6 @@ msgstr "主机“%s”查找失败，请检查主机名是否存在拼写错误 + msgid "Host lookup '%s' failed: %s" + msgstr "查找主机“%s”失败：%s" + +-#: ../camel/camel-network-service.c:1009 +-msgid "No host information available" +-msgstr "无可用的主机信息" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "下载新消息以进行离线操作" +@@ -2680,7 +2678,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "为协议“%s”注册的 GType 无效" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4629 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2887,49 +2885,44 @@ msgstr "将数据添加到编码器失败" + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME 解密：没有找到加密内容" + +-#: ../camel/camel-store.c:1201 +-#, c-format +-msgid "Cannot create folder '%s': folder exists" +-msgstr "无法创建文件夹“%s”文件夹已存在" +- +-#: ../camel/camel-store.c:1244 ++#: ../camel/camel-store.c:1232 + #, c-format + msgid "Opening folder '%s'" + msgstr "打开文件夹“%s”" + +-#: ../camel/camel-store.c:1471 ++#: ../camel/camel-store.c:1523 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "扫描“%s”中的文件夹" + +-#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544 ++#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596 + #: ../camel/camel-vtrash-folder.c:46 + msgid "Trash" + msgstr "回收站" + +-#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561 ++#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Junk" + msgstr "垃圾" + +-#: ../camel/camel-store.c:2162 ++#: ../camel/camel-store.c:2214 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "无法创建文件夹：%s：文件夹已存在" + +-#: ../camel/camel-store.c:2169 ++#: ../camel/camel-store.c:2221 + #, c-format + msgid "Creating folder '%s'" + msgstr "创建文件夹“%s”" + +-#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416 +-#: ../camel/providers/local/camel-maildir-store.c:320 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 ++#: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "无法删除文件夹：%s：无效操作" + +-#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:851 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "无法重命名文件夹：%s：无效操作" +@@ -3002,17 +2995,17 @@ msgstr "自动更新源文件夹中的更改(_U)" + msgid "Unmatched" + msgstr "无匹配" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "无法删除文件夹：%s：没有该文件夹" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "无法重命名文件夹：%s：没有该文件夹" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "启用不匹配的文件夹(_U)" + +@@ -3024,45 +3017,50 @@ msgstr "无法将消息复制到回收站文件夹" + msgid "Cannot copy messages to the Junk folder" + msgstr "无法将消息复制到垃圾邮件文件夹" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:654 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "文件夹“%s”配额信息未定义" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:768 +-#: ../camel/providers/imapx/camel-imapx-folder.c:861 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "目标文件夹未指定" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:796 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "无法移动垃圾信息" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:889 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "无法移动已删除信息" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1115 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "对这个文件夹应用消息过滤器(_F)" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1221 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "无法为 %s 创建文件夹概要" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1230 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "无法为 %s 创建缓存：" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1415 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format + msgid "No IMAP mailbox available for folder '%s'" + msgstr "文件夹“%s”没有可用的 IMAP 邮箱" + ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 ++#, c-format ++msgid "Source stream returned no data" ++msgstr "源流没返回数据" ++ + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" + msgstr "检查新邮件" +@@ -3084,23 +3082,33 @@ msgid "_Listen for server change notifications" + msgstr "监听服务器变化提醒(_L)" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Lost connection to IMAP server" ++msgid "Connection to Server" ++msgstr "到服务器的连接" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#| msgid "Numbe_r of cached connections to use" ++msgid "Numbe_r of concurrent connections to use" ++msgstr "使用的并发连接的数目(_R)" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "文件夹" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "只显示订阅了的文件夹(_S)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "覆盖服务器提供的文件夹命名空间(_V)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "命名空间：" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3108,311 +3116,297 @@ msgstr "命名空间：" + msgid "Options" + msgstr "选项" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "对所有文件夹中的新消息应用过滤规则(_F)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "检查新消息的垃圾内容(_J)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "仅在收件箱中检查垃圾邮件(_B)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "自动将远程邮件同步到本地(_Z)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "默认的 IMAP 端口" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP (SSL 加密)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "IMAP 服务器上的邮件的读写。" + +-#: ../camel/providers/imapx/camel-imapx-server.c:819 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "没有验证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1763 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "服务器断开连接" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2226 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "写入缓存流错误" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3596 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "执行 IDLE 命令出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4490 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4491 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "不支持 STARTTLS" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4538 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "以安全模式连接到 IMAP 服务器 %s 失败：" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4618 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP 服务器 %s 不支持 %s 认证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4648 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "无法进行无用户名的认证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4657 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "密码认证不可用" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4908 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "取回消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4954 +-#: ../camel/providers/imapx/camel-imapx-server.c:4961 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "无法关闭临时流" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4996 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "无法复制临时文件" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5122 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "移动消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5126 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "复制消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5285 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "追加消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5479 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "取回消息头出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5644 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "收取消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5774 +-#: ../camel/providers/imapx/camel-imapx-server.c:5997 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "获取“%s”中新消息的概要信息" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5826 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "扫描“%s”中更改了的消息" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5878 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "取回新消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6146 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "刷新文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6296 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "销毁消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6405 +-#: ../camel/providers/imapx/camel-imapx-server.c:6430 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "取回文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6510 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "创建文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6562 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "删除文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6629 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "重命名文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6716 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "订阅文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6776 ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "取消订阅文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6832 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "获取配额信息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6884 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "搜索失败" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6946 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "执行 NOOP 出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "同步变更出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7340 +-msgid "Lost connection to IMAP server" +-msgstr "与 IMAP 服务器的连接中断" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:8190 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "无法获取消息 ID %s：%s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8191 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "没有该消息。" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8390 +-#: ../camel/providers/imapx/camel-imapx-server.c:8405 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "无法创建离线文件：" + +-#: ../camel/providers/imapx/camel-imapx-server.c:9110 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP 服务器不支持配额" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 +-#: ../camel/providers/local/camel-maildir-folder.c:471 +-#: ../camel/providers/local/camel-maildir-store.c:321 +-#: ../camel/providers/local/camel-maildir-store.c:763 +-#: ../camel/providers/local/camel-maildir-store.c:769 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:482 ++#: ../camel/providers/local/camel-maildir-store.c:322 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "收件箱" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP 服务器 %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "%2$s 为 %1$s 提供的 IMAP 服务" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "密码" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1062 +-#: ../camel/providers/imapx/camel-imapx-store.c:2600 +-#: ../camel/providers/nntp/camel-nntp-store.c:1250 +-#: ../camel/providers/pop3/camel-pop3-folder.c:450 +-#: ../camel/providers/pop3/camel-pop3-folder.c:593 +-#: ../camel/providers/pop3/camel-pop3-folder.c:789 +-#: ../camel/providers/pop3/camel-pop3-folder.c:987 +-#: ../camel/providers/pop3/camel-pop3-store.c:299 +-#: ../camel/providers/pop3/camel-pop3-store.c:528 +-#: ../camel/providers/pop3/camel-pop3-store.c:576 +-#: ../camel/providers/pop3/camel-pop3-store.c:668 +-#: ../camel/providers/pop3/camel-pop3-store.c:1072 +-#, c-format +-msgid "You must be working online to complete this operation" +-msgstr "您必须在线工作以便完成该操作" +- +-#: ../camel/providers/imapx/camel-imapx-store.c:1129 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "没有文件夹 %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1524 ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 + #, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1673 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "正在获取“%s”的文件夹列表" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2079 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" + +-#: ../camel/providers/imapx/camel-imapx-stream.c:96 +-#, c-format +-msgid "Source stream returned no data" +-msgstr "源流没返回数据" +- +-#: ../camel/providers/imapx/camel-imapx-stream.c:105 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 ++#: ../camel/providers/nntp/camel-nntp-store.c:1250 ++#: ../camel/providers/pop3/camel-pop3-folder.c:450 ++#: ../camel/providers/pop3/camel-pop3-folder.c:593 ++#: ../camel/providers/pop3/camel-pop3-folder.c:789 ++#: ../camel/providers/pop3/camel-pop3-folder.c:987 ++#: ../camel/providers/pop3/camel-pop3-store.c:299 ++#: ../camel/providers/pop3/camel-pop3-store.c:528 ++#: ../camel/providers/pop3/camel-pop3-store.c:576 ++#: ../camel/providers/pop3/camel-pop3-store.c:668 ++#: ../camel/providers/pop3/camel-pop3-store.c:1072 + #, c-format +-msgid "Source stream unavailable" +-msgstr "源流不可用" ++msgid "You must be working online to complete this operation" ++msgstr "您必须在线工作以便完成该操作" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "邮件箱：%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "索引消息正文(_I)" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3492,7 +3486,7 @@ msgstr "本地邮件文件 %s" + #: ../camel/providers/local/camel-local-store.c:221 + #: ../camel/providers/local/camel-local-store.c:381 + #: ../camel/providers/local/camel-maildir-store.c:122 +-#: ../camel/providers/local/camel-mbox-store.c:579 ++#: ../camel/providers/local/camel-mbox-store.c:572 + #: ../camel/providers/local/camel-spool-store.c:87 + #, c-format + msgid "Store root %s is not an absolute path" +@@ -3506,7 +3500,7 @@ msgstr "存储根目录 %s 不是普通目录" + #: ../camel/providers/local/camel-local-store.c:242 + #: ../camel/providers/local/camel-local-store.c:252 + #: ../camel/providers/local/camel-local-store.c:394 +-#: ../camel/providers/local/camel-maildir-store.c:150 ++#: ../camel/providers/local/camel-maildir-store.c:156 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "无法获取文件夹：%s：%s" +@@ -3517,13 +3511,13 @@ msgid "Local stores do not have an inbox" + msgstr "本地存储没有收件箱" + + #: ../camel/providers/local/camel-local-store.c:454 +-#: ../camel/providers/local/camel-mbox-store.c:746 ++#: ../camel/providers/local/camel-mbox-store.c:739 + #, c-format + msgid "Could not delete folder index file '%s': %s" + msgstr "无法删除文件夹索引文件“%s”：%s" + + #: ../camel/providers/local/camel-local-store.c:482 +-#: ../camel/providers/local/camel-mbox-store.c:776 ++#: ../camel/providers/local/camel-mbox-store.c:769 + #, c-format + msgid "Could not delete folder meta file '%s': %s" + msgstr "无法删除文件夹元文件“%s”：%s" +@@ -3533,86 +3527,80 @@ msgstr "无法删除文件夹元文件“%s”：%s" + msgid "Could not rename '%s': %s" + msgstr "无法重命名“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-folder.c:98 +-#: ../camel/providers/local/camel-maildir-folder.c:333 +-#: ../camel/providers/local/camel-mbox-folder.c:115 +-#: ../camel/providers/local/camel-mbox-folder.c:328 ++#: ../camel/providers/local/camel-maildir-folder.c:109 ++#: ../camel/providers/local/camel-maildir-folder.c:344 ++#: ../camel/providers/local/camel-mbox-folder.c:126 ++#: ../camel/providers/local/camel-mbox-folder.c:339 + #: ../camel/providers/local/camel-mh-folder.c:157 + msgid "No such message" + msgstr "没有该消息" + +-#: ../camel/providers/local/camel-maildir-folder.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:234 + #, c-format + msgid "Cannot append message to maildir folder: %s: " + msgstr "无法将消息附加到邮件目录文件夹：%s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:271 +-#: ../camel/providers/local/camel-maildir-folder.c:281 +-#: ../camel/providers/local/camel-mbox-folder.c:389 ++#: ../camel/providers/local/camel-maildir-folder.c:282 ++#: ../camel/providers/local/camel-maildir-folder.c:292 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + #: ../camel/providers/local/camel-mh-folder.c:169 + #: ../camel/providers/local/camel-mh-folder.c:179 + #, c-format + msgid "Cannot get message %s from folder %s: " + msgstr "无法从文件夹 %2$s 获取消息 %1$s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:351 ++#: ../camel/providers/local/camel-maildir-folder.c:362 + #, c-format + msgid "Cannot transfer message to destination folder: %s" + msgstr "无法将消息转移到目标文件夹：%s" + + #: ../camel/providers/local/camel-maildir-store.c:130 +-#: ../camel/providers/local/camel-maildir-store.c:860 ++#: ../camel/providers/local/camel-maildir-store.c:149 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "文件夹 %s 已经存在" + +-#: ../camel/providers/local/camel-maildir-store.c:235 +-#: ../camel/providers/local/camel-maildir-store.c:266 ++#: ../camel/providers/local/camel-maildir-store.c:241 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mbox-store.c:401 + #: ../camel/providers/local/camel-mbox-store.c:422 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "无法创建文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:250 ++#: ../camel/providers/local/camel-maildir-store.c:256 + #: ../camel/providers/local/camel-mbox-store.c:367 + #: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "无法获取文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:256 ++#: ../camel/providers/local/camel-maildir-store.c:262 + #: ../camel/providers/local/camel-mbox-store.c:377 + #: ../camel/providers/local/camel-mh-store.c:532 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "无法获得文件夹“%s”：文件夹不存在。" + +-#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-maildir-store.c:289 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "无法获取文件夹“%s”：不是 maildir 目录。" + +-#: ../camel/providers/local/camel-maildir-store.c:288 +-#: ../camel/providers/local/camel-mbox-store.c:440 +-#: ../camel/providers/local/camel-mh-store.c:565 +-#, c-format +-msgid "Cannot create folder '%s': folder exists." +-msgstr "无法创建文件夹“%s”：文件夹已存在。" +- +-#: ../camel/providers/local/camel-maildir-store.c:352 +-#: ../camel/providers/local/camel-maildir-store.c:392 +-#: ../camel/providers/local/camel-mh-store.c:683 ++#: ../camel/providers/local/camel-maildir-store.c:353 ++#: ../camel/providers/local/camel-maildir-store.c:393 ++#: ../camel/providers/local/camel-mh-store.c:676 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "无法删除文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:354 ++#: ../camel/providers/local/camel-maildir-store.c:355 + msgid "not a maildir directory" + msgstr "不是 maildir 目录" + +-#: ../camel/providers/local/camel-maildir-store.c:635 +-#: ../camel/providers/local/camel-maildir-store.c:1074 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3633,36 +3621,36 @@ msgstr "检查文件夹一致性" + msgid "Checking for new messages" + msgstr "检查新消息" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "存储文件夹" + +-#: ../camel/providers/local/camel-mbox-folder.c:185 ++#: ../camel/providers/local/camel-mbox-folder.c:196 + #, c-format + msgid "Cannot open mailbox: %s: " + msgstr "无法打开邮件箱：%s：" + +-#: ../camel/providers/local/camel-mbox-folder.c:251 ++#: ../camel/providers/local/camel-mbox-folder.c:262 + #, c-format + msgid "Cannot append message to mbox file: %s: " + msgstr "无法将消息附加到邮件箱文件：%s：" + +-#: ../camel/providers/local/camel-mbox-folder.c:381 ++#: ../camel/providers/local/camel-mbox-folder.c:392 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "文件夹好像已经被不可恢复地破坏了。" + +-#: ../camel/providers/local/camel-mbox-folder.c:438 ++#: ../camel/providers/local/camel-mbox-folder.c:449 + #: ../camel/providers/local/camel-spool-folder.c:67 + #, c-format + msgid "Cannot create folder lock on %s: %s" + msgstr "无法在 %s 创建文件夹锁：%s" + + #: ../camel/providers/local/camel-mbox-store.c:389 +-#: ../camel/providers/local/camel-mbox-store.c:587 ++#: ../camel/providers/local/camel-mbox-store.c:580 + #, c-format + msgid "Cannot create a folder by this name." + msgstr "无法以此名称创建文件夹。" +@@ -3672,23 +3660,23 @@ msgstr "无法以此名称创建文件夹。" + msgid "Cannot get folder '%s': not a regular file." + msgstr "无法获取文件夹“%s”：不是普通文件" + +-#: ../camel/providers/local/camel-mbox-store.c:603 ++#: ../camel/providers/local/camel-mbox-store.c:596 + #, c-format + msgid "Cannot create directory '%s': %s." + msgstr "无法创建目录“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:615 ++#: ../camel/providers/local/camel-mbox-store.c:608 + #, c-format + msgid "Cannot create folder: %s: %s" + msgstr "无法创建文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:617 ++#: ../camel/providers/local/camel-mbox-store.c:610 + msgid "Folder already exists" + msgstr "文件夹已经存在" + +-#: ../camel/providers/local/camel-mbox-store.c:657 +-#: ../camel/providers/local/camel-mbox-store.c:670 +-#: ../camel/providers/local/camel-mbox-store.c:699 ++#: ../camel/providers/local/camel-mbox-store.c:650 ++#: ../camel/providers/local/camel-mbox-store.c:663 ++#: ../camel/providers/local/camel-mbox-store.c:692 + #, c-format + msgid "" + "Could not delete folder '%s':\n" +@@ -3697,33 +3685,33 @@ msgstr "" + "无法删除文件夹“%s”：\n" + "%s" + +-#: ../camel/providers/local/camel-mbox-store.c:680 ++#: ../camel/providers/local/camel-mbox-store.c:673 + #, c-format + msgid "'%s' is not a regular file." + msgstr "“%s”并不是普通文件。" + +-#: ../camel/providers/local/camel-mbox-store.c:689 ++#: ../camel/providers/local/camel-mbox-store.c:682 + #, c-format + msgid "Folder '%s' is not empty. Not deleted." + msgstr "文件夹“%s”非空。没有删除。" + +-#: ../camel/providers/local/camel-mbox-store.c:716 +-#: ../camel/providers/local/camel-mbox-store.c:731 ++#: ../camel/providers/local/camel-mbox-store.c:709 ++#: ../camel/providers/local/camel-mbox-store.c:724 + #, c-format + msgid "Could not delete folder summary file '%s': %s" + msgstr "无法删除文件夹概要文件“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:813 ++#: ../camel/providers/local/camel-mbox-store.c:806 + #, c-format + msgid "The new folder name is illegal." + msgstr "指定的文件夹名称不合法。" + +-#: ../camel/providers/local/camel-mbox-store.c:829 ++#: ../camel/providers/local/camel-mbox-store.c:822 + #, c-format + msgid "Could not rename '%s': '%s': %s" + msgstr "无法重命名“%s”：“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:913 ++#: ../camel/providers/local/camel-mbox-store.c:906 + #, c-format + msgid "Could not rename '%s' to %s: %s" + msgstr "无法将“%s”重命名为 %s：%s" +@@ -3733,73 +3721,73 @@ msgstr "无法将“%s”重命名为 %s：%s" + msgid "Could not open folder: %s: %s" + msgstr "无法打开文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "无法检查文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "无法打开文件：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "无法打开临时邮件箱：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "无法关闭来源文件夹 %s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "无法关闭临时文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "无法重命名文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "无法存储文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " + "it.)" + msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "即使同步后，概要和文件夹仍然不匹配" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "未知的错误：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "写入临时 mailbox 失败：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "写入临时 mailbox 失败：%s：%s" +@@ -3920,21 +3908,21 @@ msgstr "" + "文件夹可能已损坏，副本已存放在 '%s'" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "内部错误：UID 的格式无效：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "无法获取消息 %s：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3948,16 +3936,16 @@ msgstr "无法获取消息 %s：" + msgid "Posting failed: %s" + msgstr "发送失败：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "发送失败：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "该消息目前不可用" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format + msgid "You cannot copy messages from a NNTP folder" + msgstr "您不能从 NNTP 文件夹复制信息" +@@ -4674,8 +4662,8 @@ msgstr "(已废弃) 自动代理配置 URL" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Bus 名称消失(客户端终止了？)" + +@@ -4685,8 +4673,8 @@ msgstr "客户端无响应" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "客户端已取消操作" + +@@ -4694,11 +4682,11 @@ msgstr "客户端已取消操作" + msgid "Client reports password was rejected" + msgstr "客户端报告密码被拒绝" + +-#: ../libebackend/e-authentication-session.c:568 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "将该密码添加到您的密钥环" + +-#: ../libebackend/e-authentication-session.c:673 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "密码错误" + +@@ -4707,12 +4695,12 @@ msgstr "密码错误" + msgid "%s does not support authentication" + msgstr "%s 不支持认证" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s 不支持创建远程资源" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s 不支持删除远程资源" +@@ -4727,45 +4715,45 @@ msgstr "散列键“%s”没有对应的后端工厂" + msgid "Data source is missing a [%s] group" + msgstr "数据源缺少一个 [%s] 组" + +-#: ../libebackend/e-server-side-source.c:1007 +-#: ../libedataserver/e-source.c:1252 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "数据源“%s”不支持创建远程资源" + + # collection backend，如何翻译更好？ +-#: ../libebackend/e-server-side-source.c:1021 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源" + +-#: ../libebackend/e-server-side-source.c:1049 +-#: ../libedataserver/e-source.c:1365 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "数据源“%s”不支持删除远程资源" + +-#: ../libebackend/e-server-side-source.c:1063 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源" + +-#: ../libebackend/e-server-side-source.c:1094 +-#: ../libedataserver/e-source.c:1461 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "数据源“%s”不支持 OAuth 2.0 认证" + +-#: ../libebackend/e-server-side-source.c:1439 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "文件扩展名必须为“.source”" + + #: ../libebackend/e-source-registry-server.c:531 +-#: ../libedataserver/e-source-registry.c:1878 ++#: ../libedataserver/e-source-registry.c:1957 + msgid "The user declined to authenticate" + msgstr "用户拒绝认证" + +@@ -4962,26 +4950,26 @@ msgstr "请输入任务列表“%s”的密码。" + msgid "Please enter the password for account \"%s\"." + msgstr "请输入帐号“%s”的密码。" + +-#: ../libedataserver/e-source.c:669 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "源文件缺少一个 [%s] 组" + +-#: ../libedataserver/e-source.c:1032 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "数据源“%s”不是可删除的" + +-#: ../libedataserver/e-source.c:1155 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "数据源“%s”不是可写的" + +-#: ../libedataserver/e-source.c:1768 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "未命名" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "签名脚本必须为本地文件" +@@ -4991,28 +4979,28 @@ msgstr "签名脚本必须为本地文件" + msgid "Source '%s' does not support proxy lookups" + msgstr "数据源“%s”不支持代理查找" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " + "wish to accept it?" + msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5203,25 +5191,30 @@ msgstr "无法找到帐号元素" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain an access token for '%s'" + msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "无法获取“%s”的访问令牌：" + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "日历" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "任务" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5320,7 +5313,7 @@ msgstr "邮件" + msgid "Integrate your mailboxes" + msgstr "集成您的邮箱" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5363,10 +5356,6 @@ msgstr "Yahoo! 日历" + msgid "Yahoo! Mail" + msgstr "Yahoo! 邮箱" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "任务" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5423,6 +5412,18 @@ msgstr "不从先前版本的 Evolution 迁移用户数据" + msgid "_Dismiss" + msgstr "解除(_D)" + ++#~ msgid "No host information available" ++#~ msgstr "无可用的主机信息" ++ ++#~ msgid "Cannot create folder '%s': folder exists" ++#~ msgstr "无法创建文件夹“%s”文件夹已存在" ++ ++#~ msgid "Source stream unavailable" ++#~ msgstr "源流不可用" ++ ++#~ msgid "Cannot create folder '%s': folder exists." ++#~ msgstr "无法创建文件夹“%s”：文件夹已存在。" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "您不能用此密码导入密钥" + +@@ -6217,9 +6218,6 @@ msgstr "解除(_D)" + #~ msgid "Command:" + #~ msgstr "命令：" + +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "使用的缓存连接的数目(_R)" +- + #~ msgid "Closing tmp stream failed: " + #~ msgstr "关闭临时流失败：" + diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD deleted file mode 100644 index 50d26f50e..000000000 --- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 214331 2014-06-06 21:01:31Z heftig $ -# Maintainer (Arch): Ionut Biru -# Maintainer: Márcio Silva - -_pkgname=gnome-online-accounts -pkgname=gnome-online-accounts-nonprism -pkgver=3.12.3 -pkgrel=1 -pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" -arch=(i686 x86_64 mips64el) -url="http://www.gnome.org" -license=('GPL') -provides=("$_pkgname=$pkgver") -conflicts=($_pkgname) -replaces=($_pkgname $pkgname-coherence) -depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' - 'telepathy-glib' 'krb5' 'gcr') -makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') -install=$_pkgname.install -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('afd7e2f0e6eccbde92f10183ea366c95b579767c540442ef82e4009d7759eda6') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$_pkgname --disable-static \ - --disable-exchange --disable-facebook -disable-flickr \ - --disable-google --enable-imap-smtp --disable-kerberos \ - --enable-owncloud --enable-telepathy --disable-windows-live \ - --disable-twitter --disable-yahoo - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install deleted file mode 100644 index 525ecff63..000000000 --- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/gnome-online-accounts/PKGBUILD b/nonprism/gnome-online-accounts/PKGBUILD new file mode 100644 index 000000000..2a0b56d78 --- /dev/null +++ b/nonprism/gnome-online-accounts/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 214331 2014-06-06 21:01:31Z heftig $ +# Maintainer (Arch): Ionut Biru +# Maintainer: Márcio Silva + +pkgname=gnome-online-accounts +pkgver=3.12.3 +pkgrel=1.nonprism1 +pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" +arch=(i686 x86_64 mips64el) +url="http://www.gnome.org" +license=('GPL') +conflicts=("${pkgname}-coherence" "${pkgname}-nonprism" ) +replaces=("${pkgname}-coherence" "${pkgname}-nonprism") +depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' + 'telepathy-glib' 'krb5' 'gcr') +makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('afd7e2f0e6eccbde92f10183ea366c95b579767c540442ef82e4009d7759eda6') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static \ + --disable-exchange --disable-facebook -disable-flickr \ + --disable-google --enable-imap-smtp --disable-kerberos \ + --enable-owncloud --enable-telepathy --disable-windows-live \ + --disable-twitter --disable-yahoo + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/nonprism/gnome-online-accounts/gnome-online-accounts.install b/nonprism/gnome-online-accounts/gnome-online-accounts.install new file mode 100644 index 000000000..525ecff63 --- /dev/null +++ b/nonprism/gnome-online-accounts/gnome-online-accounts.install @@ -0,0 +1,11 @@ +post_install () { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD deleted file mode 100644 index f2b675538..000000000 --- a/nonprism/grilo-plugins-nonprism/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 210323 2014-04-14 09:05:45Z jgc $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Maintainer: André Silva - -_pkgname=grilo-plugins -pkgname=grilo-plugins-nonprism -pkgver=0.2.12 -pkgrel=2 -pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation" -url="http://www.gnome.org" -arch=(i686 x86_64) -license=(LGPL) -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=(grilo sqlite libgcrypt) -makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing - json-glib intltool avahi itstool libmediaart lua) -optdepends=('gupnp-av: uPnP plugin' - 'gmime: Podcasts plugin' - 'tracker: Tracker plugin' - 'libdmapsharing: DMAP sharing plugin' - 'json-glib: TMDb plugin' - 'avahi: Freebox plugin' - 'libmediaart: local-metadata plugin' - 'lua: LUA factory plugin') -options=('!emptydirs') -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver:0:3}/${_pkgname}-${pkgver}.tar.xz) -sha256sums=('15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --enable-shoutcast --disable-pocket --enable-lua-factory - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/nonprism/grilo-plugins/PKGBUILD b/nonprism/grilo-plugins/PKGBUILD new file mode 100644 index 000000000..64378c771 --- /dev/null +++ b/nonprism/grilo-plugins/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 210323 2014-04-14 09:05:45Z jgc $ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Maintainer: André Silva + +pkgname=grilo-plugins +pkgver=0.2.12 +pkgrel=2.nonprism1 +pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation" +url="http://www.gnome.org" +arch=(i686 x86_64) +license=(LGPL) +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=(grilo sqlite libgcrypt) +makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing + json-glib intltool avahi itstool libmediaart lua) +optdepends=('gupnp-av: uPnP plugin' + 'gmime: Podcasts plugin' + 'tracker: Tracker plugin' + 'libdmapsharing: DMAP sharing plugin' + 'json-glib: TMDb plugin' + 'avahi: Freebox plugin' + 'libmediaart: local-metadata plugin' + 'lua: LUA factory plugin') +options=('!emptydirs') +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + --enable-shoutcast --disable-pocket --enable-lua-factory + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/nonprism/gthumb-nonprism/PKGBUILD b/nonprism/gthumb-nonprism/PKGBUILD deleted file mode 100644 index 23f56062c..000000000 --- a/nonprism/gthumb-nonprism/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 213426 2014-05-23 22:54:51Z heftig $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Contributor (Arch): Jan de Groot -# Contributor (Arch): Tobias Kieslich -# Maintainer: André Silva -# Contributor: Márcio Silva - -_pkgname=gthumb -pkgname=gthumb-nonprism -pkgver=3.2.8 -pkgrel=1 -pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols" -arch=(i686 x86_64) -license=(GPL) -url="http://live.gnome.org/gthumb" -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk - gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret - libsoup webkitgtk json-glib) -makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl) -optdepends=('libopenraw: read RAW files' - 'exiv2: metadata support' - 'libchamplain: map viewer' - 'brasero: burn discs' - 'liboauth: web albums') -options=('!emptydirs') -install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz - nonprism.patch) -sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8' - '7706181514c9cfe0241329e9b14778dfa2797ddc1feb206b1cd9f07f9be31490') - -prepare() { - cd $_pkgname-$pkgver - patch -Np1 -i $srcdir/nonprism.patch -} - -build() { - cd $_pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-libchamplain --enable-libopenraw - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -check() { - cd $_pkgname-$pkgver - make check -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/nonprism/gthumb-nonprism/gthumb.install b/nonprism/gthumb-nonprism/gthumb.install deleted file mode 100644 index 9d4e7822f..000000000 --- a/nonprism/gthumb-nonprism/gthumb.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.1) < 0 )); then - gconfpkg --uninstall gthumb - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/gthumb-nonprism/nonprism.patch b/nonprism/gthumb-nonprism/nonprism.patch deleted file mode 100644 index 0bdde908f..000000000 --- a/nonprism/gthumb-nonprism/nonprism.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am ---- gthumb-3.2.7.orig/data/Makefile.am 2013-04-30 13:56:12.000000000 -0300 -+++ gthumb-3.2.7/data/Makefile.am 2014-04-19 12:30:38.520987588 -0300 -@@ -16,15 +16,12 @@ - org.gnome.gthumb.contact-sheet.gschema.xml.in \ - org.gnome.gthumb.convert-format.gschema.xml.in \ - org.gnome.gthumb.crop.gschema.xml.in \ -- org.gnome.gthumb.facebook.gschema.xml.in \ - org.gnome.gthumb.file-manager.gschema.xml.in \ -- org.gnome.gthumb.flickr.gschema.xml.in \ - org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ - org.gnome.gthumb.image-print.gschema.xml.in \ - org.gnome.gthumb.image-viewer.gschema.xml.in \ - org.gnome.gthumb.importer.gschema.xml.in \ - org.gnome.gthumb.photo-importer.gschema.xml.in \ -- org.gnome.gthumb.picasaweb.gschema.xml.in \ - org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ - org.gnome.gthumb.rename-series.gschema.xml.in \ - org.gnome.gthumb.resize.gschema.xml.in \ -diff -Nur gthumb-3.2.7.orig/data/Makefile.in gthumb-3.2.7/data/Makefile.in ---- gthumb-3.2.7.orig/data/Makefile.in 2014-03-25 17:22:56.000000000 -0300 -+++ gthumb-3.2.7/data/Makefile.in 2014-04-19 12:30:16.910790641 -0300 -@@ -433,15 +433,12 @@ - org.gnome.gthumb.contact-sheet.gschema.xml.in \ - org.gnome.gthumb.convert-format.gschema.xml.in \ - org.gnome.gthumb.crop.gschema.xml.in \ -- org.gnome.gthumb.facebook.gschema.xml.in \ - org.gnome.gthumb.file-manager.gschema.xml.in \ -- org.gnome.gthumb.flickr.gschema.xml.in \ - org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ - org.gnome.gthumb.image-print.gschema.xml.in \ - org.gnome.gthumb.image-viewer.gschema.xml.in \ - org.gnome.gthumb.importer.gschema.xml.in \ - org.gnome.gthumb.photo-importer.gschema.xml.in \ -- org.gnome.gthumb.picasaweb.gschema.xml.in \ - org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ - org.gnome.gthumb.rename-series.gschema.xml.in \ - org.gnome.gthumb.resize.gschema.xml.in \ -diff -Nur gthumb-3.2.7.orig/data/gthumb.convert gthumb-3.2.7/data/gthumb.convert ---- gthumb-3.2.7.orig/data/gthumb.convert 2013-04-30 13:56:12.000000000 -0300 -+++ gthumb-3.2.7/data/gthumb.convert 2014-04-19 12:55:21.982561697 -0300 -@@ -79,9 +79,6 @@ - [org.gnome.gthumb.dialogs.add-to-catalog] - view = /apps/gthumb/general/add_to_catalog/view - --[org.gnome.gthumb.facebook] --max-resolution = /apps/gthumb/ext/facebook/max_resolution -- - [org.gnome.gthumb.file-manager] - last-folder = /apps/gthumb/ext/file_manager/copy_move/last_folder - view-destination = /apps/gthumb/ext/file_manager/copy_move/view_destination -@@ -125,9 +122,6 @@ - delete-from-device = /apps/gthumb/ext/photo_importer/delete_from_device - adjust-orientation = /apps/gthumb/ext/photo_importer/adjust_orientation - --[org.gnome.gthumb.picasaweb] --synchronize = /apps/gthumb/ext/picasaweb/synchronize -- - [org.gnome.gthumb.pixbuf-savers.jpeg] - default-ext = /apps/gthumb/save_options/jpeg/default_ext - quality = /apps/gthumb/save_options/jpeg/quality -diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am ---- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am 2013-10-11 16:11:08.000000000 -0200 -+++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am 2014-04-19 12:56:04.599700437 -0300 -@@ -19,10 +19,6 @@ - selection1.png \ - selection2.png \ - selection3.png \ -- site-facebook.png \ -- site-flickr.png \ -- site-photobucket.png \ -- site-picasaweb.png \ - site-twentythree.png \ - tag.png \ - tool-adjust-colors.png \ -diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in ---- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in 2014-03-25 17:22:56.000000000 -0300 -+++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in 2014-04-19 12:56:16.376495364 -0300 -@@ -371,10 +371,6 @@ - selection1.png \ - selection2.png \ - selection3.png \ -- site-facebook.png \ -- site-flickr.png \ -- site-photobucket.png \ -- site-picasaweb.png \ - site-twentythree.png \ - tag.png \ - tool-adjust-colors.png \ -diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am ---- gthumb-3.2.7.orig/extensions/Makefile.am 2013-04-30 13:56:12.000000000 -0300 -+++ gthumb-3.2.7/extensions/Makefile.am 2014-04-19 13:12:36.788627648 -0300 -@@ -4,18 +4,14 @@ - - FLICKR_EXPORTERS = \ - 23hq \ -- flicker \ - $(NULL) - - EXPORTERS = \ - export_tools \ - burn_disc \ - contact_sheet \ -- facebook \ - flicker_utils \ - $(FLICKR_EXPORTERS) \ -- photobucket \ -- picasaweb \ - webalbums \ - $(NULL) - -diff -Nur gthumb-3.2.7.orig/extensions/Makefile.in gthumb-3.2.7/extensions/Makefile.in ---- gthumb-3.2.7.orig/extensions/Makefile.in 2014-03-25 17:22:57.000000000 -0300 -+++ gthumb-3.2.7/extensions/Makefile.in 2014-04-19 13:12:49.175395986 -0300 -@@ -388,18 +388,14 @@ - - FLICKR_EXPORTERS = \ - 23hq \ -- flicker \ - $(NULL) - - EXPORTERS = \ - export_tools \ - burn_disc \ - contact_sheet \ -- facebook \ - flicker_utils \ - $(FLICKR_EXPORTERS) \ -- photobucket \ -- picasaweb \ - webalbums \ - $(NULL) - -diff -Nur gthumb-3.2.7.orig/gthumb/gth-main.c gthumb-3.2.7/gthumb/gth-main.c ---- gthumb-3.2.7.orig/gthumb/gth-main.c 2013-09-27 12:38:40.000000000 -0300 -+++ gthumb-3.2.7/gthumb/gth-main.c 2014-04-19 12:54:27.448720074 -0300 -@@ -1185,11 +1185,9 @@ - "desktop_background", - "edit_metadata", - "exiv2_tools", -- "facebook", - "file_manager", - "file_tools", - "find_duplicates", -- "flicker", - "gstreamer_tools", - "gstreamer_utils", - "image_print", -@@ -1200,8 +1198,6 @@ - "list_tools", - "oauth", - "photo_importer", -- "photobucket", -- "picasaweb", - "raw_files", - "red_eye_removal", - "rename_series", -diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am ---- gthumb-3.2.7.orig/help/Makefile.am 2013-04-30 13:56:13.000000000 -0300 -+++ gthumb-3.2.7/help/Makefile.am 2014-04-19 13:18:40.744859012 -0300 -@@ -30,7 +30,6 @@ - printing.page \ - shortcuts.page \ - sharing-disc.page \ -- sharing-social.page \ - wallpaper.page \ - bookmarks.page \ - import.page \ -diff -Nur gthumb-3.2.7.orig/help/Makefile.in gthumb-3.2.7/help/Makefile.in ---- gthumb-3.2.7.orig/help/Makefile.in 2014-03-25 17:23:08.000000000 -0300 -+++ gthumb-3.2.7/help/Makefile.in 2014-04-19 13:18:50.698270179 -0300 -@@ -351,7 +351,6 @@ - printing.page \ - shortcuts.page \ - sharing-disc.page \ -- sharing-social.page \ - wallpaper.page \ - bookmarks.page \ - import.page \ diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD new file mode 100644 index 000000000..7e379542d --- /dev/null +++ b/nonprism/gthumb/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 213426 2014-05-23 22:54:51Z heftig $ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot +# Contributor (Arch): Tobias Kieslich +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgname=gthumb +pkgver=3.2.8 +pkgrel=1.nonprism1 +pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols" +arch=(i686 x86_64) +license=(GPL) +url="http://live.gnome.org/gthumb" +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk + gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret + libsoup webkitgtk json-glib) +makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl) +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'liboauth: web albums') +options=('!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + nonprism.patch) +sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8' + '7706181514c9cfe0241329e9b14778dfa2797ddc1feb206b1cd9f07f9be31490') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i $srcdir/nonprism.patch +} + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/nonprism/gthumb/gthumb.install b/nonprism/gthumb/gthumb.install new file mode 100644 index 000000000..9d4e7822f --- /dev/null +++ b/nonprism/gthumb/gthumb.install @@ -0,0 +1,19 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/gthumb/nonprism.patch b/nonprism/gthumb/nonprism.patch new file mode 100644 index 000000000..0bdde908f --- /dev/null +++ b/nonprism/gthumb/nonprism.patch @@ -0,0 +1,179 @@ +diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am +--- gthumb-3.2.7.orig/data/Makefile.am 2013-04-30 13:56:12.000000000 -0300 ++++ gthumb-3.2.7/data/Makefile.am 2014-04-19 12:30:38.520987588 -0300 +@@ -16,15 +16,12 @@ + org.gnome.gthumb.contact-sheet.gschema.xml.in \ + org.gnome.gthumb.convert-format.gschema.xml.in \ + org.gnome.gthumb.crop.gschema.xml.in \ +- org.gnome.gthumb.facebook.gschema.xml.in \ + org.gnome.gthumb.file-manager.gschema.xml.in \ +- org.gnome.gthumb.flickr.gschema.xml.in \ + org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ + org.gnome.gthumb.image-print.gschema.xml.in \ + org.gnome.gthumb.image-viewer.gschema.xml.in \ + org.gnome.gthumb.importer.gschema.xml.in \ + org.gnome.gthumb.photo-importer.gschema.xml.in \ +- org.gnome.gthumb.picasaweb.gschema.xml.in \ + org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ + org.gnome.gthumb.rename-series.gschema.xml.in \ + org.gnome.gthumb.resize.gschema.xml.in \ +diff -Nur gthumb-3.2.7.orig/data/Makefile.in gthumb-3.2.7/data/Makefile.in +--- gthumb-3.2.7.orig/data/Makefile.in 2014-03-25 17:22:56.000000000 -0300 ++++ gthumb-3.2.7/data/Makefile.in 2014-04-19 12:30:16.910790641 -0300 +@@ -433,15 +433,12 @@ + org.gnome.gthumb.contact-sheet.gschema.xml.in \ + org.gnome.gthumb.convert-format.gschema.xml.in \ + org.gnome.gthumb.crop.gschema.xml.in \ +- org.gnome.gthumb.facebook.gschema.xml.in \ + org.gnome.gthumb.file-manager.gschema.xml.in \ +- org.gnome.gthumb.flickr.gschema.xml.in \ + org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ + org.gnome.gthumb.image-print.gschema.xml.in \ + org.gnome.gthumb.image-viewer.gschema.xml.in \ + org.gnome.gthumb.importer.gschema.xml.in \ + org.gnome.gthumb.photo-importer.gschema.xml.in \ +- org.gnome.gthumb.picasaweb.gschema.xml.in \ + org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ + org.gnome.gthumb.rename-series.gschema.xml.in \ + org.gnome.gthumb.resize.gschema.xml.in \ +diff -Nur gthumb-3.2.7.orig/data/gthumb.convert gthumb-3.2.7/data/gthumb.convert +--- gthumb-3.2.7.orig/data/gthumb.convert 2013-04-30 13:56:12.000000000 -0300 ++++ gthumb-3.2.7/data/gthumb.convert 2014-04-19 12:55:21.982561697 -0300 +@@ -79,9 +79,6 @@ + [org.gnome.gthumb.dialogs.add-to-catalog] + view = /apps/gthumb/general/add_to_catalog/view + +-[org.gnome.gthumb.facebook] +-max-resolution = /apps/gthumb/ext/facebook/max_resolution +- + [org.gnome.gthumb.file-manager] + last-folder = /apps/gthumb/ext/file_manager/copy_move/last_folder + view-destination = /apps/gthumb/ext/file_manager/copy_move/view_destination +@@ -125,9 +122,6 @@ + delete-from-device = /apps/gthumb/ext/photo_importer/delete_from_device + adjust-orientation = /apps/gthumb/ext/photo_importer/adjust_orientation + +-[org.gnome.gthumb.picasaweb] +-synchronize = /apps/gthumb/ext/picasaweb/synchronize +- + [org.gnome.gthumb.pixbuf-savers.jpeg] + default-ext = /apps/gthumb/save_options/jpeg/default_ext + quality = /apps/gthumb/save_options/jpeg/quality +diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am +--- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am 2013-10-11 16:11:08.000000000 -0200 ++++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am 2014-04-19 12:56:04.599700437 -0300 +@@ -19,10 +19,6 @@ + selection1.png \ + selection2.png \ + selection3.png \ +- site-facebook.png \ +- site-flickr.png \ +- site-photobucket.png \ +- site-picasaweb.png \ + site-twentythree.png \ + tag.png \ + tool-adjust-colors.png \ +diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in +--- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in 2014-03-25 17:22:56.000000000 -0300 ++++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in 2014-04-19 12:56:16.376495364 -0300 +@@ -371,10 +371,6 @@ + selection1.png \ + selection2.png \ + selection3.png \ +- site-facebook.png \ +- site-flickr.png \ +- site-photobucket.png \ +- site-picasaweb.png \ + site-twentythree.png \ + tag.png \ + tool-adjust-colors.png \ +diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am +--- gthumb-3.2.7.orig/extensions/Makefile.am 2013-04-30 13:56:12.000000000 -0300 ++++ gthumb-3.2.7/extensions/Makefile.am 2014-04-19 13:12:36.788627648 -0300 +@@ -4,18 +4,14 @@ + + FLICKR_EXPORTERS = \ + 23hq \ +- flicker \ + $(NULL) + + EXPORTERS = \ + export_tools \ + burn_disc \ + contact_sheet \ +- facebook \ + flicker_utils \ + $(FLICKR_EXPORTERS) \ +- photobucket \ +- picasaweb \ + webalbums \ + $(NULL) + +diff -Nur gthumb-3.2.7.orig/extensions/Makefile.in gthumb-3.2.7/extensions/Makefile.in +--- gthumb-3.2.7.orig/extensions/Makefile.in 2014-03-25 17:22:57.000000000 -0300 ++++ gthumb-3.2.7/extensions/Makefile.in 2014-04-19 13:12:49.175395986 -0300 +@@ -388,18 +388,14 @@ + + FLICKR_EXPORTERS = \ + 23hq \ +- flicker \ + $(NULL) + + EXPORTERS = \ + export_tools \ + burn_disc \ + contact_sheet \ +- facebook \ + flicker_utils \ + $(FLICKR_EXPORTERS) \ +- photobucket \ +- picasaweb \ + webalbums \ + $(NULL) + +diff -Nur gthumb-3.2.7.orig/gthumb/gth-main.c gthumb-3.2.7/gthumb/gth-main.c +--- gthumb-3.2.7.orig/gthumb/gth-main.c 2013-09-27 12:38:40.000000000 -0300 ++++ gthumb-3.2.7/gthumb/gth-main.c 2014-04-19 12:54:27.448720074 -0300 +@@ -1185,11 +1185,9 @@ + "desktop_background", + "edit_metadata", + "exiv2_tools", +- "facebook", + "file_manager", + "file_tools", + "find_duplicates", +- "flicker", + "gstreamer_tools", + "gstreamer_utils", + "image_print", +@@ -1200,8 +1198,6 @@ + "list_tools", + "oauth", + "photo_importer", +- "photobucket", +- "picasaweb", + "raw_files", + "red_eye_removal", + "rename_series", +diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am +--- gthumb-3.2.7.orig/help/Makefile.am 2013-04-30 13:56:13.000000000 -0300 ++++ gthumb-3.2.7/help/Makefile.am 2014-04-19 13:18:40.744859012 -0300 +@@ -30,7 +30,6 @@ + printing.page \ + shortcuts.page \ + sharing-disc.page \ +- sharing-social.page \ + wallpaper.page \ + bookmarks.page \ + import.page \ +diff -Nur gthumb-3.2.7.orig/help/Makefile.in gthumb-3.2.7/help/Makefile.in +--- gthumb-3.2.7.orig/help/Makefile.in 2014-03-25 17:23:08.000000000 -0300 ++++ gthumb-3.2.7/help/Makefile.in 2014-04-19 13:18:50.698270179 -0300 +@@ -351,7 +351,6 @@ + printing.page \ + shortcuts.page \ + sharing-disc.page \ +- sharing-social.page \ + wallpaper.page \ + bookmarks.page \ + import.page \ diff --git a/nonprism/jitsi-nonprism/PKGBUILD b/nonprism/jitsi-nonprism/PKGBUILD deleted file mode 100644 index d8eaa082d..000000000 --- a/nonprism/jitsi-nonprism/PKGBUILD +++ /dev/null @@ -1,97 +0,0 @@ -# Maintainer (Arch): Xavier Devlamynck -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne -# Maintainer: André Silva -# Contributor: Márcio Silva - -_pkgname=jitsi -pkgname=jitsi-nonprism -pkgver=2.4.4997 -pkgrel=1 -pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64' 'mips64el') -url="http://jitsi.org" -license=('LGPL') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('jre7-openjdk') -makedepends=('apache-ant' 'jdk7-openjdk') -options=(!strip !emptydirs zipman !libtool docs) -source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" - jitsi.desktop - jitsi.sh - drop-open-term-on-index-jn-html.patch - nonprism.patch) -sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' - '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' - '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' - 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631' - 'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017') - -prepare() { - cd $srcdir/$_pkgname - - # append the build revision to the jitsi version - sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java - - # remove Open Source term - patch -Np0 -i ../drop-open-term-on-index-jn-html.patch - sed -i 's|Open Source / ||; - s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; - ' $(grep -ril 'open source') - sed -i 's|OpenSource / ||; - s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; - ' $(grep -ril opensource) - - # remove Linux term - sed -i '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; - s|GNU/GNU|GNU|; - s|GNU/Linux kernel|Linux kernel|; - s|GNU/Linux specific kernel|Linux specific kernel|; - ' $(grep -rl Linux) - - # remove support for unsafe and dangerous for privacy protocols (AIM, Facebook, Google Talk, ICQ, MSN and Yahoo!) - patch -Np1 -i $srcdir/nonprism.patch -} - -build() { - cd $srcdir/$_pkgname - . /etc/profile.d/apache-ant.sh - ant rebuild -} - -package() { - cd $srcdir/$_pkgname - find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/"{} \; -# find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/lib/"{} \; - shopt -sq extglob - find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/lib/native/"{} \; - find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/sc-bundles/"{} \; - install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}" - install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" - - cd "resources/install/debian/" - for _file in *.{svg,xpm}; do - install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}" - done -} diff --git a/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch deleted file mode 100644 index 8d4012a05..000000000 --- a/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 -+++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 -@@ -1,2 +1,2 @@ - --

sip-communicator.org
SIP Communicator
Open Source VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Open Source / Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
-+

sip-communicator.org
SIP Communicator
Free Software VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
diff --git a/nonprism/jitsi-nonprism/jitsi.desktop b/nonprism/jitsi-nonprism/jitsi.desktop deleted file mode 100644 index dd4de82a6..000000000 --- a/nonprism/jitsi-nonprism/jitsi.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Jitsi -GenericName=jitsi -Comment=VoIP and Instant Messaging client -Icon=/usr/share/pixmaps/jitsi.svg -Type=Application -Categories=Network -Exec=/usr/bin/jitsi -Terminal=false diff --git a/nonprism/jitsi-nonprism/jitsi.sh b/nonprism/jitsi-nonprism/jitsi.sh deleted file mode 100644 index 6e53cdbf5..000000000 --- a/nonprism/jitsi-nonprism/jitsi.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -CLIENTARGS="" -uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" - -SCDIR=/usr/lib/jitsi -LIBPATH="$SCDIR/lib" -CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar" -FELIX_CONFIG="$LIBPATH/felix.client.run.properties" -LOG_CONFIG="$LIBPATH/logging.properties" -COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator) - -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native" - -cd "$SCDIR" - -exec "${COMMAND[@]}" "$@" diff --git a/nonprism/jitsi-nonprism/nonprism.patch b/nonprism/jitsi-nonprism/nonprism.patch deleted file mode 100644 index 5effbbd7d..000000000 --- a/nonprism/jitsi-nonprism/nonprism.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -Nur jitsi.orig/build.xml jitsi/build.xml ---- jitsi.orig/build.xml 2013-12-08 18:17:08.000000000 -0200 -+++ jitsi/build.xml 2014-04-20 01:08:28.365493685 -0300 -@@ -536,7 +536,7 @@ - - - - -- -- -- - - -@@ -871,9 +868,6 @@ - failonerror="true" - classpathref="project.class.path"> - -- -- -- - - -@@ -1032,18 +1026,15 @@ - bundle-netaddr,bundle-netaddr-slick,bundle-slickless, - bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, - bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, -- bundle-googlecontacts-service,bundle-googlecontacts, - bundle-hid-service,bundle-hid, - bundle-resource-manager,bundle-resources-defaultpack, -- bundle-protocol,bundle-protocol-media,bundle-icq, -- bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib, -+ bundle-protocol,bundle-protocol-media, -+ bundle-mock,bundle-smacklib,bundle-jmdnslib, - bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service, - bundle-jnalib, -- bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick, - bundle-contactlist,meta-contactlist,meta-contactlist-slick, -- bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, -- bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, -- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, -+ bundle-plugin-jabberaccregwizz, -+ bundle-plugin-sipaccregwizz, - bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck, - bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, - bundle-growlnotification,bundle-swingnotification,bundle-galagonotification, -@@ -1058,10 +1049,10 @@ - bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig, - bundle-jfontchooserlib,bundle-update,bundle-plugin-update, - bundle-plugin-simpleaccreg,bundle-plugin-generalconfig, -- bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service, -+ bundle-argdelegation-service, - bundle-argdelegation,bundle-zrtp4j,bundle-sdes4j,bundle-json, - bundle-filehistory,bundle-metahistory,bundle-metahistory-slick, -- bundle-plugin-facebookaccregwizz,bundle-plugin-ippiaccregwizz, -+ bundle-plugin-ippiaccregwizz, - bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz, - bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig, - bundle-plugin-advancedconfig, -@@ -1339,31 +1330,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - -- -- -- - -- -- - - - -@@ -1519,36 +1480,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1582,30 +1513,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1627,30 +1534,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1728,26 +1611,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1758,36 +1621,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1839,17 +1672,6 @@ - - - -- -- -- -- -- -- -- -- - - - diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD new file mode 100644 index 000000000..d3bc07db2 --- /dev/null +++ b/nonprism/jitsi/PKGBUILD @@ -0,0 +1,95 @@ +# Maintainer (Arch): Xavier Devlamynck +# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgname=jitsi +pkgver=2.4.4997 +pkgrel=1.nonprism1 +pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols" +arch=('i686' 'x86_64' 'mips64el') +url="http://jitsi.org" +license=('LGPL') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('jre7-openjdk') +makedepends=('apache-ant' 'jdk7-openjdk') +options=(!strip !emptydirs zipman !libtool docs) +source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" + jitsi.desktop + jitsi.sh + drop-open-term-on-index-jn-html.patch + nonprism.patch) +sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' + '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' + 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631' + 'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017') + +prepare() { + cd $srcdir/$pkgname + + # append the build revision to the jitsi version + sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + + # remove Open Source term + patch -Np0 -i ../drop-open-term-on-index-jn-html.patch + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) + + # remove support for unsafe and dangerous for privacy protocols (AIM, Facebook, Google Talk, ICQ, MSN and Yahoo!) + patch -Np1 -i $srcdir/nonprism.patch +} + +build() { + cd $srcdir/$pkgname + . /etc/profile.d/apache-ant.sh + ant rebuild +} + +package() { + cd $srcdir/$pkgname + find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; +# find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; + shopt -sq extglob + find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; + find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; + install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + + cd "resources/install/debian/" + for _file in *.{svg,xpm}; do + install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}" + done +} diff --git a/nonprism/jitsi/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch new file mode 100644 index 000000000..8d4012a05 --- /dev/null +++ b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch @@ -0,0 +1,6 @@ +--- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 ++++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 +@@ -1,2 +1,2 @@ + +-

sip-communicator.org
SIP Communicator
Open Source VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Open Source / Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
++

sip-communicator.org
SIP Communicator
Free Software VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
diff --git a/nonprism/jitsi/jitsi.desktop b/nonprism/jitsi/jitsi.desktop new file mode 100644 index 000000000..dd4de82a6 --- /dev/null +++ b/nonprism/jitsi/jitsi.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Jitsi +GenericName=jitsi +Comment=VoIP and Instant Messaging client +Icon=/usr/share/pixmaps/jitsi.svg +Type=Application +Categories=Network +Exec=/usr/bin/jitsi +Terminal=false diff --git a/nonprism/jitsi/jitsi.sh b/nonprism/jitsi/jitsi.sh new file mode 100644 index 000000000..6e53cdbf5 --- /dev/null +++ b/nonprism/jitsi/jitsi.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +CLIENTARGS="" +uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" + +SCDIR=/usr/lib/jitsi +LIBPATH="$SCDIR/lib" +CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar" +FELIX_CONFIG="$LIBPATH/felix.client.run.properties" +LOG_CONFIG="$LIBPATH/logging.properties" +COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator) + +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native" + +cd "$SCDIR" + +exec "${COMMAND[@]}" "$@" diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch new file mode 100644 index 000000000..5effbbd7d --- /dev/null +++ b/nonprism/jitsi/nonprism.patch @@ -0,0 +1,294 @@ +diff -Nur jitsi.orig/build.xml jitsi/build.xml +--- jitsi.orig/build.xml 2013-12-08 18:17:08.000000000 -0200 ++++ jitsi/build.xml 2014-04-20 01:08:28.365493685 -0300 +@@ -536,7 +536,7 @@ + + + + +- +- +- + + +@@ -871,9 +868,6 @@ + failonerror="true" + classpathref="project.class.path"> + +- +- +- + + +@@ -1032,18 +1026,15 @@ + bundle-netaddr,bundle-netaddr-slick,bundle-slickless, + bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, + bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, +- bundle-googlecontacts-service,bundle-googlecontacts, + bundle-hid-service,bundle-hid, + bundle-resource-manager,bundle-resources-defaultpack, +- bundle-protocol,bundle-protocol-media,bundle-icq, +- bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib, ++ bundle-protocol,bundle-protocol-media, ++ bundle-mock,bundle-smacklib,bundle-jmdnslib, + bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service, + bundle-jnalib, +- bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick, + bundle-contactlist,meta-contactlist,meta-contactlist-slick, +- bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, +- bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, +- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, ++ bundle-plugin-jabberaccregwizz, ++ bundle-plugin-sipaccregwizz, + bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck, + bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, + bundle-growlnotification,bundle-swingnotification,bundle-galagonotification, +@@ -1058,10 +1049,10 @@ + bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig, + bundle-jfontchooserlib,bundle-update,bundle-plugin-update, + bundle-plugin-simpleaccreg,bundle-plugin-generalconfig, +- bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service, ++ bundle-argdelegation-service, + bundle-argdelegation,bundle-zrtp4j,bundle-sdes4j,bundle-json, + bundle-filehistory,bundle-metahistory,bundle-metahistory-slick, +- bundle-plugin-facebookaccregwizz,bundle-plugin-ippiaccregwizz, ++ bundle-plugin-ippiaccregwizz, + bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz, + bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig, + bundle-plugin-advancedconfig, +@@ -1339,31 +1330,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + + +- +- +- + +- +- + + + +@@ -1519,36 +1480,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1582,30 +1513,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1627,30 +1534,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1728,26 +1611,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1758,36 +1621,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1839,17 +1672,6 @@ + + + +- +- +- +- +- +- +- +- + + + diff --git a/nonprism/openshot-nonprism/PKGBUILD b/nonprism/openshot-nonprism/PKGBUILD deleted file mode 100644 index 171cbc10d..000000000 --- a/nonprism/openshot-nonprism/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $ -# Maintainer (Arch): Sergej Pupykin -# Contributor (Arch): Asa Marco -# Maintainer: André Silva - -_pkgname=openshot -pkgname=openshot-nonprism -pkgver=1.4.3 -pkgrel=3 -pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support" -arch=('any') -url="http://www.openshotvideo.com/" -license=('GPL') -depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer' - 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow') -optdepends=('dvgrab: for IEEE digital sources' - 'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa') -replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola") -conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola") -provides=(${_pkgname}=${pkgver}) -install=openshot.install -source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz - nonprism.patch) -md5sums=('5ec82a7e8b7700ee4a359458aedf19e9' - '0b8ade6f6332d1ef9c6c153647953df7') -prepare() { - cd $srcdir/$_pkgname-$pkgver - patch -Np1 -i $srcdir/nonprism.patch -} - -package() { - cd $srcdir/$_pkgname-$pkgver - python2 setup.py install --root=$pkgdir/ --optimize=1 -} diff --git a/nonprism/openshot-nonprism/nonprism.patch b/nonprism/openshot-nonprism/nonprism.patch deleted file mode 100644 index 0028f7013..000000000 --- a/nonprism/openshot-nonprism/nonprism.patch +++ /dev/null @@ -1,1257 +0,0 @@ -diff -Nur openshot-1.4.3.orig/docs/gnome/C/openshot.xml openshot-1.4.3/docs/gnome/C/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/C/openshot.xml 2012-10-01 04:53:22.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/C/openshot.xml 2014-04-20 02:08:55.200417436 -0300 -@@ -131,7 +131,7 @@ - - - Step 5 – Export your Video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -927,7 +927,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3985,7 +3985,7 @@ - - - Upload to Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3995,7 +3995,7 @@ - - - Upload Video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4019,17 +4019,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/cs/openshot.xml openshot-1.4.3/docs/gnome/cs/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/cs/openshot.xml 2012-10-01 04:53:25.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/cs/openshot.xml 2014-04-20 02:09:38.920744917 -0300 -@@ -128,7 +128,7 @@ - - - Krok 5 - Export videa -- Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou YouTube, Vimeo atd.). -+ Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou Vimeo atd.). - Klikněte na ikonu Exportovat video nahoře (nebo použijte nabídku (Soubor > Exportovat video...). Vyberte jeden z mnoha přednastavených voleb exportu a klikněte na tlačítko Exportovat video. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3969,7 +3969,7 @@ - - - Nahrát na web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3979,7 +3979,7 @@ - - - Nahrát video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4003,17 +4003,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/da/openshot.xml openshot-1.4.3/docs/gnome/da/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/da/openshot.xml 2012-10-01 04:53:27.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/da/openshot.xml 2014-04-20 02:12:07.785194708 -0300 -@@ -130,7 +130,7 @@ - - - Trin 5 - Eksporter din video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -926,7 +926,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3984,7 +3984,7 @@ - - - Upload til Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3994,7 +3994,7 @@ - - - Upload video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4018,17 +4018,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/de/openshot.xml openshot-1.4.3/docs/gnome/de/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/de/openshot.xml 2012-10-01 04:53:29.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/de/openshot.xml 2014-04-20 02:12:22.628639484 -0300 -@@ -138,7 +138,7 @@ - - Schritt 5 - Den fertigen Film exportieren - Wenn Sie mit der Diashow zufrieden sind, wollen wir den Film exportieren. -- Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Youtube, Vimeo u.a.) richtig gelesen werden kann. -+ Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Vimeo u.a.) richtig gelesen werden kann. - Wählen Sie das Video exportierenSymbol am oberen Bildschirmrand (oder klicken Sie auf Datei > Video exportieren...). -  Wählen Sie eine der Export-Voreinstellungen und klicken Sie auf Video exportieren. - -@@ -938,7 +938,7 @@ - STRG + U - - -- Aktuelles Projekt als Videodatei zu YouTube oder Vimeo hochladen -+ Aktuelles Projekt als Videodatei zu Vimeo hochladen - - - -@@ -3978,7 +3978,7 @@ - - - Ins Web hochladen -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - Die erweiterten Optionen sollten nur von Leuten die FFmpeg vertraut sind benutzt werden, da es sehr einfach ist ungültige Kombinationen der Einstellung von Codec, Format und Bitrate vorzunehmen. Sind sie jedoch mit diesen Einstellungen vertraut können alle unterstützten Formate/Codec/Bitraten verwendet werden, was duzende zusätzlicher Formate eröffnet die während des Exportvorgangs benutzt werden können. Sie können Ihr Video auch als Bildsequenz exportieren, was hilfreich sein kann wenn Sie vorhaben dieses Video in ein Programm zu importieren das Bildsequenzen benötigt, wie z.B. Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3988,7 +3988,7 @@ - - - Video hochladen -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4012,17 +4012,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/el/openshot.xml openshot-1.4.3/docs/gnome/el/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/el/openshot.xml 2012-10-01 04:53:31.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/el/openshot.xml 2014-04-20 02:12:42.675456689 -0300 -@@ -128,7 +128,7 @@ - - - Βήμα 5 - Εξαγωγή βίντεο -- Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το YouTube, Vimeo, κ.λπ. ..). -+ Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το Vimeo, κ.λπ. ..). - Κάντε κλικ στο εικονίδιο Εξαγωγή βίντεο guibutton> guimenuitem>> guimenuitem> guibutton>. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο YouTube ή στο Vimeo -+ Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Αποστολή στον Ιστό -- Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε μεταξύ YouTube και Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία -+ Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία - Οι προηγμένες επιλογές θα πρέπει να χρησιμοποιούνται μόνο από κάποιον που γνωρίζει το FFmpeg, δεδομένου ότι είναι τόσο εύκολο να δημιουργηθούν άκυροι συνδυασμοί κωδικοποιητών, μορφών και ρυθμίσεων ταχύτητας.   Ωστόσο, εάν είστε εξοικειωμένοι με αυτές τις ρυθμίσεις, οποιαδήποτε υποστηριζόμενη μορφή FFmpeg μπορεί να χρησιμοποιηθεί, η οποία ανοίγει δεκάδες πρόσθετες μορφές που μπορεί να χρησιμοποιηθoύν κατά τη διαδικασία εξαγωγής.   Μπορείτε επίσης να εξαγάγετε το βίντεό σας ως μία ακολουθία εικόνας, το οποίο μπορεί να είναι χρήσιμο αν σκοπεύετε να εισαγάγετε αυτό το βίντεο σε ένα πρόγραμμα που απαιτεί ακολουθίες εικόνων, όπως το Blender. - Επίσης, αν έχετε πρώτα επιλέξει τιμές για την Απλή Λειτουργία guibutton>, guibutton>, - -@@ -3938,7 +3938,7 @@ - - - Αποστολή βίντεο -- Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο YouTube ή στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. -+ Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Αρχείο βίντεο -- -- -- Επιλέξτε ένα αρχείο για αποστολή στο YouTube.  Σιγουρευτείτε πρώτα πως είναι συμβατή μορφή με το YouTube, διαφορετικά (ίσως) δεν θα λειτουργήσει σωστά.  Εάν χρησιμοποιήσετε πρώτα την οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που θα επιλέξει αυτόματα μία συμβατή μορφή, και θα συμπληρώσει τα "κουτάκια" για εσάς. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml openshot-1.4.3/docs/gnome/en_GB/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml 2012-10-01 04:53:33.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/en_GB/openshot.xml 2014-04-20 02:09:15.273901103 -0300 -@@ -128,7 +128,7 @@ - - - Step 5 – Export your Video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Upload to Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3938,7 +3938,7 @@ - - - Upload Video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/es/openshot.xml openshot-1.4.3/docs/gnome/es/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/es/openshot.xml 2012-10-01 04:53:36.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/es/openshot.xml 2014-04-20 02:07:46.399902484 -0300 -@@ -129,7 +129,7 @@ - - - Paso 5 - Exporte su vídeo -- Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como YouTube, Vimeo, etc...). -+ Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como Vimeo, etc...). - Presione sobre el icono Exportar Vídeo en la parte superior de la pantalla (o utilice el menú Archivo > Exportar vídeo...). Elija una de las muchas opciones de exportación preconfiguradas, y haga clic en el botón Exportar Vídeo. - - -@@ -924,7 +924,7 @@ - Control+U - - -- Subir el proyecto actual como archivo de vídeo a Youtube o Vimeo -+ Subir el proyecto actual como archivo de vídeo a Vimeo - - - -@@ -3929,7 +3929,7 @@ - - - Subir a la web -- Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger entre Youtube y Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado -+ Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado - Las opciones avanzadas sólo deberían ser utilizados por alguien familiarizado con FFmpeg, ya que es muy fácil crear combinaciones no válidas de codecs, formatos y tasas de bits.   Sin embargo, si usted está familiarizado con estos ajustes, puede utilizar cualquier formato/codec/tasa de bits soportado por FFmpeg, lo cual abre docenas y docenas de formatos adicionales que pueden ser utilizados durante el proceso de exportación.   También puede exportar el vídeo como una secuencia de imágenes, que puede ser útil si tiene previsto importar este vídeo en un programa que requiere secuencias de imágenes, como Blender. - Además, si primero selecciona valores en el Modo simple y luego cambia al Modo avanzado los ajustes del modo simple serán recordados y aparecerán preseleccionados. - -@@ -3939,7 +3939,7 @@ - - - Subir vídeo -- Si quieres subir un vídeo directamente a Youtube o Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. -+ Si quieres subir un vídeo directamente a Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. - - - -@@ -3963,17 +3963,6 @@ - - - -- -- 1 -- -- -- Archivo de vídeo -- -- -- Escoge un archivo de vídeo para subir a Youtube.  Asegúrate primero, de que tiene un formato compatible con Youtube, o puede que no funcione correctamente.  Si usas primero la pantalla de Exportar Vídeo, puedes utilizar Subir a Web, que autom -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/fr/openshot.xml openshot-1.4.3/docs/gnome/fr/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/fr/openshot.xml 2012-10-01 04:53:37.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/fr/openshot.xml 2014-04-20 02:08:24.680188941 -0300 -@@ -128,7 +128,7 @@ - - - Etape 5 – Exporter votre Vidéo -- Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que YouTube, Vimeo, etc...). -+ Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que Vimeo, etc...). - Cliquez sur l'icône Exporter la Vidéoen haut de l'écran (ou utilisez le menu guimenuitem>Fichier - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Envoyer le projet actuel en tant que fichier vidéo sur YouTube ou Viméo -+ Envoyer le projet actuel en tant que fichier vidéo sur Viméo - - - -@@ -3930,7 +3930,7 @@ - - - Télécharger sur le Web -- Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir entre YouTube et Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé -+ Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé - Les options avancées seront seulement utilisées par les personnes familières avec FFmpeg, depuis qu'il est si facile de créer de combinaisons valides de codec, de format, et de réglage des bitrates.  Toutefois, si vous êtes familiers avec ces réglages, n'importe quel format/codec/bitrate supporté par FFmpeg peut-être utilisé, ce qui ouvre des dizaines et des dizaines de combinaisons qui peuvent être utiliser lors du processus d'exportation. - Aussi, si vous sélectionnez les premières valeurs pour le Mode Simple, puis basculez en Mode Avancé, cela présélectionnera tous les paramètre du mode simple. - -@@ -3940,7 +3940,7 @@ - - - Télécharger une vidéo -- Si vous désirez envoyer directement une vidéo sur YouTube ou Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran -+ Si vous désirez envoyer directement une vidéo sur Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran - - - -@@ -3964,17 +3964,6 @@ - - - -- -- 1 -- -- -- Fichier vidéo -- -- -- Choisissez un fichier vidéo à envoyer sur YouTube.  Assurez vous qu'il est d'abord dans un format compatible avec YouTube, ou il ne fonctionnera peut-être pas correctement.  If vous utilisez en premier le menu Exporter la Vidéo, vous pouvez choisir Envoyer sur le Web -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/he/openshot.xml openshot-1.4.3/docs/gnome/he/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/he/openshot.xml 2012-10-01 04:53:40.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/he/openshot.xml 2014-04-20 02:15:15.533272469 -0300 -@@ -128,7 +128,7 @@ - - - שלב 5 - יצוא הוידיאו -- ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת youtube, vimeo וכו'). -+ ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת vimeo וכו'). - לחיצה על הסמל Export Video בחלקו העליון של החלון (או שמוש בתפריט File > Export Video...). בחירה באחת האפשרויות המוגדרות מראש, ולחיצה על לחצן Export Video . - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- העלאת הפרויקט הנוכחי כוידיאו לyoutube או לvimeo -+ העלאת הפרויקט הנוכחי כוידיאו ל או לvimeo - - - -@@ -3928,7 +3928,7 @@ - - - העלאה לאינטרנט -- בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור youtube או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם -+ בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם - מפני שקל מדי ליצור צרופים מטופשים של קידודים, פורמטים וקצבים, האפשרויות המתקדמות מיועדות לשמוש רק בידי משתמשים שמכירים את FFmpeg. למשתמשים המנוסים בהגדרות אלו, כל מה שנתמך עם FFmpeg מותר בשמוש, כך שתריסרים על תריסרים של הגדרות עומדות בפניו. ניתן ליצא וידיאו כרצף תמונות, ולהשתמש בהן לעריכה נוספת או ליבא אותן לתכנות עריכה שונות כדוגמת בלנדר. - יתר על כן, בבחירת הגדרה במצב פשוט ואז מעבר למצב מתקדם, תתבצע הגדרה של כל המאפיינים שקיימים במצב הפשוט לתוך המצב המתקדם. - -@@ -3938,7 +3938,7 @@ - - - העלאת וידאו -- להעלאת וידיאו ישירות לVimeo או Youtube, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. -+ להעלאת וידיאו ישירות לVimeo, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- קובץ וידאו -- -- -- בחירה בוידיאו למשלוח לyoutube. יש לודא מראש תאימות לפורמט המקובל בyoutube, או שזה לא יעבוד. אם בוצע שמוש במסך יצוא וידיאו, ניתן לבחור באפשרות משלוח לרשת, שתבצע התאמה אוטומטית של הפורמט, ותמלא את תיבת הבחירה עבורך. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/it/openshot.xml openshot-1.4.3/docs/gnome/it/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/it/openshot.xml 2012-10-01 04:53:42.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/it/openshot.xml 2014-04-20 02:15:57.893591295 -0300 -@@ -128,7 +128,7 @@ - - - Passo 5 - Esportare il Video -- Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Youtube, Vimeo, ecc...). -+ Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Vimeo, ecc...). - Clicca sull'icona Esporta Video in alto alla schermata (o usa il menu: File >Esporta Video...).  Scegli tra una delle tante opzioni di esportazione predefinite, e clicca sul Bottone Esporta Video. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Carica il progetto corrente come un file video di YouTube o Vimeo -+ Carica il progetto corrente come un file video di Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Carica sul Web -- Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere tra YouTube e Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata -+ Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata - Le opzioni avanzate dovrebbero essere usate solo da chi ha familiarità con FFmpeg, dal momento che è molto facile scegliere combinazioni non valide di codec, formati e bit-rate.  In ogni caso, se si ha familiarità con queste impostazioni, è possibile utilizzare ogni formato, codec o bit-rate supportato da FFmpeg, che include innumerevoli formati addizionali utilizzabili durante il processo di esportazione.  In aggiunta è possibile esportare il video come sequenza di immagini, una scelta utile se si intende importare il video in un'applicazione che richieda dellle sequenze di immagini, come Blender. - In aggiunta, se inizialmente si scelgono dei valori nella modalità Semplice, e in seguito si passa alla modalità Avanzata, verranno importate automaticamente le scelte effettuate nella modalità Semplice. - -@@ -3938,7 +3938,7 @@ - - - Carica il Video -- Per inviare direttamente un video su Youtube o su Vimeo, seleziona guimenu>File -+ Per inviare direttamente un video su Vimeo, seleziona guimenu>File - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- File video -- -- -- Seleziona un file video da inviare a YouTube.  Assicurati che il formato sia compatibile con YouTube prima di inviarlo, o potrebbe non funzionare correttamente.  Se utilizzi la pagina Esporta Video, puoi selezionare Upload sul Web, che automaticamente imposta un formato compatibile e riempie questa casella. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/nb/openshot.xml openshot-1.4.3/docs/gnome/nb/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/nb/openshot.xml 2012-10-01 04:53:44.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/nb/openshot.xml 2014-04-20 02:17:10.954141568 -0300 -@@ -128,7 +128,7 @@ - - - Trinn 5 - Eksporter videoen -- Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som YouTube, Vimeo etc...). -+ Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som Vimeo etc...). - Klikk på Eksporter video-ikonet øverst på skjermen (eller bruk menyen Fil > Eksporter video...).  Velg en av de mange forhåndsdefinerte eksportalternativene og klikk Eksporter video -knappen. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Last opp prosjekt som en videofil på YouTube eller Vimeo -+ Last opp prosjekt som en videofil på Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Last opp til nettsted -- Velg Last opp til web øverst i dette vinduet for å velge mellom YouTube og Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus -+ Velg Last opp til web øverst i dette vinduet for å velge Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus - De avanserte innstillingene bør bare brukes dersom du kjenner FFmpeg, siden det er lett å lage ugyldige kombinasjoner av kodeker, formater og bitrateinnstillinger. Men er du kjent med disse innstillingene kan du bruke en hvilken som helst kombinasjon av format, kodek og bitrate som støttes av FFmpeg. Dette åpner for mengder av andre formater som kan brukes til å eksportere video. Du kan også eksportere som en bildesekvens, noe som kan være nyttig hvis du tenker å importere videoen i et program som krever bildesekvenser, som f eks Blender. - Også, hvis du først velger innstillinger i Enkel og deretter bytter til Avansert vil innstillingene du valgte i Enkel modus være forvalgt. - -@@ -3938,7 +3938,7 @@ - - - Last opp video -- Hvis du vil laste opp en video direkte til YouTube eller Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. -+ Hvis du vil laste opp en video direkte Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Videofil -- -- -- Velg en videofil for opplasting til YouTube. Sjekk at formatet er kompatibelt med YouTube først, ellers virker det kanskje ikke skikkelig. Hvis du først bruker Eksporter video-vinduet kan du bruke Last opp til Web, som automatisk velger et kompatibelt format og fyller ut denne boksen for deg. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/nl/openshot.xml openshot-1.4.3/docs/gnome/nl/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/nl/openshot.xml 2012-10-01 04:53:46.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/nl/openshot.xml 2014-04-20 02:18:00.447847945 -0300 -@@ -129,7 +129,7 @@ - - - Stap 5 - Exporteer uw video -- Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (YouTube, Vimeo, etc.). -+ Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (Vimeo, etc.). - Klik op het Exporteer video pictogram in de hoofdwerkbalk (of klik in het hoofdmenu op Bestand > Exporteer video...). Kies uit één van de vele voorinstellingen, en klik op de Exporteer video knop. - - -@@ -924,7 +924,7 @@ - Ctrl + u - - -- Een videobestand uploaden naar YouTube of Vimeo -+ Een videobestand uploaden naar Vimeo - - - -@@ -3929,7 +3929,7 @@ - - - Uploaden naar het internet -- Kies de optie Uploaden naar het web bovenaan het scherm om de video op YouTube of Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu -+ Kies de optie Uploaden naar het web bovenaan het scherm om de video op Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu - Het geavanceerde keuzemenu kunt u het beste alleen gebruiken als u bekend bent met FFmpeg, omdat gemakkelijk ongeldige combinaties van videotypes, compressietypes en bitsnelheden gemaakt kunnen worden. Bent u echter bekend met deze instellingen, dan kan elk video/compressietype/bitsnelheid gebruikt worden wat FFmpeg ondersteund, en heeft u de keuze uit tientallen extra formaten. De video kan ook als een afbeeldingsreeks geëxporteerd worden, wat handig kan zijn als u de video wilt importeren in een programma dat afbeeldingsreeksen vereist, zoals Blender. - Opmerking: als u eerst het Eenvoudig keuzescherm heeft gebruikt en vervolgens het Geavanceerde keuzescherm kiest, zijn de waardes vanuit het eenvoudige keuzescherm al ingevuld. - -@@ -3939,7 +3939,7 @@ - - - Video uploaden -- Wilt u een video direct naar YouTube of Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. -+ Wilt u een video direct naar Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. - - - -@@ -3970,7 +3970,7 @@ - Videobestand - - -- Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor YouTube of Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor YouTube of Vimeo. -+ Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor Vimeo. - - - -diff -Nur openshot-1.4.3.orig/docs/gnome/pl/openshot.xml openshot-1.4.3/docs/gnome/pl/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pl/openshot.xml 2012-10-01 04:53:48.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pl/openshot.xml 2014-04-20 02:18:53.378247130 -0300 -@@ -128,7 +128,7 @@ - - - Krok 5 - Eksport i zapisanie Twojego filmu -- Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na YouTube, Vimeo i innych. -+ Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na Vimeo i innych. - Kliknij w przycisk Eksport Wideo u góry ekranu (lub użyj menu Plik > Eksport Video...).  Wybierz jedną z wielu dostępnych opcji eksportu i kliknij przycisk Eksport Wideo. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Wysyła bieżący projekt jako plik wideo na YouTube lub Vimeo -+ Wysyła bieżący projekt jako plik wideo na Vimeo - - - -@@ -3969,7 +3969,7 @@ - - - Wyślij do Internetu -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3979,7 +3979,7 @@ - - - Wyślij wideo -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4003,17 +4003,6 @@ - - - -- -- 1 -- -- -- Plik wideo -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/pt/openshot.xml openshot-1.4.3/docs/gnome/pt/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pt/openshot.xml 2012-10-01 04:53:50.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pt/openshot.xml 2014-04-20 02:19:30.651861715 -0300 -@@ -128,7 +128,7 @@ - - - Passo 5 – Exportar o seu Vídeo -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -924,7 +924,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3981,7 +3981,7 @@ - - - Enviar para a web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3991,7 +3991,7 @@ - - - Enviar vídeo -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4015,17 +4015,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml openshot-1.4.3/docs/gnome/pt_BR/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml 2012-10-01 04:53:52.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pt_BR/openshot.xml 2014-04-20 02:20:05.515458224 -0300 -@@ -128,7 +128,7 @@ - - - 5º Passo - Exportar o seu Vídeo -- Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Youtube, Vimeo, etc...) -+ Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Vimeo, etc...) - Clique sobre o ícone Exportar Vídeo na parte superior da tela (ou utilize o menu Arquivo > Exportar vídeo...). Excolha uma das diversas opções de exportação pré-configuradas, e clique no botão Exportar Vídeo. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Envia o projeto atual como um arquivo de vídeo para o YouTube ou Vimeo -+ Envia o projeto atual como um arquivo de vídeo para o Vimeo - - - -@@ -3936,7 +3936,7 @@ - - - Publicar na Web -- Esolha a opção Upload to Web no topo da tela para escolher entre Youtube e Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado -+ Esolha a opção Upload to Web no topo da tela para escolher Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado - As opções avançadas somente devem ser utilizadas por pessoas familiarizadas com o FFmpeg, já que é muito fácil criar combinações inválidas de codecs, formatos e taxas de bits. No entanto, se você conhecer essas configurações, qualquer formato/codec/bit-rate suportado pode ser utilizado, o que fornece dezenas de formatos adicionais que podem ser utilizador para exportar. Você pode também exportar o seu vídeo como uma sequência de imagens, que pode ser útil se você pretende importar seu vídeo em um programa que requer sequências de imagens, como o blender. - E também, se você primeiro selecionar valores no Modo simples, e então trocar para o Modo avançado, ele pré-selecionará todas as configurações do modo simples. - -@@ -3946,7 +3946,7 @@ - - - Enviar Vídeo -- Se você quiser fazer o upload do vídeo diretamente no Youtube ou Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. -+ Se você quiser fazer o upload do vídeo diretamente no Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. - - - -@@ -3970,17 +3970,6 @@ - - - -- -- 1 -- -- -- Arquivo de vídeo -- -- -- Escolha um arquivo de vídeo para upload para o youtube.  Tenha certeza de que é um formato compatível com o Youtube, ou pode não funcionar corretamente.  Se você primeiro usar a tela Export Video , você pode escolher Upload to Web, o qual escolherá automaticamente um formato compatível e preencherá essa caixa para você. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/sk/openshot.xml openshot-1.4.3/docs/gnome/sk/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/sk/openshot.xml 2012-10-01 04:53:54.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/sk/openshot.xml 2014-04-20 02:20:54.589162174 -0300 -@@ -128,7 +128,7 @@ - - - Step 5 – Exportovanie vášho videa -- Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. YouTube, Vime, atď ..) -+ Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. Vime, atď ..) - Kliknite na Export videa na ikonu v hornej časti obrazovky (alebo použite Súbor > Export Video ...).   Vyberte si z jednej z mnohých prednastavených možností exportu, a kliknite na tlačidlo Export videa . - - -@@ -924,7 +924,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3982,7 +3982,7 @@ - - - Nahrať na web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3992,7 +3992,7 @@ - - - Nahrať video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4016,17 +4016,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml openshot-1.4.3/docs/gnome/zh_TW/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml 2012-10-01 04:53:56.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/zh_TW/openshot.xml 2014-04-20 02:21:34.279462075 -0300 -@@ -128,7 +128,7 @@ - - - 步驟 5 - 匯出您的影音 -- 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 YouTube、Vimeo... 等) l的影片檔。 -+ 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 Vimeo... 等) l的影片檔。 - 點畫面最頂端的 匯出視訊 圖示 (或使用「檔案」>「匯出視訊...」選單)，從許多預先設定中選擇一個適合的，點「匯出視訊按鈕」。 - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3970,7 +3970,7 @@ - - - 上傳到網路 -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 - 進階選項應該只限由熟悉 FFmpeg 的人來使用，因為很容易弄出不正確的編解碼器、格式與位元率設定組合。 然而，如果您熟悉這些設定，則可以利用 FFmpeg 支援的格式/編解碼器/位元率來組合出更多用在匯出程序的格式。 您也可以將視訊匯出為連續影像，在類似 Blender 這類需要連續影像的程式時會很有用。 - 如果您先選取 簡單模式 的數值後再切換到 進階模式，則會預先選取簡單模式的所有設定。 - -@@ -3980,7 +3980,7 @@ - - - 上傳影片 -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4004,17 +4004,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/openshot/classes/info.py openshot-1.4.3/openshot/classes/info.py ---- openshot-1.4.3.orig/openshot/classes/info.py 2012-10-01 04:55:03.000000000 -0300 -+++ openshot-1.4.3/openshot/classes/info.py 2014-04-20 01:54:35.430638280 -0300 -@@ -52,7 +52,7 @@ - 'url' : 'http://www.openshotvideo.com/', - 'license' : 'GNU GPL v.' + GPL_VERSION, - 'description' : 'Create and edit videos and movies', -- 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (YouTube and Vimeo supported)", -+ 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (Vimeo supported)", - - - # see http://pypi.python.org/pypi?%3Aaction=list_classifiers -diff -Nur openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot ---- openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot 2014-04-20 01:56:55.698378410 -0300 -@@ -1058,11 +1058,6 @@ - msgid "Export to Folder" - msgstr "" - --#: /home/jonathan/openshot/openshot/windows/ExportVideo.py:114 --#: /home/jonathan/openshot/openshot/export_presets/youtube.xml --msgid "YouTube" --msgstr "" -- - #: /home/jonathan/openshot/openshot/windows/ExportVideo.py:306 - #: /home/jonathan/openshot/openshot/export_presets/format_avi_mpeg2.xml - msgid "All Formats" -@@ -1498,17 +1493,6 @@ - msgid "Opened project" - msgstr "" - --#: /home/jonathan/openshot/openshot/uploads/manager.py:66 --#: /home/jonathan/openshot/openshot/uploads/manager.py:293 --#: /home/jonathan/openshot/openshot/export_presets/youtube.xml --msgid "Web" --msgstr "" -- --#: /home/jonathan/openshot/openshot/uploads/manager.py:66 --#: /home/jonathan/openshot/openshot/export_presets/youtube_HD.xml --msgid "YouTube-HD" --msgstr "" -- - #: /home/jonathan/openshot/openshot/uploads/manager.py:91 - #: /home/jonathan/openshot/openshot/uploads/manager.py:315 - msgid "Please choose a valid video file." -@@ -1532,12 +1516,6 @@ - msgid "Please enter a valid password." - msgstr "" - --#: /home/jonathan/openshot/openshot/uploads/manager.py:186 --msgid "" --"There was an error uploading this video to YouTube. Please check your " --"username, password, and be sure a valid video file is selected and try again." --msgstr "" -- - #: /home/jonathan/openshot/openshot/uploads/manager.py:261 - msgid "Vimeo authentication has expired." - msgstr "" -diff -Nur openshot-1.4.3.orig/openshot/uploads/manager.py openshot-1.4.3/openshot/uploads/manager.py ---- openshot-1.4.3.orig/openshot/uploads/manager.py 2011-02-22 04:20:53.000000000 -0200 -+++ openshot-1.4.3/openshot/uploads/manager.py 2014-04-20 01:50:59.295653314 -0300 -@@ -21,201 +21,11 @@ - - def get_services(self): - services = {} -- services["YouTube"] = YouTubeService(self.project, self.settings) - if sys.version_info[0] == 2 and sys.version_info[1] == 6 and vimeo_imported == True: - # vimeo only works on Python 2.6 right now - services["Vimeo"] = VimeoService(self.project, self.settings) - return services - --class YouTubeService(): -- def __init__(self, project, settings): -- self.project = project -- self.filename = None -- self.settings = settings -- self.form = None -- -- # Add language support -- _ = Language_Init.Translator(project).lang.gettext -- self._ = _ -- -- def initialize(self, form): -- """ Prepare the upload form for this service """ -- self.form = form -- -- form.login_divider.set_property("visible", True) -- form.lblUsername.set_property("visible", True) -- form.txtUsername.set_property("visible", True) -- form.lblPassword.set_property("visible", True) -- form.txtPassword.set_property("visible", True) -- form.btnAuthorize.set_property("visible", False) -- form.lblVerification.set_property("visible", False) -- form.txtVerification.set_property("visible", False) -- form.lnkForgot.set_label("http://www.youtube.com") -- form.lnkForgot.set_uri("http://www.youtube.com") -- -- # get saved username (if any) -- if self.settings.app_state["upload_username"]: -- form.txtUsername.set_text(self.settings.app_state["upload_username"]) -- -- def get_export_presets(self): -- """ Get a tuple of related export presets for this service (if any) """ -- -- # get reference to gettext -- _ = self._ -- -- return (_("Web"), _("YouTube-HD")) -- -- def get_authorization_url(self): -- return None -- -- def get_logo(self): -- logo_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "logos", "youtube.png") -- return gtk.gdk.pixbuf_new_from_file(logo_path) -- -- def validate(self, form): -- """ Validate the upload form... check for missing values. """ -- -- # get reference to gettext -- _ = self._ -- -- # get settings -- title = form.txtTitle.get_text() -- start, end = form.txtDescription.get_buffer().get_bounds() -- description = form.txtDescription.get_buffer().get_text(start, end) -- username = form.txtUsername.get_text() -- password = form.txtPassword.get_text() -- -- # Validate the the form is valid -- if not os.path.isfile(str(self.filename)): -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please choose a valid video file.")) -- return False -- -- if not title: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid title.")) -- return False -- -- if not description: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid description.")) -- return False -- -- if not username: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid username.")) -- return False -- else: -- # save username -- self.settings.app_state["upload_username"] = username -- -- if not password: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid password.")) -- return False -- -- # form is valid -- return True -- -- def set_file(self, filename): -- self.filename = filename -- -- def start_upload(self, form): -- -- # get reference to gettext -- _ = self._ -- -- # Get the absolute path of this project -- import os, sys -- google_api_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "youtube") -- if google_api_path not in sys.path: -- sys.path.append(google_api_path) -- -- # get settings -- username = form.txtUsername.get_text() -- password = form.txtPassword.get_text() -- title = form.txtTitle.get_text() -- start, end = form.txtDescription.get_buffer().get_bounds() -- description = form.txtDescription.get_buffer().get_text(start, end) -- -- # remember username (but not password) -- self.settings.app_state["upload_username"] = username -- -- import getopt -- import mimetypes -- import atom.data -- import gdata.youtube -- import gdata.youtube.service -- import gdata.client -- import gdata.data -- import gdata.gauth -- import gdata.youtube.client -- import gdata.youtube.data -- import gdata.sample_util -- import helper -- -- # prepare a media group object to hold our video's meta-data -- my_media_group = gdata.media.Group( -- title=gdata.media.Title(text=title), -- description=gdata.media.Description(description_type='plain', -- text=description), -- keywords=gdata.media.Keywords(text=''), -- category=[gdata.media.Category( -- text='People', -- scheme='http://gdata.youtube.com/schemas/2007/categories.cat', -- label='People')], -- player=None -- ) -- -- # create the gdata.youtube.YouTubeVideoEntry to be uploaded -- video_entry = gdata.youtube.YouTubeVideoEntry(media=my_media_group) -- -- # create -- try: -- # disable upload button -- form.btnUpload.set_sensitive(False) -- -- # start upload -- uploader = helper.ResumableUploadDemo(self.filename, chunk_size=1024*64, convert="false", ssl=False, debug=False, host="uploads.gdata.youtube.com", username=username, password=password) -- -- # upload chunks -- entry = uploader.UploadInManualChunks(video_entry, os.path.split(self.filename)[-1], self.on_chunk_complete) -- -- except: -- # Show error message -- messagebox.show(_("Validation Error!"), _("There was an error uploading this video to YouTube. Please check your username, password, and be sure a valid video file is selected and try again.")) -- -- # enable upload button -- form.btnUpload.set_sensitive(True) -- return False -- -- -- # enable upload button -- form.btnUpload.set_sensitive(True) -- -- # successful -- return True -- -- def on_chunk_complete(self, *args): -- #print "on_chunk_complete" -- -- total_size = args[0] -- current_bytes = args[1] -- -- if current_bytes >= total_size: -- # don't exceed the total bytes -- current_bytes = total_size -- -- # calculate percentage -- percent = float(current_bytes) / float(total_size) -- gobject.idle_add(self.form.update_progressbar, percent) -- -- # allow other gtk operations to happen -- while gtk.events_pending(): -- gtk.main_iteration() -- -- -- - class VimeoService(): - def __init__(self, project, settings): - self.project = project -diff -Nur openshot-1.4.3.orig/openshot/windows/ExportVideo.py openshot-1.4.3/openshot/windows/ExportVideo.py ---- openshot-1.4.3.orig/openshot/windows/ExportVideo.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/windows/ExportVideo.py 2014-04-20 01:51:37.659279587 -0300 -@@ -111,7 +111,6 @@ - for option in upload_types: - # append profile to list - self.cboUploadServices.append_text(option) -- self.set_dropdown_values(_("YouTube"), self.cboUploadServices) - - - #populate the format/codec drop downs -diff -Nur openshot-1.4.3.orig/openshot/windows/preferences.py openshot-1.4.3/openshot/windows/preferences.py ---- openshot-1.4.3.orig/openshot/windows/preferences.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/windows/preferences.py 2014-04-20 01:52:19.739601020 -0300 -@@ -382,7 +382,6 @@ - "clip_property_window_height" : "345", - "clip_property_window_maximized" : "False", - "clip_property_hpane_position" : "260", -- "upload_service" : "YouTube", - "upload_username" : "", - "vimeo_token" : "", - "vimeo_token_secret" : "", -diff -Nur openshot-1.4.3.orig/setup.py openshot-1.4.3/setup.py ---- openshot-1.4.3.orig/setup.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/setup.py 2014-04-20 01:28:48.698575950 -0300 -@@ -57,7 +57,7 @@ - # ------------------------------------- - dist = setup( - scripts = ['bin/openshot','bin/openshot-render'], -- packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients', 'openshot.uploads.youtube', 'openshot.uploads.youtube.atom', 'openshot.uploads.youtube.gdata', 'openshot.uploads.youtube.gdata.geo', 'openshot.uploads.youtube.gdata.media', 'openshot.uploads.youtube.gdata.oauth', 'openshot.uploads.youtube.gdata.opensearch', 'openshot.uploads.youtube.gdata.tlslite', 'openshot.uploads.youtube.gdata.tlslite.integration', 'openshot.uploads.youtube.gdata.tlslite.utils', 'openshot.uploads.youtube.gdata.youtube'], -+ packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients'], - package_data = { - 'openshot' : ['export_presets/*', 'images/*', 'locale/OpenShot/*', 'locale/README', 'profiles/*', 'themes/*/*.png', 'themes/*/*.xml', 'themes/*/icons/*.png', 'titles/*/*.svg', 'transitions/icons/medium/*.png', 'transitions/icons/small/*.png', 'transitions/*.pgm', 'transitions/*.png', 'transitions/*.svg', 'effects/icons/medium/*.png', 'effects/icons/small/*.png', 'effects/*.xml', 'blender/blend/*.blend', 'blender/icons/*.png', 'blender/earth/*.jpg', 'blender/scripts/*.py', 'blender/*.xml'] + locale_files, - 'openshot.windows' : ['ui/*.ui', 'ui/icons/*'], diff --git a/nonprism/openshot-nonprism/openshot.install b/nonprism/openshot-nonprism/openshot.install deleted file mode 100644 index 046df0051..000000000 --- a/nonprism/openshot-nonprism/openshot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/openshot/PKGBUILD b/nonprism/openshot/PKGBUILD new file mode 100644 index 000000000..8beac5ee7 --- /dev/null +++ b/nonprism/openshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $ +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Asa Marco +# Maintainer: André Silva + +pkgname=openshot +pkgver=1.4.3 +pkgrel=3.parabola1.nonprism1 +pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support" +arch=('any') +url="http://www.openshotvideo.com/" +license=('GPL') +depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer' + 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow') +optdepends=('dvgrab: for IEEE digital sources' + 'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa') +replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") +conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") +install=openshot.install +source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + nonprism.patch) +md5sums=('5ec82a7e8b7700ee4a359458aedf19e9' + '0b8ade6f6332d1ef9c6c153647953df7') +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/nonprism.patch +} + +package() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir/ --optimize=1 +} diff --git a/nonprism/openshot/nonprism.patch b/nonprism/openshot/nonprism.patch new file mode 100644 index 000000000..0028f7013 --- /dev/null +++ b/nonprism/openshot/nonprism.patch @@ -0,0 +1,1257 @@ +diff -Nur openshot-1.4.3.orig/docs/gnome/C/openshot.xml openshot-1.4.3/docs/gnome/C/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/C/openshot.xml 2012-10-01 04:53:22.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/C/openshot.xml 2014-04-20 02:08:55.200417436 -0300 +@@ -131,7 +131,7 @@ + + + Step 5 – Export your Video +- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). ++ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). + Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. + + +@@ -927,7 +927,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3985,7 +3985,7 @@ + + + Upload to Web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3995,7 +3995,7 @@ + + + Upload Video +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4019,17 +4019,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/cs/openshot.xml openshot-1.4.3/docs/gnome/cs/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/cs/openshot.xml 2012-10-01 04:53:25.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/cs/openshot.xml 2014-04-20 02:09:38.920744917 -0300 +@@ -128,7 +128,7 @@ + + + Krok 5 - Export videa +- Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou YouTube, Vimeo atd.). ++ Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou Vimeo atd.). + Klikněte na ikonu Exportovat video nahoře (nebo použijte nabídku (Soubor > Exportovat video...). Vyberte jeden z mnoha přednastavených voleb exportu a klikněte na tlačítko Exportovat video. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3969,7 +3969,7 @@ + + + Nahrát na web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3979,7 +3979,7 @@ + + + Nahrát video +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4003,17 +4003,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/da/openshot.xml openshot-1.4.3/docs/gnome/da/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/da/openshot.xml 2012-10-01 04:53:27.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/da/openshot.xml 2014-04-20 02:12:07.785194708 -0300 +@@ -130,7 +130,7 @@ + + + Trin 5 - Eksporter din video +- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). ++ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). + Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. + + +@@ -926,7 +926,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3984,7 +3984,7 @@ + + + Upload til Web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3994,7 +3994,7 @@ + + + Upload video +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4018,17 +4018,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/de/openshot.xml openshot-1.4.3/docs/gnome/de/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/de/openshot.xml 2012-10-01 04:53:29.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/de/openshot.xml 2014-04-20 02:12:22.628639484 -0300 +@@ -138,7 +138,7 @@ + + Schritt 5 - Den fertigen Film exportieren + Wenn Sie mit der Diashow zufrieden sind, wollen wir den Film exportieren. +- Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Youtube, Vimeo u.a.) richtig gelesen werden kann. ++ Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Vimeo u.a.) richtig gelesen werden kann. + Wählen Sie das Video exportierenSymbol am oberen Bildschirmrand (oder klicken Sie auf Datei > Video exportieren...). +  Wählen Sie eine der Export-Voreinstellungen und klicken Sie auf Video exportieren. + +@@ -938,7 +938,7 @@ + STRG + U + + +- Aktuelles Projekt als Videodatei zu YouTube oder Vimeo hochladen ++ Aktuelles Projekt als Videodatei zu Vimeo hochladen + + + +@@ -3978,7 +3978,7 @@ + + + Ins Web hochladen +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + Die erweiterten Optionen sollten nur von Leuten die FFmpeg vertraut sind benutzt werden, da es sehr einfach ist ungültige Kombinationen der Einstellung von Codec, Format und Bitrate vorzunehmen. Sind sie jedoch mit diesen Einstellungen vertraut können alle unterstützten Formate/Codec/Bitraten verwendet werden, was duzende zusätzlicher Formate eröffnet die während des Exportvorgangs benutzt werden können. Sie können Ihr Video auch als Bildsequenz exportieren, was hilfreich sein kann wenn Sie vorhaben dieses Video in ein Programm zu importieren das Bildsequenzen benötigt, wie z.B. Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3988,7 +3988,7 @@ + + + Video hochladen +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4012,17 +4012,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/el/openshot.xml openshot-1.4.3/docs/gnome/el/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/el/openshot.xml 2012-10-01 04:53:31.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/el/openshot.xml 2014-04-20 02:12:42.675456689 -0300 +@@ -128,7 +128,7 @@ + + + Βήμα 5 - Εξαγωγή βίντεο +- Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το YouTube, Vimeo, κ.λπ. ..). ++ Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το Vimeo, κ.λπ. ..). + Κάντε κλικ στο εικονίδιο Εξαγωγή βίντεο guibutton> guimenuitem>> guimenuitem> guibutton>. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο YouTube ή στο Vimeo ++ Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο Vimeo + + + +@@ -3928,7 +3928,7 @@ + + + Αποστολή στον Ιστό +- Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε μεταξύ YouTube και Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία ++ Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία + Οι προηγμένες επιλογές θα πρέπει να χρησιμοποιούνται μόνο από κάποιον που γνωρίζει το FFmpeg, δεδομένου ότι είναι τόσο εύκολο να δημιουργηθούν άκυροι συνδυασμοί κωδικοποιητών, μορφών και ρυθμίσεων ταχύτητας.   Ωστόσο, εάν είστε εξοικειωμένοι με αυτές τις ρυθμίσεις, οποιαδήποτε υποστηριζόμενη μορφή FFmpeg μπορεί να χρησιμοποιηθεί, η οποία ανοίγει δεκάδες πρόσθετες μορφές που μπορεί να χρησιμοποιηθoύν κατά τη διαδικασία εξαγωγής.   Μπορείτε επίσης να εξαγάγετε το βίντεό σας ως μία ακολουθία εικόνας, το οποίο μπορεί να είναι χρήσιμο αν σκοπεύετε να εισαγάγετε αυτό το βίντεο σε ένα πρόγραμμα που απαιτεί ακολουθίες εικόνων, όπως το Blender. + Επίσης, αν έχετε πρώτα επιλέξει τιμές για την Απλή Λειτουργία guibutton>, guibutton>, + +@@ -3938,7 +3938,7 @@ + + + Αποστολή βίντεο +- Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο YouTube ή στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. ++ Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. + + + +@@ -3962,17 +3962,6 @@ + + + +- +- 1 +- +- +- Αρχείο βίντεο +- +- +- Επιλέξτε ένα αρχείο για αποστολή στο YouTube.  Σιγουρευτείτε πρώτα πως είναι συμβατή μορφή με το YouTube, διαφορετικά (ίσως) δεν θα λειτουργήσει σωστά.  Εάν χρησιμοποιήσετε πρώτα την οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που θα επιλέξει αυτόματα μία συμβατή μορφή, και θα συμπληρώσει τα "κουτάκια" για εσάς. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml openshot-1.4.3/docs/gnome/en_GB/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml 2012-10-01 04:53:33.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/en_GB/openshot.xml 2014-04-20 02:09:15.273901103 -0300 +@@ -128,7 +128,7 @@ + + + Step 5 – Export your Video +- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). ++ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). + Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3928,7 +3928,7 @@ + + + Upload to Web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3938,7 +3938,7 @@ + + + Upload Video +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -3962,17 +3962,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/es/openshot.xml openshot-1.4.3/docs/gnome/es/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/es/openshot.xml 2012-10-01 04:53:36.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/es/openshot.xml 2014-04-20 02:07:46.399902484 -0300 +@@ -129,7 +129,7 @@ + + + Paso 5 - Exporte su vídeo +- Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como YouTube, Vimeo, etc...). ++ Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como Vimeo, etc...). + Presione sobre el icono Exportar Vídeo en la parte superior de la pantalla (o utilice el menú Archivo > Exportar vídeo...). Elija una de las muchas opciones de exportación preconfiguradas, y haga clic en el botón Exportar Vídeo. + + +@@ -924,7 +924,7 @@ + Control+U + + +- Subir el proyecto actual como archivo de vídeo a Youtube o Vimeo ++ Subir el proyecto actual como archivo de vídeo a Vimeo + + + +@@ -3929,7 +3929,7 @@ + + + Subir a la web +- Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger entre Youtube y Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado ++ Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado + Las opciones avanzadas sólo deberían ser utilizados por alguien familiarizado con FFmpeg, ya que es muy fácil crear combinaciones no válidas de codecs, formatos y tasas de bits.   Sin embargo, si usted está familiarizado con estos ajustes, puede utilizar cualquier formato/codec/tasa de bits soportado por FFmpeg, lo cual abre docenas y docenas de formatos adicionales que pueden ser utilizados durante el proceso de exportación.   También puede exportar el vídeo como una secuencia de imágenes, que puede ser útil si tiene previsto importar este vídeo en un programa que requiere secuencias de imágenes, como Blender. + Además, si primero selecciona valores en el Modo simple y luego cambia al Modo avanzado los ajustes del modo simple serán recordados y aparecerán preseleccionados. + +@@ -3939,7 +3939,7 @@ + + + Subir vídeo +- Si quieres subir un vídeo directamente a Youtube o Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. ++ Si quieres subir un vídeo directamente a Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. + + + +@@ -3963,17 +3963,6 @@ + + + +- +- 1 +- +- +- Archivo de vídeo +- +- +- Escoge un archivo de vídeo para subir a Youtube.  Asegúrate primero, de que tiene un formato compatible con Youtube, o puede que no funcione correctamente.  Si usas primero la pantalla de Exportar Vídeo, puedes utilizar Subir a Web, que autom +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/fr/openshot.xml openshot-1.4.3/docs/gnome/fr/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/fr/openshot.xml 2012-10-01 04:53:37.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/fr/openshot.xml 2014-04-20 02:08:24.680188941 -0300 +@@ -128,7 +128,7 @@ + + + Etape 5 – Exporter votre Vidéo +- Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que YouTube, Vimeo, etc...). ++ Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que Vimeo, etc...). + Cliquez sur l'icône Exporter la Vidéoen haut de l'écran (ou utilisez le menu guimenuitem>Fichier + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Envoyer le projet actuel en tant que fichier vidéo sur YouTube ou Viméo ++ Envoyer le projet actuel en tant que fichier vidéo sur Viméo + + + +@@ -3930,7 +3930,7 @@ + + + Télécharger sur le Web +- Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir entre YouTube et Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé ++ Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé + Les options avancées seront seulement utilisées par les personnes familières avec FFmpeg, depuis qu'il est si facile de créer de combinaisons valides de codec, de format, et de réglage des bitrates.  Toutefois, si vous êtes familiers avec ces réglages, n'importe quel format/codec/bitrate supporté par FFmpeg peut-être utilisé, ce qui ouvre des dizaines et des dizaines de combinaisons qui peuvent être utiliser lors du processus d'exportation. + Aussi, si vous sélectionnez les premières valeurs pour le Mode Simple, puis basculez en Mode Avancé, cela présélectionnera tous les paramètre du mode simple. + +@@ -3940,7 +3940,7 @@ + + + Télécharger une vidéo +- Si vous désirez envoyer directement une vidéo sur YouTube ou Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran ++ Si vous désirez envoyer directement une vidéo sur Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran + + + +@@ -3964,17 +3964,6 @@ + + + +- +- 1 +- +- +- Fichier vidéo +- +- +- Choisissez un fichier vidéo à envoyer sur YouTube.  Assurez vous qu'il est d'abord dans un format compatible avec YouTube, ou il ne fonctionnera peut-être pas correctement.  If vous utilisez en premier le menu Exporter la Vidéo, vous pouvez choisir Envoyer sur le Web +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/he/openshot.xml openshot-1.4.3/docs/gnome/he/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/he/openshot.xml 2012-10-01 04:53:40.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/he/openshot.xml 2014-04-20 02:15:15.533272469 -0300 +@@ -128,7 +128,7 @@ + + + שלב 5 - יצוא הוידיאו +- ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת youtube, vimeo וכו'). ++ ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת vimeo וכו'). + לחיצה על הסמל Export Video בחלקו העליון של החלון (או שמוש בתפריט File > Export Video...). בחירה באחת האפשרויות המוגדרות מראש, ולחיצה על לחצן Export Video . + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- העלאת הפרויקט הנוכחי כוידיאו לyoutube או לvimeo ++ העלאת הפרויקט הנוכחי כוידיאו ל או לvimeo + + + +@@ -3928,7 +3928,7 @@ + + + העלאה לאינטרנט +- בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור youtube או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם ++ בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם + מפני שקל מדי ליצור צרופים מטופשים של קידודים, פורמטים וקצבים, האפשרויות המתקדמות מיועדות לשמוש רק בידי משתמשים שמכירים את FFmpeg. למשתמשים המנוסים בהגדרות אלו, כל מה שנתמך עם FFmpeg מותר בשמוש, כך שתריסרים על תריסרים של הגדרות עומדות בפניו. ניתן ליצא וידיאו כרצף תמונות, ולהשתמש בהן לעריכה נוספת או ליבא אותן לתכנות עריכה שונות כדוגמת בלנדר. + יתר על כן, בבחירת הגדרה במצב פשוט ואז מעבר למצב מתקדם, תתבצע הגדרה של כל המאפיינים שקיימים במצב הפשוט לתוך המצב המתקדם. + +@@ -3938,7 +3938,7 @@ + + + העלאת וידאו +- להעלאת וידיאו ישירות לVimeo או Youtube, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. ++ להעלאת וידיאו ישירות לVimeo, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. + + + +@@ -3962,17 +3962,6 @@ + + + +- +- 1 +- +- +- קובץ וידאו +- +- +- בחירה בוידיאו למשלוח לyoutube. יש לודא מראש תאימות לפורמט המקובל בyoutube, או שזה לא יעבוד. אם בוצע שמוש במסך יצוא וידיאו, ניתן לבחור באפשרות משלוח לרשת, שתבצע התאמה אוטומטית של הפורמט, ותמלא את תיבת הבחירה עבורך. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/it/openshot.xml openshot-1.4.3/docs/gnome/it/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/it/openshot.xml 2012-10-01 04:53:42.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/it/openshot.xml 2014-04-20 02:15:57.893591295 -0300 +@@ -128,7 +128,7 @@ + + + Passo 5 - Esportare il Video +- Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Youtube, Vimeo, ecc...). ++ Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Vimeo, ecc...). + Clicca sull'icona Esporta Video in alto alla schermata (o usa il menu: File >Esporta Video...).  Scegli tra una delle tante opzioni di esportazione predefinite, e clicca sul Bottone Esporta Video. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Carica il progetto corrente come un file video di YouTube o Vimeo ++ Carica il progetto corrente come un file video di Vimeo + + + +@@ -3928,7 +3928,7 @@ + + + Carica sul Web +- Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere tra YouTube e Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata ++ Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata + Le opzioni avanzate dovrebbero essere usate solo da chi ha familiarità con FFmpeg, dal momento che è molto facile scegliere combinazioni non valide di codec, formati e bit-rate.  In ogni caso, se si ha familiarità con queste impostazioni, è possibile utilizzare ogni formato, codec o bit-rate supportato da FFmpeg, che include innumerevoli formati addizionali utilizzabili durante il processo di esportazione.  In aggiunta è possibile esportare il video come sequenza di immagini, una scelta utile se si intende importare il video in un'applicazione che richieda dellle sequenze di immagini, come Blender. + In aggiunta, se inizialmente si scelgono dei valori nella modalità Semplice, e in seguito si passa alla modalità Avanzata, verranno importate automaticamente le scelte effettuate nella modalità Semplice. + +@@ -3938,7 +3938,7 @@ + + + Carica il Video +- Per inviare direttamente un video su Youtube o su Vimeo, seleziona guimenu>File ++ Per inviare direttamente un video su Vimeo, seleziona guimenu>File + + + +@@ -3962,17 +3962,6 @@ + + + +- +- 1 +- +- +- File video +- +- +- Seleziona un file video da inviare a YouTube.  Assicurati che il formato sia compatibile con YouTube prima di inviarlo, o potrebbe non funzionare correttamente.  Se utilizzi la pagina Esporta Video, puoi selezionare Upload sul Web, che automaticamente imposta un formato compatibile e riempie questa casella. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/nb/openshot.xml openshot-1.4.3/docs/gnome/nb/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/nb/openshot.xml 2012-10-01 04:53:44.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/nb/openshot.xml 2014-04-20 02:17:10.954141568 -0300 +@@ -128,7 +128,7 @@ + + + Trinn 5 - Eksporter videoen +- Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som YouTube, Vimeo etc...). ++ Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som Vimeo etc...). + Klikk på Eksporter video-ikonet øverst på skjermen (eller bruk menyen Fil > Eksporter video...).  Velg en av de mange forhåndsdefinerte eksportalternativene og klikk Eksporter video -knappen. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Last opp prosjekt som en videofil på YouTube eller Vimeo ++ Last opp prosjekt som en videofil på Vimeo + + + +@@ -3928,7 +3928,7 @@ + + + Last opp til nettsted +- Velg Last opp til web øverst i dette vinduet for å velge mellom YouTube og Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus ++ Velg Last opp til web øverst i dette vinduet for å velge Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus + De avanserte innstillingene bør bare brukes dersom du kjenner FFmpeg, siden det er lett å lage ugyldige kombinasjoner av kodeker, formater og bitrateinnstillinger. Men er du kjent med disse innstillingene kan du bruke en hvilken som helst kombinasjon av format, kodek og bitrate som støttes av FFmpeg. Dette åpner for mengder av andre formater som kan brukes til å eksportere video. Du kan også eksportere som en bildesekvens, noe som kan være nyttig hvis du tenker å importere videoen i et program som krever bildesekvenser, som f eks Blender. + Også, hvis du først velger innstillinger i Enkel og deretter bytter til Avansert vil innstillingene du valgte i Enkel modus være forvalgt. + +@@ -3938,7 +3938,7 @@ + + + Last opp video +- Hvis du vil laste opp en video direkte til YouTube eller Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. ++ Hvis du vil laste opp en video direkte Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. + + + +@@ -3962,17 +3962,6 @@ + + + +- +- 1 +- +- +- Videofil +- +- +- Velg en videofil for opplasting til YouTube. Sjekk at formatet er kompatibelt med YouTube først, ellers virker det kanskje ikke skikkelig. Hvis du først bruker Eksporter video-vinduet kan du bruke Last opp til Web, som automatisk velger et kompatibelt format og fyller ut denne boksen for deg. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/nl/openshot.xml openshot-1.4.3/docs/gnome/nl/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/nl/openshot.xml 2012-10-01 04:53:46.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/nl/openshot.xml 2014-04-20 02:18:00.447847945 -0300 +@@ -129,7 +129,7 @@ + + + Stap 5 - Exporteer uw video +- Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (YouTube, Vimeo, etc.). ++ Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (Vimeo, etc.). + Klik op het Exporteer video pictogram in de hoofdwerkbalk (of klik in het hoofdmenu op Bestand > Exporteer video...). Kies uit één van de vele voorinstellingen, en klik op de Exporteer video knop. + + +@@ -924,7 +924,7 @@ + Ctrl + u + + +- Een videobestand uploaden naar YouTube of Vimeo ++ Een videobestand uploaden naar Vimeo + + + +@@ -3929,7 +3929,7 @@ + + + Uploaden naar het internet +- Kies de optie Uploaden naar het web bovenaan het scherm om de video op YouTube of Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu ++ Kies de optie Uploaden naar het web bovenaan het scherm om de video op Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu + Het geavanceerde keuzemenu kunt u het beste alleen gebruiken als u bekend bent met FFmpeg, omdat gemakkelijk ongeldige combinaties van videotypes, compressietypes en bitsnelheden gemaakt kunnen worden. Bent u echter bekend met deze instellingen, dan kan elk video/compressietype/bitsnelheid gebruikt worden wat FFmpeg ondersteund, en heeft u de keuze uit tientallen extra formaten. De video kan ook als een afbeeldingsreeks geëxporteerd worden, wat handig kan zijn als u de video wilt importeren in een programma dat afbeeldingsreeksen vereist, zoals Blender. + Opmerking: als u eerst het Eenvoudig keuzescherm heeft gebruikt en vervolgens het Geavanceerde keuzescherm kiest, zijn de waardes vanuit het eenvoudige keuzescherm al ingevuld. + +@@ -3939,7 +3939,7 @@ + + + Video uploaden +- Wilt u een video direct naar YouTube of Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. ++ Wilt u een video direct naar Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. + + + +@@ -3970,7 +3970,7 @@ + Videobestand + + +- Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor YouTube of Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor YouTube of Vimeo. ++ Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor Vimeo. + + + +diff -Nur openshot-1.4.3.orig/docs/gnome/pl/openshot.xml openshot-1.4.3/docs/gnome/pl/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/pl/openshot.xml 2012-10-01 04:53:48.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/pl/openshot.xml 2014-04-20 02:18:53.378247130 -0300 +@@ -128,7 +128,7 @@ + + + Krok 5 - Eksport i zapisanie Twojego filmu +- Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na YouTube, Vimeo i innych. ++ Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na Vimeo i innych. + Kliknij w przycisk Eksport Wideo u góry ekranu (lub użyj menu Plik > Eksport Video...).  Wybierz jedną z wielu dostępnych opcji eksportu i kliknij przycisk Eksport Wideo. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Wysyła bieżący projekt jako plik wideo na YouTube lub Vimeo ++ Wysyła bieżący projekt jako plik wideo na Vimeo + + + +@@ -3969,7 +3969,7 @@ + + + Wyślij do Internetu +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3979,7 +3979,7 @@ + + + Wyślij wideo +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4003,17 +4003,6 @@ + + + +- +- 1 +- +- +- Plik wideo +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/pt/openshot.xml openshot-1.4.3/docs/gnome/pt/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/pt/openshot.xml 2012-10-01 04:53:50.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/pt/openshot.xml 2014-04-20 02:19:30.651861715 -0300 +@@ -128,7 +128,7 @@ + + + Passo 5 – Exportar o seu Vídeo +- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). ++ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). + Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. + + +@@ -924,7 +924,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3981,7 +3981,7 @@ + + + Enviar para a web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3991,7 +3991,7 @@ + + + Enviar vídeo +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4015,17 +4015,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml openshot-1.4.3/docs/gnome/pt_BR/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml 2012-10-01 04:53:52.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/pt_BR/openshot.xml 2014-04-20 02:20:05.515458224 -0300 +@@ -128,7 +128,7 @@ + + + 5º Passo - Exportar o seu Vídeo +- Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Youtube, Vimeo, etc...) ++ Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Vimeo, etc...) + Clique sobre o ícone Exportar Vídeo na parte superior da tela (ou utilize o menu Arquivo > Exportar vídeo...). Excolha uma das diversas opções de exportação pré-configuradas, e clique no botão Exportar Vídeo. + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Envia o projeto atual como um arquivo de vídeo para o YouTube ou Vimeo ++ Envia o projeto atual como um arquivo de vídeo para o Vimeo + + + +@@ -3936,7 +3936,7 @@ + + + Publicar na Web +- Esolha a opção Upload to Web no topo da tela para escolher entre Youtube e Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado ++ Esolha a opção Upload to Web no topo da tela para escolher Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado + As opções avançadas somente devem ser utilizadas por pessoas familiarizadas com o FFmpeg, já que é muito fácil criar combinações inválidas de codecs, formatos e taxas de bits. No entanto, se você conhecer essas configurações, qualquer formato/codec/bit-rate suportado pode ser utilizado, o que fornece dezenas de formatos adicionais que podem ser utilizador para exportar. Você pode também exportar o seu vídeo como uma sequência de imagens, que pode ser útil se você pretende importar seu vídeo em um programa que requer sequências de imagens, como o blender. + E também, se você primeiro selecionar valores no Modo simples, e então trocar para o Modo avançado, ele pré-selecionará todas as configurações do modo simples. + +@@ -3946,7 +3946,7 @@ + + + Enviar Vídeo +- Se você quiser fazer o upload do vídeo diretamente no Youtube ou Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. ++ Se você quiser fazer o upload do vídeo diretamente no Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. + + + +@@ -3970,17 +3970,6 @@ + + + +- +- 1 +- +- +- Arquivo de vídeo +- +- +- Escolha um arquivo de vídeo para upload para o youtube.  Tenha certeza de que é um formato compatível com o Youtube, ou pode não funcionar corretamente.  Se você primeiro usar a tela Export Video , você pode escolher Upload to Web, o qual escolherá automaticamente um formato compatível e preencherá essa caixa para você. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/sk/openshot.xml openshot-1.4.3/docs/gnome/sk/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/sk/openshot.xml 2012-10-01 04:53:54.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/sk/openshot.xml 2014-04-20 02:20:54.589162174 -0300 +@@ -128,7 +128,7 @@ + + + Step 5 – Exportovanie vášho videa +- Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. YouTube, Vime, atď ..) ++ Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. Vime, atď ..) + Kliknite na Export videa na ikonu v hornej časti obrazovky (alebo použite Súbor > Export Video ...).   Vyberte si z jednej z mnohých prednastavených možností exportu, a kliknite na tlačidlo Export videa . + + +@@ -924,7 +924,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3982,7 +3982,7 @@ + + + Nahrať na web +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode + The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. + Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. + +@@ -3992,7 +3992,7 @@ + + + Nahrať video +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4016,17 +4016,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml openshot-1.4.3/docs/gnome/zh_TW/openshot.xml +--- openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml 2012-10-01 04:53:56.000000000 -0300 ++++ openshot-1.4.3/docs/gnome/zh_TW/openshot.xml 2014-04-20 02:21:34.279462075 -0300 +@@ -128,7 +128,7 @@ + + + 步驟 5 - 匯出您的影音 +- 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 YouTube、Vimeo... 等) l的影片檔。 ++ 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 Vimeo... 等) l的影片檔。 + 點畫面最頂端的 匯出視訊 圖示 (或使用「檔案」>「匯出視訊...」選單)，從許多預先設定中選擇一個適合的，點「匯出視訊按鈕」。 + + +@@ -923,7 +923,7 @@ + CTRL + U + + +- Upload current project as a video file to YouTube or Vimeo ++ Upload current project as a video file to Vimeo + + + +@@ -3970,7 +3970,7 @@ + + + 上傳到網路 +- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 ++ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 + 進階選項應該只限由熟悉 FFmpeg 的人來使用，因為很容易弄出不正確的編解碼器、格式與位元率設定組合。 然而，如果您熟悉這些設定，則可以利用 FFmpeg 支援的格式/編解碼器/位元率來組合出更多用在匯出程序的格式。 您也可以將視訊匯出為連續影像，在類似 Blender 這類需要連續影像的程式時會很有用。 + 如果您先選取 簡單模式 的數值後再切換到 進階模式，則會預先選取簡單模式的所有設定。 + +@@ -3980,7 +3980,7 @@ + + + 上傳影片 +- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. ++ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. + + + +@@ -4004,17 +4004,6 @@ + + + +- +- 1 +- +- +- Video File +- +- +- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. +- +- +- + + 2 + +diff -Nur openshot-1.4.3.orig/openshot/classes/info.py openshot-1.4.3/openshot/classes/info.py +--- openshot-1.4.3.orig/openshot/classes/info.py 2012-10-01 04:55:03.000000000 -0300 ++++ openshot-1.4.3/openshot/classes/info.py 2014-04-20 01:54:35.430638280 -0300 +@@ -52,7 +52,7 @@ + 'url' : 'http://www.openshotvideo.com/', + 'license' : 'GNU GPL v.' + GPL_VERSION, + 'description' : 'Create and edit videos and movies', +- 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (YouTube and Vimeo supported)", ++ 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (Vimeo supported)", + + + # see http://pypi.python.org/pypi?%3Aaction=list_classifiers +diff -Nur openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot +--- openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot 2012-09-30 17:33:29.000000000 -0300 ++++ openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot 2014-04-20 01:56:55.698378410 -0300 +@@ -1058,11 +1058,6 @@ + msgid "Export to Folder" + msgstr "" + +-#: /home/jonathan/openshot/openshot/windows/ExportVideo.py:114 +-#: /home/jonathan/openshot/openshot/export_presets/youtube.xml +-msgid "YouTube" +-msgstr "" +- + #: /home/jonathan/openshot/openshot/windows/ExportVideo.py:306 + #: /home/jonathan/openshot/openshot/export_presets/format_avi_mpeg2.xml + msgid "All Formats" +@@ -1498,17 +1493,6 @@ + msgid "Opened project" + msgstr "" + +-#: /home/jonathan/openshot/openshot/uploads/manager.py:66 +-#: /home/jonathan/openshot/openshot/uploads/manager.py:293 +-#: /home/jonathan/openshot/openshot/export_presets/youtube.xml +-msgid "Web" +-msgstr "" +- +-#: /home/jonathan/openshot/openshot/uploads/manager.py:66 +-#: /home/jonathan/openshot/openshot/export_presets/youtube_HD.xml +-msgid "YouTube-HD" +-msgstr "" +- + #: /home/jonathan/openshot/openshot/uploads/manager.py:91 + #: /home/jonathan/openshot/openshot/uploads/manager.py:315 + msgid "Please choose a valid video file." +@@ -1532,12 +1516,6 @@ + msgid "Please enter a valid password." + msgstr "" + +-#: /home/jonathan/openshot/openshot/uploads/manager.py:186 +-msgid "" +-"There was an error uploading this video to YouTube. Please check your " +-"username, password, and be sure a valid video file is selected and try again." +-msgstr "" +- + #: /home/jonathan/openshot/openshot/uploads/manager.py:261 + msgid "Vimeo authentication has expired." + msgstr "" +diff -Nur openshot-1.4.3.orig/openshot/uploads/manager.py openshot-1.4.3/openshot/uploads/manager.py +--- openshot-1.4.3.orig/openshot/uploads/manager.py 2011-02-22 04:20:53.000000000 -0200 ++++ openshot-1.4.3/openshot/uploads/manager.py 2014-04-20 01:50:59.295653314 -0300 +@@ -21,201 +21,11 @@ + + def get_services(self): + services = {} +- services["YouTube"] = YouTubeService(self.project, self.settings) + if sys.version_info[0] == 2 and sys.version_info[1] == 6 and vimeo_imported == True: + # vimeo only works on Python 2.6 right now + services["Vimeo"] = VimeoService(self.project, self.settings) + return services + +-class YouTubeService(): +- def __init__(self, project, settings): +- self.project = project +- self.filename = None +- self.settings = settings +- self.form = None +- +- # Add language support +- _ = Language_Init.Translator(project).lang.gettext +- self._ = _ +- +- def initialize(self, form): +- """ Prepare the upload form for this service """ +- self.form = form +- +- form.login_divider.set_property("visible", True) +- form.lblUsername.set_property("visible", True) +- form.txtUsername.set_property("visible", True) +- form.lblPassword.set_property("visible", True) +- form.txtPassword.set_property("visible", True) +- form.btnAuthorize.set_property("visible", False) +- form.lblVerification.set_property("visible", False) +- form.txtVerification.set_property("visible", False) +- form.lnkForgot.set_label("http://www.youtube.com") +- form.lnkForgot.set_uri("http://www.youtube.com") +- +- # get saved username (if any) +- if self.settings.app_state["upload_username"]: +- form.txtUsername.set_text(self.settings.app_state["upload_username"]) +- +- def get_export_presets(self): +- """ Get a tuple of related export presets for this service (if any) """ +- +- # get reference to gettext +- _ = self._ +- +- return (_("Web"), _("YouTube-HD")) +- +- def get_authorization_url(self): +- return None +- +- def get_logo(self): +- logo_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "logos", "youtube.png") +- return gtk.gdk.pixbuf_new_from_file(logo_path) +- +- def validate(self, form): +- """ Validate the upload form... check for missing values. """ +- +- # get reference to gettext +- _ = self._ +- +- # get settings +- title = form.txtTitle.get_text() +- start, end = form.txtDescription.get_buffer().get_bounds() +- description = form.txtDescription.get_buffer().get_text(start, end) +- username = form.txtUsername.get_text() +- password = form.txtPassword.get_text() +- +- # Validate the the form is valid +- if not os.path.isfile(str(self.filename)): +- # Show error message +- messagebox.show(_("Validation Error!"), _("Please choose a valid video file.")) +- return False +- +- if not title: +- # Show error message +- messagebox.show(_("Validation Error!"), _("Please enter a valid title.")) +- return False +- +- if not description: +- # Show error message +- messagebox.show(_("Validation Error!"), _("Please enter a valid description.")) +- return False +- +- if not username: +- # Show error message +- messagebox.show(_("Validation Error!"), _("Please enter a valid username.")) +- return False +- else: +- # save username +- self.settings.app_state["upload_username"] = username +- +- if not password: +- # Show error message +- messagebox.show(_("Validation Error!"), _("Please enter a valid password.")) +- return False +- +- # form is valid +- return True +- +- def set_file(self, filename): +- self.filename = filename +- +- def start_upload(self, form): +- +- # get reference to gettext +- _ = self._ +- +- # Get the absolute path of this project +- import os, sys +- google_api_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "youtube") +- if google_api_path not in sys.path: +- sys.path.append(google_api_path) +- +- # get settings +- username = form.txtUsername.get_text() +- password = form.txtPassword.get_text() +- title = form.txtTitle.get_text() +- start, end = form.txtDescription.get_buffer().get_bounds() +- description = form.txtDescription.get_buffer().get_text(start, end) +- +- # remember username (but not password) +- self.settings.app_state["upload_username"] = username +- +- import getopt +- import mimetypes +- import atom.data +- import gdata.youtube +- import gdata.youtube.service +- import gdata.client +- import gdata.data +- import gdata.gauth +- import gdata.youtube.client +- import gdata.youtube.data +- import gdata.sample_util +- import helper +- +- # prepare a media group object to hold our video's meta-data +- my_media_group = gdata.media.Group( +- title=gdata.media.Title(text=title), +- description=gdata.media.Description(description_type='plain', +- text=description), +- keywords=gdata.media.Keywords(text=''), +- category=[gdata.media.Category( +- text='People', +- scheme='http://gdata.youtube.com/schemas/2007/categories.cat', +- label='People')], +- player=None +- ) +- +- # create the gdata.youtube.YouTubeVideoEntry to be uploaded +- video_entry = gdata.youtube.YouTubeVideoEntry(media=my_media_group) +- +- # create +- try: +- # disable upload button +- form.btnUpload.set_sensitive(False) +- +- # start upload +- uploader = helper.ResumableUploadDemo(self.filename, chunk_size=1024*64, convert="false", ssl=False, debug=False, host="uploads.gdata.youtube.com", username=username, password=password) +- +- # upload chunks +- entry = uploader.UploadInManualChunks(video_entry, os.path.split(self.filename)[-1], self.on_chunk_complete) +- +- except: +- # Show error message +- messagebox.show(_("Validation Error!"), _("There was an error uploading this video to YouTube. Please check your username, password, and be sure a valid video file is selected and try again.")) +- +- # enable upload button +- form.btnUpload.set_sensitive(True) +- return False +- +- +- # enable upload button +- form.btnUpload.set_sensitive(True) +- +- # successful +- return True +- +- def on_chunk_complete(self, *args): +- #print "on_chunk_complete" +- +- total_size = args[0] +- current_bytes = args[1] +- +- if current_bytes >= total_size: +- # don't exceed the total bytes +- current_bytes = total_size +- +- # calculate percentage +- percent = float(current_bytes) / float(total_size) +- gobject.idle_add(self.form.update_progressbar, percent) +- +- # allow other gtk operations to happen +- while gtk.events_pending(): +- gtk.main_iteration() +- +- +- + class VimeoService(): + def __init__(self, project, settings): + self.project = project +diff -Nur openshot-1.4.3.orig/openshot/windows/ExportVideo.py openshot-1.4.3/openshot/windows/ExportVideo.py +--- openshot-1.4.3.orig/openshot/windows/ExportVideo.py 2012-09-30 17:33:29.000000000 -0300 ++++ openshot-1.4.3/openshot/windows/ExportVideo.py 2014-04-20 01:51:37.659279587 -0300 +@@ -111,7 +111,6 @@ + for option in upload_types: + # append profile to list + self.cboUploadServices.append_text(option) +- self.set_dropdown_values(_("YouTube"), self.cboUploadServices) + + + #populate the format/codec drop downs +diff -Nur openshot-1.4.3.orig/openshot/windows/preferences.py openshot-1.4.3/openshot/windows/preferences.py +--- openshot-1.4.3.orig/openshot/windows/preferences.py 2012-09-30 17:33:29.000000000 -0300 ++++ openshot-1.4.3/openshot/windows/preferences.py 2014-04-20 01:52:19.739601020 -0300 +@@ -382,7 +382,6 @@ + "clip_property_window_height" : "345", + "clip_property_window_maximized" : "False", + "clip_property_hpane_position" : "260", +- "upload_service" : "YouTube", + "upload_username" : "", + "vimeo_token" : "", + "vimeo_token_secret" : "", +diff -Nur openshot-1.4.3.orig/setup.py openshot-1.4.3/setup.py +--- openshot-1.4.3.orig/setup.py 2012-09-30 17:33:29.000000000 -0300 ++++ openshot-1.4.3/setup.py 2014-04-20 01:28:48.698575950 -0300 +@@ -57,7 +57,7 @@ + # ------------------------------------- + dist = setup( + scripts = ['bin/openshot','bin/openshot-render'], +- packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients', 'openshot.uploads.youtube', 'openshot.uploads.youtube.atom', 'openshot.uploads.youtube.gdata', 'openshot.uploads.youtube.gdata.geo', 'openshot.uploads.youtube.gdata.media', 'openshot.uploads.youtube.gdata.oauth', 'openshot.uploads.youtube.gdata.opensearch', 'openshot.uploads.youtube.gdata.tlslite', 'openshot.uploads.youtube.gdata.tlslite.integration', 'openshot.uploads.youtube.gdata.tlslite.utils', 'openshot.uploads.youtube.gdata.youtube'], ++ packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients'], + package_data = { + 'openshot' : ['export_presets/*', 'images/*', 'locale/OpenShot/*', 'locale/README', 'profiles/*', 'themes/*/*.png', 'themes/*/*.xml', 'themes/*/icons/*.png', 'titles/*/*.svg', 'transitions/icons/medium/*.png', 'transitions/icons/small/*.png', 'transitions/*.pgm', 'transitions/*.png', 'transitions/*.svg', 'effects/icons/medium/*.png', 'effects/icons/small/*.png', 'effects/*.xml', 'blender/blend/*.blend', 'blender/icons/*.png', 'blender/earth/*.jpg', 'blender/scripts/*.py', 'blender/*.xml'] + locale_files, + 'openshot.windows' : ['ui/*.ui', 'ui/icons/*'], diff --git a/nonprism/openshot/openshot.install b/nonprism/openshot/openshot.install new file mode 100644 index 000000000..046df0051 --- /dev/null +++ b/nonprism/openshot/openshot.install @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD deleted file mode 100644 index d6ae8811d..000000000 --- a/nonprism/pidgin-nonprism/PKGBUILD +++ /dev/null @@ -1,137 +0,0 @@ -# $Id: PKGBUILD 213831 2014-05-29 19:02:38Z foutrelis $ -# Maintainer (Arch): Evangelos Foutras -# Contributor (Arch): Ionut Biru -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Alexander Fehr -# Contributor (Arch): Lucien Immink - -_pkgname=pidgin -pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism') -pkgver=2.10.9 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' - 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(https://downloads.sourceforge.net/project/$_pkgname/Pidgin/$pkgver/$_pkgname-$pkgver.tar.bz2{,.asc} - nonprism.patch) -sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319' - 'SKIP' - 'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2') - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - - msg 'remove Google Talk and Facebook protocols' - patch -Np1 -i "$srcdir/nonprism.patch" - msg 'remove wrong OS term' - sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h - sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} -} - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-python=/usr/bin/python2 \ - --with-system-ssl-certs=/etc/ssl/certs \ - --with-dynamic-prpls=bonjour,irc,jabber,silc,simple,zephyr - make -} - -package_pidgin-nonprism(){ - pkgdesc="Multi-protocol instant messaging client, without support for unsafe and dangerous for privacy protocols" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction') - provides=("$_pkgname=$pkgver") - conflicts=$_pkgname - replaces=$_pkgname - install=pidgin.install - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop - - rm "$pkgdir/usr/share/man/man1/finch.1" - - msg "Removing PRISM images" - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emblems/{16/aol-client.png,scalable/aol-client.svg} - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emotes/default/msn{,-away,-busy,_online}.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22}/google-talk.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22,48}/{aim,facebook,gadu-gadu,icq,meanwhile,msn,mxit,myspace,novell,yahoo}.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/scalable/{aim,gadu-gadu,google-talk,icq,meanwhile,msn,mxit,novell,yahoo}.svg - - msg "patch pidgin desktop" - sed -i "\|Comment\[|d - s|Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more|Supports Jabber/XMPP and more| - " "$pkgdir"/usr/share/applications/pidgin.desktop -} - -package_libpurple-nonprism(){ - pkgdesc="IM library extracted from Pidgin, without support for unsafe and dangerous for privacy protocols" - depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'python2-dbus: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - provides=("${pkgname%-nonprism}=$pkgver") - conflicts=${pkgname%-nonprism} - replaces=${pkgname%-nonprism} - - cd "$srcdir/pidgin-$pkgver" - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done - - # Remove GConf schema file - rm "$pkgdir/etc/gconf/schemas/purple.schemas" - rmdir "$pkgdir"/etc{/gconf{/schemas,},} -} - -package_finch-nonprism(){ - pkgdesc="A ncurses-based messaging client, without support for unsafe and dangerous for privacy protocols" - depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2') - provides=("${pkgname%-nonprism}=$pkgver") - conflicts=${pkgname%-nonprism} - replaces=${pkgname%-nonprism} - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch deleted file mode 100644 index 88140268e..000000000 --- a/nonprism/pidgin-nonprism/nonprism.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c ---- a/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200 -+++ b/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300 -@@ -677,7 +677,6 @@ - GdkPixbuf *pixbuf = NULL; - GtkSizeGroup *sg; - GList *p; -- const char *gtalk_name = NULL, *facebook_name = NULL; - int i; - - aop_menu = g_malloc0(sizeof(AopMenu)); -@@ -686,55 +685,12 @@ - gtk_widget_show(aop_menu->menu); - sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - -- if (purple_find_prpl("prpl-jabber")) { -- gtalk_name = _("Google Talk"); -- facebook_name = _("Facebook (XMPP)"); -- } -- - for (p = purple_plugins_get_protocols(), i = 0; - p != NULL; - p = p->next, i++) { - - plugin = (PurplePlugin *)p->data; - -- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { -- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", -- "16", "google-talk.png", NULL); -- GtkWidget *item; -- -- pixbuf = pidgin_pixbuf_new_from_file(filename); -- g_free(filename); -- -- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), -- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol")); -- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1)); -- -- if (pixbuf) -- g_object_unref(pixbuf); -- -- gtalk_name = NULL; -- i++; -- } -- -- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { -- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", -- "16", "facebook.png", NULL); -- GtkWidget *item; -- -- pixbuf = pidgin_pixbuf_new_from_file(filename); -- g_free(filename); -- -- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), -- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); -- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); -- -- if (pixbuf) -- g_object_unref(pixbuf); -- -- facebook_name = NULL; -- i++; -- } -- - pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); - - gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin-nonprism/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/nonprism/pidgin-nonprism/pidgin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD new file mode 100644 index 000000000..634906c63 --- /dev/null +++ b/nonprism/pidgin/PKGBUILD @@ -0,0 +1,134 @@ +# $Id: PKGBUILD 213831 2014-05-29 19:02:38Z foutrelis $ +# Maintainer (Arch): Evangelos Foutras +# Contributor (Arch): Ionut Biru +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): Lucien Immink + +pkgname=pidgin +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.10.9 +pkgrel=2.nonprism1 +arch=('i686' 'x86_64' 'mips64el') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' + 'tk' 'ca-certificates' 'intltool' 'networkmanager') +source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc} + nonprism.patch) +sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319' + 'SKIP' + 'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + msg 'remove Google Talk and Facebook protocols' + patch -Np1 -i "$srcdir/nonprism.patch" + msg 'remove wrong OS term' + sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h + sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h + + # Use Python 2 + sed -i 's/env python$/&2/' */plugins/*.py \ + libpurple/purple-{remote,notifications-example,url-handler} +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-python=/usr/bin/python2 \ + --with-system-ssl-certs=/etc/ssl/certs \ + --with-dynamic-prpls=bonjour,irc,jabber,silc,simple,zephyr + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client, without support for unsafe and dangerous for privacy protocols" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') + conflicts=(${pkgname}-nonprism) + replaces=(${pkgname}-nonprism) + install=pidgin.install + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop + + rm "$pkgdir/usr/share/man/man1/finch.1" + + msg "Removing PRISM images" + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emblems/{16/aol-client.png,scalable/aol-client.svg} + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emotes/default/msn{,-away,-busy,_online}.png + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22}/google-talk.png + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22,48}/{aim,facebook,gadu-gadu,icq,meanwhile,msn,mxit,myspace,novell,yahoo}.png + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/scalable/{aim,gadu-gadu,google-talk,icq,meanwhile,msn,mxit,novell,yahoo}.svg + + msg "patch pidgin desktop" + sed -i "\|Comment\[|d + s|Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more|Supports Jabber/XMPP and more| + " "$pkgdir"/usr/share/applications/pidgin.desktop +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin, without support for unsafe and dangerous for privacy protocols" + depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'python2-dbus: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + conflicts=(${pkgname}-nonprism) + replaces=(${pkgname}-nonprism) + + cd "$srcdir/pidgin-$pkgver" + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done + + # Remove GConf schema file + rm "$pkgdir/etc/gconf/schemas/purple.schemas" + rmdir "$pkgdir"/etc{/gconf{/schemas,},} +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client, without support for unsafe and dangerous for privacy protocols" + depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2') + conflicts=(${pkgname}-nonprism) + replaces=(${pkgname}-nonprism) + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: diff --git a/nonprism/pidgin/nonprism.patch b/nonprism/pidgin/nonprism.patch new file mode 100644 index 000000000..88140268e --- /dev/null +++ b/nonprism/pidgin/nonprism.patch @@ -0,0 +1,67 @@ +diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c +--- a/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200 ++++ b/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300 +@@ -677,7 +677,6 @@ + GdkPixbuf *pixbuf = NULL; + GtkSizeGroup *sg; + GList *p; +- const char *gtalk_name = NULL, *facebook_name = NULL; + int i; + + aop_menu = g_malloc0(sizeof(AopMenu)); +@@ -686,55 +685,12 @@ + gtk_widget_show(aop_menu->menu); + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + +- if (purple_find_prpl("prpl-jabber")) { +- gtalk_name = _("Google Talk"); +- facebook_name = _("Facebook (XMPP)"); +- } +- + for (p = purple_plugins_get_protocols(), i = 0; + p != NULL; + p = p->next, i++) { + + plugin = (PurplePlugin *)p->data; + +- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "google-talk.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- gtalk_name = NULL; +- i++; +- } +- +- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "facebook.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- facebook_name = NULL; +- i++; +- } +- + pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); + + gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), diff --git a/nonprism/pidgin/pidgin.install b/nonprism/pidgin/pidgin.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/nonprism/pidgin/pidgin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/shotwell-nonprism/PKGBUILD b/nonprism/shotwell-nonprism/PKGBUILD deleted file mode 100644 index 0f7b84603..000000000 --- a/nonprism/shotwell-nonprism/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 114629 2014-07-02 10:24:53Z spupykin $ -# Maintainer (Arch): Sergej Pupykin -# Maintainer (Arch): Ionut Biru -# Contributor (Arch): Joeny Ang -# Maintainer: André Silva -# Contributor: Márcio Silva - -_pkgname=shotwell -pkgname=shotwell-nonprism -pkgver=0.18.1 -pkgrel=1 -pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64' 'mips64el') -url="http://yorba.org/shotwell/" -license=('LGPL2.1') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' - 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' - 'gst-plugins-base' 'libgphoto2') -makedepends=('intltool' 'vala>=0.17.2' 'libunique3' 'gnome-doc-utils') -install=shotwell.install -source=("https://download.gnome.org/sources/shotwell/0.18/shotwell-$pkgver.tar.xz" - 'nonprism.patch') -md5sums=('361eeef67f5aaed36ec44b12cfd675b3' - 'b6c67e76af91be99852310e9c2be5ffa') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/nonprism.patch - - cd po - for file in *.po; do - intltool-update ${file%.*} - msgattrib --no-obsolete -o $file $file - done -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure --prefix=/usr --libexec=/usr/lib/shotwell \ - --disable-schemas-compile \ - --disable-desktop-update \ - --disable-icon-update \ - --disable-extra-plugins-install - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/shotwell-nonprism/nonprism.patch b/nonprism/shotwell-nonprism/nonprism.patch deleted file mode 100644 index 8a83cbe3a..000000000 --- a/nonprism/shotwell-nonprism/nonprism.patch +++ /dev/null @@ -1,439 +0,0 @@ -diff -Nur shotwell-0.18.0.orig/Makefile shotwell-0.18.0/Makefile ---- shotwell-0.18.0.orig/Makefile 2014-03-18 18:50:19.000000000 -0300 -+++ shotwell-0.18.0/Makefile 2014-04-19 18:15:46.389178475 -0300 -@@ -316,7 +316,7 @@ - DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" - DESKTOP_APPLICATION_COMMENT="Organize your photos" - DESKTOP_APPLICATION_CLASS="Photo Manager" --DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" -+DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo;" - DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell" - DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer" - DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer" -diff -Nur shotwell-0.18.0.orig/help/Makefile.am shotwell-0.18.0/help/Makefile.am ---- shotwell-0.18.0.orig/help/Makefile.am 2014-03-18 15:50:59.000000000 -0300 -+++ shotwell-0.18.0/help/Makefile.am 2014-04-19 18:15:46.389178475 -0300 -@@ -45,7 +45,6 @@ - share-print.page \ - share-send.page \ - share-slideshow.page \ -- share-upload.page \ - view-displaying.page \ - view-information.page \ - view-sidebar.page -diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml ---- shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml 2014-04-19 18:15:46.389178475 -0300 -@@ -321,106 +321,6 @@ - A numeric code representing the last service to which photos were published - - -- -- -- -- -- -- -- -- -- "" -- access token -- Facebook OAuth token for the currently logged in session, if any -- -- -- -- "" -- user i.d. -- Facebook user i.d. for the currently logged in user, if any -- -- -- -- "" -- user name -- The name of the currently logged in Facebook user, if any -- -- -- -- 0 -- default size code -- A numeric code representing the default size for photos published to Facebook -- -- -- -- false -- remove sensitive info from uploads -- Whether images being uploaded to Facebook should have their metadata removed first -- -- -- -- -- -- "" -- OAuth Access Phase Token -- The authorization token for the currently logged in Flickr user, if any -- -- -- -- "" -- OAuth Access Phase Token Secret -- The cryptographic secret used to sign requests against the authorization token for the currently logged in Flickr user, if any -- -- -- -- "" -- username -- The user name of the currently logged in Flickr user, if any -- -- -- -- 2 -- default size code -- A numeric code representing the default size for photos published to Flickr -- -- -- -- 1 -- default visibility -- A numeric code representing the default visibility for photos published to Flickr -- -- -- -- false -- remove sensitive info from uploads -- Whether images being uploaded to Flickr should have their metadata removed first -- -- -- -- -- -- "" -- refresh token -- The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any. -- -- -- -- 2 -- default size -- A numeric code representing the default size for photos uploaded to Picasa Web Albums -- -- -- -- "" -- last album -- The name of the last album the user published photos to, if any -- -- -- -- false -- remove sensitive info from uploads -- Whether images being uploaded to Picasa should have their metadata removed first -- - - - -@@ -485,14 +385,6 @@ - - - -- -- -- "" -- refresh token -- The OAuth token used to refresh the YouTube session for the currently logged in user, if any. -- -- -- - - - "" -@@ -576,48 +468,12 @@ - - - -- -- true -- enable facebook publishing plugin -- True if the Facebook publishing plugin is enabled, false otherwise -- -- -- -- true -- enable flickr publishing plugin -- True if the Flickr publishing plugin is enabled, false otherwise -- -- -- -- true -- enable picasa publishing plugin -- True if the Picasa Web Albums publishing plugin is enabled, false otherwise -- -- -- -- true -- enable youtube publishing plugin -- True if the YouTube publishing plugin is enabled, false otherwise -- -- - - true - enable piwigo publishing plugin - True if the Piwigo publishing plugin is enabled, false otherwise - - -- -- false -- enable yandex publishing plugin -- True if the Yandex.Fotki publishing plugin is enabled, false otherwise -- -- -- -- false -- enable tumblr publishing plugin -- True if the Tumblr publishing plugin is enabled, false otherwise -- -- - - true - enable F-Spot import plugin -diff -Nur shotwell-0.18.0.orig/misc/shotwell.appdata.xml shotwell-0.18.0/misc/shotwell.appdata.xml ---- shotwell-0.18.0.orig/misc/shotwell.appdata.xml 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/shotwell.appdata.xml 2014-04-19 18:15:46.392511834 -0300 -@@ -13,10 +13,6 @@ - your master photos, making it easy to experiment and correct errors. -

-

-- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, -- Picasa (Google Plus), and more. --

--

- Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats. -

- -diff -Nur shotwell-0.18.0.orig/misc/shotwell.convert shotwell-0.18.0/misc/shotwell.convert ---- shotwell-0.18.0.orig/misc/shotwell.convert 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/shotwell.convert 2014-04-19 18:15:46.392511834 -0300 -@@ -65,29 +65,11 @@ - last-used-service = /apps/shotwell/sharing/last_used_service - - [org.yorba.shotwell.plugins.enable-state] --publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled --publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled --publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled - publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled --publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled --publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled - transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled - transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled - transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled - --[org.yorba.shotwell.sharing.facebook] --uid = /apps/shotwell/sharing/facebook/uid --user-name = /apps/shotwell/sharing/facebook/user_name --default-size = /apps/shotwell/sharing/facebook/default_size -- --[org.yorba.shotwell.sharing.flickr] --default-size = /apps/shotwell/sharing/flickr/default_size --visibility = /apps/shotwell/sharing/flickr/visibility -- --[org.yorba.shotwell.sharing.picasa] --default-size = /apps/shotwell/sharing/picasa/default_size --last-album = /apps/shotwell/sharing/picasa/last_album -- - [org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] - url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url - username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username -@@ -95,11 +77,3 @@ - remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password - last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category - last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level -- --[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] --auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token -- --[org.yorba.shotwell.sharing.youtube] --user-name = /apps/shotwell/sharing/youtube/user_name --auth-token = /apps/shotwell/sharing/youtube/auth_token -- -diff -Nur shotwell-0.18.0.orig/misc/shotwell.desktop.head shotwell-0.18.0/misc/shotwell.desktop.head ---- shotwell-0.18.0.orig/misc/shotwell.desktop.head 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/shotwell.desktop.head 2014-04-19 18:15:46.392511834 -0300 -@@ -3,7 +3,7 @@ - Name=Shotwell - GenericName=Photo Manager - Comment=Organize your photos --Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; -+Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo; - Exec=shotwell %U - Icon=shotwell - Terminal=false -diff -Nur shotwell-0.18.0.orig/plugins/common/RESTSupport.vala shotwell-0.18.0/plugins/common/RESTSupport.vala ---- shotwell-0.18.0.orig/plugins/common/RESTSupport.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/common/RESTSupport.vala 2014-04-19 18:44:24.962777076 -0300 -@@ -628,10 +628,6 @@ - return session; - } - -- protected Spit.Publishing.Publishable get_current_publishable() { -- return publishables[current_file]; -- } -- - protected abstract Transaction create_transaction(Spit.Publishing.Publishable publishable); - - public void upload(Spit.Publishing.ProgressCallback? status_updated = null) { -diff -Nur shotwell-0.18.0.orig/plugins/plugins.mk shotwell-0.18.0/plugins/plugins.mk ---- shotwell-0.18.0.orig/plugins/plugins.mk 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/plugins.mk 2014-04-19 18:52:04.852983921 -0300 -@@ -5,29 +5,13 @@ - shotwell-data-imports - - PLUGINS_RC := \ -- plugins/shotwell-publishing/facebook.png \ -- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \ -- plugins/shotwell-publishing/flickr.png \ -- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \ -- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \ -- plugins/shotwell-publishing/picasa.png \ -- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \ -- plugins/shotwell-publishing/youtube.png \ -- plugins/shotwell-publishing/youtube_publishing_options_pane.glade \ - plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/piwigo_authentication_pane.glade \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \ - plugins/shotwell-transitions/slideshow-plugin.png - --EXTRA_PLUGINS := \ -- shotwell-publishing-extras -- - EXTRA_PLUGINS_RC := \ -- plugins/shotwell-publishing-extras/yandex_publish_model.glade \ -- plugins/shotwell-data-imports/f-spot-24.png \ -- plugins/shotwell-publishing-extras/tumblr.png \ -- plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \ -- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade -+ plugins/shotwell-data-imports/f-spot-24.png - - ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS) - -diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile shotwell-0.18.0/plugins/shotwell-publishing/Makefile ---- shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/shotwell-publishing/Makefile 2014-04-19 18:45:15.729833873 -0300 -@@ -13,27 +13,14 @@ - - SRC_FILES := \ - shotwell-publishing.vala \ -- FacebookPublishing.vala \ -- PicasaPublishing.vala \ -- FlickrPublishing.vala \ -- YouTubePublishing.vala \ - PiwigoPublishing.vala \ - ../../src/util/string.vala \ - ../common/RESTSupport.vala - - RC_FILES := \ -- facebook.png \ -- facebook_publishing_options_pane.glade \ -- flickr.png \ -- flickr_publishing_options_pane.glade \ -- flickr_pin_entry_pane.glade \ -- picasa.png \ -- picasa_publishing_options_pane.glade \ - piwigo.png \ - piwigo_authentication_pane.glade \ -- piwigo_publishing_options_pane.glade \ -- youtube.png \ -- youtube_publishing_options_pane.glade -+ piwigo_publishing_options_pane.glade - - include ../Makefile.plugin.mk - -diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala ---- shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala 2014-04-19 18:15:46.392511834 -0300 -@@ -6,7 +6,7 @@ - - extern const string _VERSION; - --// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube -+// "core services" is: Piwigo - private class ShotwellPublishingCoreServices : Object, Spit.Module { - private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; - -@@ -15,10 +15,6 @@ - public ShotwellPublishingCoreServices(GLib.File module_file) { - GLib.File resource_directory = module_file.get_parent(); - -- pluggables += new FacebookService(resource_directory); -- pluggables += new PicasaService(resource_directory); -- pluggables += new FlickrService(resource_directory); -- pluggables += new YouTubeService(resource_directory); - pluggables += new PiwigoService(resource_directory); - } - -diff -Nur shotwell-0.18.0.orig/po/POTFILES.in shotwell-0.18.0/po/POTFILES.in ---- shotwell-0.18.0.orig/po/POTFILES.in 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/po/POTFILES.in 2014-04-19 19:01:24.750459462 -0300 -@@ -18,22 +18,9 @@ - plugins/shotwell-publishing-extras/TumblrPublishing.vala - plugins/shotwell-publishing-extras/YandexPublishing.vala - plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala --[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade --[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade --plugins/shotwell-publishing/FacebookPublishing.vala --plugins/shotwell-publishing/FlickrPublishing.vala --plugins/shotwell-publishing/PicasaPublishing.vala --plugins/shotwell-publishing/PiwigoPublishing.vala --plugins/shotwell-publishing/YouTubePublishing.vala --[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade - [type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade - [type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade - plugins/shotwell-publishing/shotwell-publishing.vala --[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade - plugins/shotwell-transitions/BlindsEffect.vala - plugins/shotwell-transitions/ChessEffect.vala - plugins/shotwell-transitions/CircleEffect.vala -diff -Nur shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala shotwell-0.18.0/src/plugins/PublishingInterfaces.vala ---- shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/src/plugins/PublishingInterfaces.vala 2014-04-19 18:15:46.395845194 -0300 -@@ -8,8 +8,7 @@ - * Shotwell Pluggable Publishing API - * - * The Shotwell Pluggable Publishing API allows you to write plugins that upload -- * photos and videos to web services. The Shotwell distribution includes publishing -- * support for four core services: Facebook, Flickr, Picasa Web Albums, and YouTube. -+ * photos and videos to web services. - * To enable Shotwell to connect to additional services, developers like you write - * publishing plugins, dynamically-loadable shared objects that are linked into the - * Shotwell process at runtime. Publishing plugins are just one of several kinds of -diff -Nur shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala shotwell-0.18.0/src/plugins/StandardHostInterface.vala ---- shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/src/plugins/StandardHostInterface.vala 2014-04-19 18:37:54.803118064 -0300 -@@ -22,24 +22,8 @@ - private static string parse_key(string id) { - // special case: legacy plugins (Web publishers moved into SPIT) have special names - // new plugins will use their full ID -- switch (id) { -- case "org.yorba.shotwell.publishing.facebook": -- return "facebook"; -- -- case "org.yorba.shotwell.publishing.picasa": -- return "picasa"; -- -- case "org.yorba.shotwell.publishing.flickr": -- return "flickr"; -- -- case "org.yorba.shotwell.publishing.youtube": -- return "youtube"; -- -- default: -- return id; -- } -+ return id; - } -- - public File get_module_file() { - return module_file; - } diff --git a/nonprism/shotwell-nonprism/shotwell.install b/nonprism/shotwell-nonprism/shotwell.install deleted file mode 100644 index bab8ecd29..000000000 --- a/nonprism/shotwell-nonprism/shotwell.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=shotwell - -post_install() { - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - update-desktop-database -q - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD new file mode 100644 index 000000000..598973b01 --- /dev/null +++ b/nonprism/shotwell/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 114629 2014-07-02 10:24:53Z spupykin $ +# Maintainer (Arch): Sergej Pupykin +# Maintainer (Arch): Ionut Biru +# Contributor (Arch): Joeny Ang +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgname=shotwell +pkgver=0.18.1 +pkgrel=1.nonprism1 +pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols" +arch=('i686' 'x86_64' 'mips64el') +url="http://yorba.org/shotwell/" +license=('LGPL2.1') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' + 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' + 'gst-plugins-base' 'libgphoto2') +makedepends=('intltool' 'vala>=0.17.2' 'libunique3' 'gnome-doc-utils') +install=shotwell.install +source=("https://download.gnome.org/sources/shotwell/0.18/shotwell-$pkgver.tar.xz" + 'nonprism.patch') +md5sums=('361eeef67f5aaed36ec44b12cfd675b3' + 'b6c67e76af91be99852310e9c2be5ffa') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/nonprism.patch + + cd po + for file in *.po; do + intltool-update ${file%.*} + msgattrib --no-obsolete -o $file $file + done +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexec=/usr/lib/shotwell \ + --disable-schemas-compile \ + --disable-desktop-update \ + --disable-icon-update \ + --disable-extra-plugins-install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch new file mode 100644 index 000000000..8a83cbe3a --- /dev/null +++ b/nonprism/shotwell/nonprism.patch @@ -0,0 +1,439 @@ +diff -Nur shotwell-0.18.0.orig/Makefile shotwell-0.18.0/Makefile +--- shotwell-0.18.0.orig/Makefile 2014-03-18 18:50:19.000000000 -0300 ++++ shotwell-0.18.0/Makefile 2014-04-19 18:15:46.389178475 -0300 +@@ -316,7 +316,7 @@ + DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" + DESKTOP_APPLICATION_COMMENT="Organize your photos" + DESKTOP_APPLICATION_CLASS="Photo Manager" +-DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" ++DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo;" + DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell" + DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer" + DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer" +diff -Nur shotwell-0.18.0.orig/help/Makefile.am shotwell-0.18.0/help/Makefile.am +--- shotwell-0.18.0.orig/help/Makefile.am 2014-03-18 15:50:59.000000000 -0300 ++++ shotwell-0.18.0/help/Makefile.am 2014-04-19 18:15:46.389178475 -0300 +@@ -45,7 +45,6 @@ + share-print.page \ + share-send.page \ + share-slideshow.page \ +- share-upload.page \ + view-displaying.page \ + view-information.page \ + view-sidebar.page +diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml +--- shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml 2014-04-19 18:15:46.389178475 -0300 +@@ -321,106 +321,6 @@ + A numeric code representing the last service to which photos were published + + +- +- +- +- +- +- +- +- +- "" +- access token +- Facebook OAuth token for the currently logged in session, if any +- +- +- +- "" +- user i.d. +- Facebook user i.d. for the currently logged in user, if any +- +- +- +- "" +- user name +- The name of the currently logged in Facebook user, if any +- +- +- +- 0 +- default size code +- A numeric code representing the default size for photos published to Facebook +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Facebook should have their metadata removed first +- +- +- +- +- +- "" +- OAuth Access Phase Token +- The authorization token for the currently logged in Flickr user, if any +- +- +- +- "" +- OAuth Access Phase Token Secret +- The cryptographic secret used to sign requests against the authorization token for the currently logged in Flickr user, if any +- +- +- +- "" +- username +- The user name of the currently logged in Flickr user, if any +- +- +- +- 2 +- default size code +- A numeric code representing the default size for photos published to Flickr +- +- +- +- 1 +- default visibility +- A numeric code representing the default visibility for photos published to Flickr +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Flickr should have their metadata removed first +- +- +- +- +- +- "" +- refresh token +- The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any. +- +- +- +- 2 +- default size +- A numeric code representing the default size for photos uploaded to Picasa Web Albums +- +- +- +- "" +- last album +- The name of the last album the user published photos to, if any +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Picasa should have their metadata removed first +- + + + +@@ -485,14 +385,6 @@ + + + +- +- +- "" +- refresh token +- The OAuth token used to refresh the YouTube session for the currently logged in user, if any. +- +- +- + + + "" +@@ -576,48 +468,12 @@ + + + +- +- true +- enable facebook publishing plugin +- True if the Facebook publishing plugin is enabled, false otherwise +- +- +- +- true +- enable flickr publishing plugin +- True if the Flickr publishing plugin is enabled, false otherwise +- +- +- +- true +- enable picasa publishing plugin +- True if the Picasa Web Albums publishing plugin is enabled, false otherwise +- +- +- +- true +- enable youtube publishing plugin +- True if the YouTube publishing plugin is enabled, false otherwise +- +- + + true + enable piwigo publishing plugin + True if the Piwigo publishing plugin is enabled, false otherwise + + +- +- false +- enable yandex publishing plugin +- True if the Yandex.Fotki publishing plugin is enabled, false otherwise +- +- +- +- false +- enable tumblr publishing plugin +- True if the Tumblr publishing plugin is enabled, false otherwise +- +- + + true + enable F-Spot import plugin +diff -Nur shotwell-0.18.0.orig/misc/shotwell.appdata.xml shotwell-0.18.0/misc/shotwell.appdata.xml +--- shotwell-0.18.0.orig/misc/shotwell.appdata.xml 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/misc/shotwell.appdata.xml 2014-04-19 18:15:46.392511834 -0300 +@@ -13,10 +13,6 @@ + your master photos, making it easy to experiment and correct errors. +

+

+- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, +- Picasa (Google Plus), and more. +-

+-

+ Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats. +

+ +diff -Nur shotwell-0.18.0.orig/misc/shotwell.convert shotwell-0.18.0/misc/shotwell.convert +--- shotwell-0.18.0.orig/misc/shotwell.convert 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/misc/shotwell.convert 2014-04-19 18:15:46.392511834 -0300 +@@ -65,29 +65,11 @@ + last-used-service = /apps/shotwell/sharing/last_used_service + + [org.yorba.shotwell.plugins.enable-state] +-publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled +-publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled +-publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled + publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled +-publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled +-publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled + transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled + transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled + transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled + +-[org.yorba.shotwell.sharing.facebook] +-uid = /apps/shotwell/sharing/facebook/uid +-user-name = /apps/shotwell/sharing/facebook/user_name +-default-size = /apps/shotwell/sharing/facebook/default_size +- +-[org.yorba.shotwell.sharing.flickr] +-default-size = /apps/shotwell/sharing/flickr/default_size +-visibility = /apps/shotwell/sharing/flickr/visibility +- +-[org.yorba.shotwell.sharing.picasa] +-default-size = /apps/shotwell/sharing/picasa/default_size +-last-album = /apps/shotwell/sharing/picasa/last_album +- + [org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] + url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url + username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username +@@ -95,11 +77,3 @@ + remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password + last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category + last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level +- +-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] +-auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token +- +-[org.yorba.shotwell.sharing.youtube] +-user-name = /apps/shotwell/sharing/youtube/user_name +-auth-token = /apps/shotwell/sharing/youtube/auth_token +- +diff -Nur shotwell-0.18.0.orig/misc/shotwell.desktop.head shotwell-0.18.0/misc/shotwell.desktop.head +--- shotwell-0.18.0.orig/misc/shotwell.desktop.head 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/misc/shotwell.desktop.head 2014-04-19 18:15:46.392511834 -0300 +@@ -3,7 +3,7 @@ + Name=Shotwell + GenericName=Photo Manager + Comment=Organize your photos +-Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; ++Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo; + Exec=shotwell %U + Icon=shotwell + Terminal=false +diff -Nur shotwell-0.18.0.orig/plugins/common/RESTSupport.vala shotwell-0.18.0/plugins/common/RESTSupport.vala +--- shotwell-0.18.0.orig/plugins/common/RESTSupport.vala 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/plugins/common/RESTSupport.vala 2014-04-19 18:44:24.962777076 -0300 +@@ -628,10 +628,6 @@ + return session; + } + +- protected Spit.Publishing.Publishable get_current_publishable() { +- return publishables[current_file]; +- } +- + protected abstract Transaction create_transaction(Spit.Publishing.Publishable publishable); + + public void upload(Spit.Publishing.ProgressCallback? status_updated = null) { +diff -Nur shotwell-0.18.0.orig/plugins/plugins.mk shotwell-0.18.0/plugins/plugins.mk +--- shotwell-0.18.0.orig/plugins/plugins.mk 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/plugins/plugins.mk 2014-04-19 18:52:04.852983921 -0300 +@@ -5,29 +5,13 @@ + shotwell-data-imports + + PLUGINS_RC := \ +- plugins/shotwell-publishing/facebook.png \ +- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \ +- plugins/shotwell-publishing/flickr.png \ +- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \ +- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \ +- plugins/shotwell-publishing/picasa.png \ +- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \ +- plugins/shotwell-publishing/youtube.png \ +- plugins/shotwell-publishing/youtube_publishing_options_pane.glade \ + plugins/shotwell-publishing/piwigo.png \ + plugins/shotwell-publishing/piwigo_authentication_pane.glade \ + plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \ + plugins/shotwell-transitions/slideshow-plugin.png + +-EXTRA_PLUGINS := \ +- shotwell-publishing-extras +- + EXTRA_PLUGINS_RC := \ +- plugins/shotwell-publishing-extras/yandex_publish_model.glade \ +- plugins/shotwell-data-imports/f-spot-24.png \ +- plugins/shotwell-publishing-extras/tumblr.png \ +- plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \ +- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade ++ plugins/shotwell-data-imports/f-spot-24.png + + ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS) + +diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile shotwell-0.18.0/plugins/shotwell-publishing/Makefile +--- shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/plugins/shotwell-publishing/Makefile 2014-04-19 18:45:15.729833873 -0300 +@@ -13,27 +13,14 @@ + + SRC_FILES := \ + shotwell-publishing.vala \ +- FacebookPublishing.vala \ +- PicasaPublishing.vala \ +- FlickrPublishing.vala \ +- YouTubePublishing.vala \ + PiwigoPublishing.vala \ + ../../src/util/string.vala \ + ../common/RESTSupport.vala + + RC_FILES := \ +- facebook.png \ +- facebook_publishing_options_pane.glade \ +- flickr.png \ +- flickr_publishing_options_pane.glade \ +- flickr_pin_entry_pane.glade \ +- picasa.png \ +- picasa_publishing_options_pane.glade \ + piwigo.png \ + piwigo_authentication_pane.glade \ +- piwigo_publishing_options_pane.glade \ +- youtube.png \ +- youtube_publishing_options_pane.glade ++ piwigo_publishing_options_pane.glade + + include ../Makefile.plugin.mk + +diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala +--- shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala 2014-04-19 18:15:46.392511834 -0300 +@@ -6,7 +6,7 @@ + + extern const string _VERSION; + +-// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube ++// "core services" is: Piwigo + private class ShotwellPublishingCoreServices : Object, Spit.Module { + private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; + +@@ -15,10 +15,6 @@ + public ShotwellPublishingCoreServices(GLib.File module_file) { + GLib.File resource_directory = module_file.get_parent(); + +- pluggables += new FacebookService(resource_directory); +- pluggables += new PicasaService(resource_directory); +- pluggables += new FlickrService(resource_directory); +- pluggables += new YouTubeService(resource_directory); + pluggables += new PiwigoService(resource_directory); + } + +diff -Nur shotwell-0.18.0.orig/po/POTFILES.in shotwell-0.18.0/po/POTFILES.in +--- shotwell-0.18.0.orig/po/POTFILES.in 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/po/POTFILES.in 2014-04-19 19:01:24.750459462 -0300 +@@ -18,22 +18,9 @@ + plugins/shotwell-publishing-extras/TumblrPublishing.vala + plugins/shotwell-publishing-extras/YandexPublishing.vala + plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade +-plugins/shotwell-publishing/FacebookPublishing.vala +-plugins/shotwell-publishing/FlickrPublishing.vala +-plugins/shotwell-publishing/PicasaPublishing.vala +-plugins/shotwell-publishing/PiwigoPublishing.vala +-plugins/shotwell-publishing/YouTubePublishing.vala +-[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade + [type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade + [type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade + plugins/shotwell-publishing/shotwell-publishing.vala +-[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade + plugins/shotwell-transitions/BlindsEffect.vala + plugins/shotwell-transitions/ChessEffect.vala + plugins/shotwell-transitions/CircleEffect.vala +diff -Nur shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala shotwell-0.18.0/src/plugins/PublishingInterfaces.vala +--- shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/src/plugins/PublishingInterfaces.vala 2014-04-19 18:15:46.395845194 -0300 +@@ -8,8 +8,7 @@ + * Shotwell Pluggable Publishing API + * + * The Shotwell Pluggable Publishing API allows you to write plugins that upload +- * photos and videos to web services. The Shotwell distribution includes publishing +- * support for four core services: Facebook, Flickr, Picasa Web Albums, and YouTube. ++ * photos and videos to web services. + * To enable Shotwell to connect to additional services, developers like you write + * publishing plugins, dynamically-loadable shared objects that are linked into the + * Shotwell process at runtime. Publishing plugins are just one of several kinds of +diff -Nur shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala shotwell-0.18.0/src/plugins/StandardHostInterface.vala +--- shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala 2014-03-04 20:54:12.000000000 -0200 ++++ shotwell-0.18.0/src/plugins/StandardHostInterface.vala 2014-04-19 18:37:54.803118064 -0300 +@@ -22,24 +22,8 @@ + private static string parse_key(string id) { + // special case: legacy plugins (Web publishers moved into SPIT) have special names + // new plugins will use their full ID +- switch (id) { +- case "org.yorba.shotwell.publishing.facebook": +- return "facebook"; +- +- case "org.yorba.shotwell.publishing.picasa": +- return "picasa"; +- +- case "org.yorba.shotwell.publishing.flickr": +- return "flickr"; +- +- case "org.yorba.shotwell.publishing.youtube": +- return "youtube"; +- +- default: +- return id; +- } ++ return id; + } +- + public File get_module_file() { + return module_file; + } diff --git a/nonprism/shotwell/shotwell.install b/nonprism/shotwell/shotwell.install new file mode 100644 index 000000000..bab8ecd29 --- /dev/null +++ b/nonprism/shotwell/shotwell.install @@ -0,0 +1,17 @@ +pkgname=shotwell + +post_install() { + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + update-desktop-database -q + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD deleted file mode 100644 index fae1f4661..000000000 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 113099 2014-06-13 15:15:18Z speps $ -# Maintainer (Arch): speps -# Contributor (Arch): Alexander Fehr -# Contributor (Arch): dorphell -# Maintainer: André Silva -# Contributor: Aditya Som " - -_pkgname=sylpheed -pkgname=sylpheed-nonprism -pkgver=3.4.2 -pkgrel=1 -pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" -arch=('i686' 'x86_64' 'mips64el') -url="http://sylpheed.sraoss.jp/en/" -license=('GPL') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils') -makedepends=('openssl') -install="$_pkgname.install" -source=("http://sylpheed.sraoss.jp/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" - 'nonprism.patch') -md5sums=('d4e53489763ff2cb575ab02890d91dc9' - 'e1bddc14962e607cdb899ec082660639') - -prepare() { - cd $_pkgname-$pkgver - - # Remove Gmail support - patch -Np1 -i "$srcdir/nonprism.patch" -} - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-ldap - make - - # Build Attachment-Tool Plug-in - cd plugin/attachment_tool && make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir/" install - - # Install Attachment-Tool Plug-in - cd plugin/attachment_tool - make DESTDIR="$pkgdir/" install-plugin -} diff --git a/nonprism/sylpheed-nonprism/nonprism.patch b/nonprism/sylpheed-nonprism/nonprism.patch deleted file mode 100644 index 50d000634..000000000 --- a/nonprism/sylpheed-nonprism/nonprism.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -Nur a/src/setup.c b/src/setup.c ---- a/src/setup.c 2010-08-19 02:23:28.000000000 -0300 -+++ b/src/setup.c 2013-10-23 15:10:24.439721307 -0200 -@@ -327,10 +327,6 @@ - GtkWidget *cancel_btn; - GtkWidget *pop3_radio; - GtkWidget *imap_radio; --#if USE_SSL -- GtkWidget *pop3g_radio; -- GtkWidget *imapg_radio; --#endif - GtkWidget *name_entry; - GtkWidget *addr_entry; - GtkWidget *id_entry; -@@ -378,15 +374,8 @@ - { - SETUP_TYPE_POP3, - SETUP_TYPE_IMAP, --#if USE_SSL -- SETUP_TYPE_POP3G, -- SETUP_TYPE_IMAPG --#endif - }; - --#define GMAIL_POP3_SERVER "pop.gmail.com" --#define GMAIL_IMAP_SERVER "imap.gmail.com" --#define GMAIL_SMTP_SERVER "smtp.gmail.com" - #define POP3_PORT 110 - #define IMAP_PORT 143 - #define SMTP_PORT 25 -@@ -410,14 +399,6 @@ - serv = gtk_entry_get_text(GTK_ENTRY(setupac.serv_entry)); - smtp = gtk_entry_get_text(GTK_ENTRY(setupac.smtp_entry)); - --#if USE_SSL -- if (setupac.type == SETUP_TYPE_POP3G || -- setupac.type == SETUP_TYPE_IMAPG) { -- if (GTK_WIDGET(editable) == setupac.addr_entry) -- gtk_entry_set_text(GTK_ENTRY(setupac.id_entry), addr); -- } --#endif -- - if (page == SETUP_PAGE_ADDRESS && name && *name && addr && *addr) - next_enable = TRUE; - else if (page == SETUP_PAGE_ACCOUNT && -@@ -436,8 +417,6 @@ - p = str = gtk_entry_get_text(GTK_ENTRY(entry)); - if (!str || *p == '\0') - return FALSE; -- if (!strcmp(str, "(username)@gmail.com")) -- return FALSE; - - while (*p) { - c = *p; -@@ -480,14 +459,6 @@ - } else if (response_id == GTK_RESPONSE_ACCEPT) { - if (prev_page == SETUP_PAGE_ADDRESS) { - if (entry_is_valid(setupac.addr_entry)) { --#if USE_SSL -- if (setupac.type == SETUP_TYPE_POP3G || -- setupac.type == SETUP_TYPE_IMAPG) -- gtk_notebook_set_current_page -- (GTK_NOTEBOOK(setupac.notebook), -- SETUP_PAGE_FINISH); -- else --#endif - gtk_notebook_set_current_page - (GTK_NOTEBOOK(setupac.notebook), page + 1); - } else -@@ -508,10 +479,6 @@ - if (prev_page == SETUP_PAGE_START) { - setupac.type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3_radio)) ? SETUP_TYPE_POP3 - : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imap_radio)) ? SETUP_TYPE_IMAP --#if USE_SSL -- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3g_radio)) ? SETUP_TYPE_POP3G -- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imapg_radio)) ? SETUP_TYPE_IMAPG --#endif - : SETUP_TYPE_POP3; - } - } else if (response_id == GTK_RESPONSE_REJECT) { -@@ -539,28 +506,6 @@ - gtk_widget_set_sensitive(setupac.serv_entry, TRUE); - gtk_widget_set_sensitive(setupac.smtp_entry, TRUE); - break; --#if USE_SSL -- case SETUP_TYPE_POP3G: -- if (prev_page == SETUP_PAGE_START) -- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com"); -- gtk_widget_set_sensitive(setupac.id_entry, FALSE); -- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("POP3 server:")); -- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_POP3_SERVER); -- gtk_widget_set_sensitive(setupac.serv_entry, FALSE); -- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER); -- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE); -- break; -- case SETUP_TYPE_IMAPG: -- if (prev_page == SETUP_PAGE_START) -- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com"); -- gtk_widget_set_sensitive(setupac.id_entry, FALSE); -- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("IMAP4 server:")); -- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_IMAP_SERVER); -- gtk_widget_set_sensitive(setupac.serv_entry, FALSE); -- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER); -- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE); -- break; --#endif /* USE_SSL */ - } - } else if (page == SETUP_PAGE_FINISH) { - prev_enable = FALSE; -@@ -595,24 +540,6 @@ - setupac.smtp_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.smtpauth_chkbtn)); - gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:")); - break; --#if USE_SSL -- case SETUP_TYPE_POP3G: -- setupac.serv_ssl = TRUE; -- setupac.smtp_ssl = TRUE; -- setupac.smtp_auth = TRUE; -- setupac.serv_port = POP3S_PORT; -- setupac.smtp_port = SMTPS_PORT; -- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("POP3 server:")); -- break; -- case SETUP_TYPE_IMAPG: -- setupac.serv_ssl = TRUE; -- setupac.smtp_ssl = TRUE; -- setupac.smtp_auth = TRUE; -- setupac.serv_port = IMAPS_PORT; -- setupac.smtp_port = SMTPS_PORT; -- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:")); -- break; --#endif /* USE_SSL */ - } - - GET_STR(name, name_entry); -@@ -756,14 +683,6 @@ - setupac.imap_radio = gtk_radio_button_new_with_label_from_widget - (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4"); - gtk_box_pack_start(GTK_BOX(vbox), setupac.imap_radio, FALSE, FALSE, 0); --#if USE_SSL -- setupac.pop3g_radio = gtk_radio_button_new_with_label_from_widget -- (GTK_RADIO_BUTTON(setupac.pop3_radio), "POP3 (Gmail)"); -- gtk_box_pack_start(GTK_BOX(vbox), setupac.pop3g_radio, FALSE, FALSE, 0); -- setupac.imapg_radio = gtk_radio_button_new_with_label_from_widget -- (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4 (Gmail)"); -- gtk_box_pack_start(GTK_BOX(vbox), setupac.imapg_radio, FALSE, FALSE, 0); --#endif - - /* Page 2 */ - vbox = gtk_vbox_new(FALSE, 12); -@@ -991,18 +910,6 @@ - #endif - ac->imapport = setupac.serv_port; - break; --#if USE_SSL -- case SETUP_TYPE_POP3G: -- ac->protocol = A_POP3; -- ac->ssl_pop = SSL_TUNNEL; -- ac->popport = setupac.serv_port; -- break; -- case SETUP_TYPE_IMAPG: -- ac->protocol = A_IMAP4; -- ac->ssl_imap = SSL_TUNNEL; -- ac->imapport = setupac.serv_port; -- break; --#endif /* USE_SSL */ - } - - g_free(ac->sig_text); diff --git a/nonprism/sylpheed-nonprism/sylpheed.install b/nonprism/sylpheed-nonprism/sylpheed.install deleted file mode 100644 index e111ef946..000000000 --- a/nonprism/sylpheed-nonprism/sylpheed.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/sylpheed/PKGBUILD b/nonprism/sylpheed/PKGBUILD new file mode 100644 index 000000000..5f1b17321 --- /dev/null +++ b/nonprism/sylpheed/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 113099 2014-06-13 15:15:18Z speps $ +# Maintainer (Arch): speps +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): dorphell +# Maintainer: André Silva +# Contributor: Aditya Som " + +pkgname=sylpheed +pkgver=3.4.2 +pkgrel=1.nonprism1 +pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" +arch=('i686' 'x86_64' 'mips64el') +url="http://sylpheed.sraoss.jp/en/" +license=('GPL') +replaces=(${pkgname}-nonprism) +conflicts=(${pkgname}-nonprism) +depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils') +makedepends=('openssl') +install="$pkgname.install" +source=("http://sylpheed.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz2" + 'nonprism.patch') +md5sums=('d4e53489763ff2cb575ab02890d91dc9' + 'e1bddc14962e607cdb899ec082660639') + +prepare() { + cd $pkgname-$pkgver + + # Remove Gmail support + patch -Np1 -i "$srcdir/nonprism.patch" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-ldap + make + + # Build Attachment-Tool Plug-in + cd plugin/attachment_tool && make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install + + # Install Attachment-Tool Plug-in + cd plugin/attachment_tool + make DESTDIR="$pkgdir/" install-plugin +} diff --git a/nonprism/sylpheed/nonprism.patch b/nonprism/sylpheed/nonprism.patch new file mode 100644 index 000000000..50d000634 --- /dev/null +++ b/nonprism/sylpheed/nonprism.patch @@ -0,0 +1,168 @@ +diff -Nur a/src/setup.c b/src/setup.c +--- a/src/setup.c 2010-08-19 02:23:28.000000000 -0300 ++++ b/src/setup.c 2013-10-23 15:10:24.439721307 -0200 +@@ -327,10 +327,6 @@ + GtkWidget *cancel_btn; + GtkWidget *pop3_radio; + GtkWidget *imap_radio; +-#if USE_SSL +- GtkWidget *pop3g_radio; +- GtkWidget *imapg_radio; +-#endif + GtkWidget *name_entry; + GtkWidget *addr_entry; + GtkWidget *id_entry; +@@ -378,15 +374,8 @@ + { + SETUP_TYPE_POP3, + SETUP_TYPE_IMAP, +-#if USE_SSL +- SETUP_TYPE_POP3G, +- SETUP_TYPE_IMAPG +-#endif + }; + +-#define GMAIL_POP3_SERVER "pop.gmail.com" +-#define GMAIL_IMAP_SERVER "imap.gmail.com" +-#define GMAIL_SMTP_SERVER "smtp.gmail.com" + #define POP3_PORT 110 + #define IMAP_PORT 143 + #define SMTP_PORT 25 +@@ -410,14 +399,6 @@ + serv = gtk_entry_get_text(GTK_ENTRY(setupac.serv_entry)); + smtp = gtk_entry_get_text(GTK_ENTRY(setupac.smtp_entry)); + +-#if USE_SSL +- if (setupac.type == SETUP_TYPE_POP3G || +- setupac.type == SETUP_TYPE_IMAPG) { +- if (GTK_WIDGET(editable) == setupac.addr_entry) +- gtk_entry_set_text(GTK_ENTRY(setupac.id_entry), addr); +- } +-#endif +- + if (page == SETUP_PAGE_ADDRESS && name && *name && addr && *addr) + next_enable = TRUE; + else if (page == SETUP_PAGE_ACCOUNT && +@@ -436,8 +417,6 @@ + p = str = gtk_entry_get_text(GTK_ENTRY(entry)); + if (!str || *p == '\0') + return FALSE; +- if (!strcmp(str, "(username)@gmail.com")) +- return FALSE; + + while (*p) { + c = *p; +@@ -480,14 +459,6 @@ + } else if (response_id == GTK_RESPONSE_ACCEPT) { + if (prev_page == SETUP_PAGE_ADDRESS) { + if (entry_is_valid(setupac.addr_entry)) { +-#if USE_SSL +- if (setupac.type == SETUP_TYPE_POP3G || +- setupac.type == SETUP_TYPE_IMAPG) +- gtk_notebook_set_current_page +- (GTK_NOTEBOOK(setupac.notebook), +- SETUP_PAGE_FINISH); +- else +-#endif + gtk_notebook_set_current_page + (GTK_NOTEBOOK(setupac.notebook), page + 1); + } else +@@ -508,10 +479,6 @@ + if (prev_page == SETUP_PAGE_START) { + setupac.type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3_radio)) ? SETUP_TYPE_POP3 + : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imap_radio)) ? SETUP_TYPE_IMAP +-#if USE_SSL +- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3g_radio)) ? SETUP_TYPE_POP3G +- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imapg_radio)) ? SETUP_TYPE_IMAPG +-#endif + : SETUP_TYPE_POP3; + } + } else if (response_id == GTK_RESPONSE_REJECT) { +@@ -539,28 +506,6 @@ + gtk_widget_set_sensitive(setupac.serv_entry, TRUE); + gtk_widget_set_sensitive(setupac.smtp_entry, TRUE); + break; +-#if USE_SSL +- case SETUP_TYPE_POP3G: +- if (prev_page == SETUP_PAGE_START) +- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com"); +- gtk_widget_set_sensitive(setupac.id_entry, FALSE); +- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("POP3 server:")); +- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_POP3_SERVER); +- gtk_widget_set_sensitive(setupac.serv_entry, FALSE); +- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER); +- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE); +- break; +- case SETUP_TYPE_IMAPG: +- if (prev_page == SETUP_PAGE_START) +- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com"); +- gtk_widget_set_sensitive(setupac.id_entry, FALSE); +- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("IMAP4 server:")); +- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_IMAP_SERVER); +- gtk_widget_set_sensitive(setupac.serv_entry, FALSE); +- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER); +- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE); +- break; +-#endif /* USE_SSL */ + } + } else if (page == SETUP_PAGE_FINISH) { + prev_enable = FALSE; +@@ -595,24 +540,6 @@ + setupac.smtp_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.smtpauth_chkbtn)); + gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:")); + break; +-#if USE_SSL +- case SETUP_TYPE_POP3G: +- setupac.serv_ssl = TRUE; +- setupac.smtp_ssl = TRUE; +- setupac.smtp_auth = TRUE; +- setupac.serv_port = POP3S_PORT; +- setupac.smtp_port = SMTPS_PORT; +- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("POP3 server:")); +- break; +- case SETUP_TYPE_IMAPG: +- setupac.serv_ssl = TRUE; +- setupac.smtp_ssl = TRUE; +- setupac.smtp_auth = TRUE; +- setupac.serv_port = IMAPS_PORT; +- setupac.smtp_port = SMTPS_PORT; +- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:")); +- break; +-#endif /* USE_SSL */ + } + + GET_STR(name, name_entry); +@@ -756,14 +683,6 @@ + setupac.imap_radio = gtk_radio_button_new_with_label_from_widget + (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4"); + gtk_box_pack_start(GTK_BOX(vbox), setupac.imap_radio, FALSE, FALSE, 0); +-#if USE_SSL +- setupac.pop3g_radio = gtk_radio_button_new_with_label_from_widget +- (GTK_RADIO_BUTTON(setupac.pop3_radio), "POP3 (Gmail)"); +- gtk_box_pack_start(GTK_BOX(vbox), setupac.pop3g_radio, FALSE, FALSE, 0); +- setupac.imapg_radio = gtk_radio_button_new_with_label_from_widget +- (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4 (Gmail)"); +- gtk_box_pack_start(GTK_BOX(vbox), setupac.imapg_radio, FALSE, FALSE, 0); +-#endif + + /* Page 2 */ + vbox = gtk_vbox_new(FALSE, 12); +@@ -991,18 +910,6 @@ + #endif + ac->imapport = setupac.serv_port; + break; +-#if USE_SSL +- case SETUP_TYPE_POP3G: +- ac->protocol = A_POP3; +- ac->ssl_pop = SSL_TUNNEL; +- ac->popport = setupac.serv_port; +- break; +- case SETUP_TYPE_IMAPG: +- ac->protocol = A_IMAP4; +- ac->ssl_imap = SSL_TUNNEL; +- ac->imapport = setupac.serv_port; +- break; +-#endif /* USE_SSL */ + } + + g_free(ac->sig_text); diff --git a/nonprism/sylpheed/sylpheed.install b/nonprism/sylpheed/sylpheed.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/nonprism/sylpheed/sylpheed.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-2-g168b From 5e62f8a54f47a73fd66df39ed7e841af0e22bca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Sep 2014 02:06:43 -0300 Subject: kdepim-runtime-4.14.0-3.nonprism2: add kdepim-runtime-coherence on conflicts array --- nonprism/kdepim-runtime/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index fd33567cd..07e7e436b 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -5,7 +5,7 @@ pkgname=kdepim-runtime pkgver=4.14.0 -pkgrel=3.nonprism1 +pkgrel=3.nonprism2 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'libkolab' 'libaccounts-qt' 'signon') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') -conflicts=(kdepim-runtime-nonprism) +conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('6cb3b92d57343872ddfc6ba24b5ebdd005126fa2') -- cgit v1.2.3-2-g168b From 448c73d26577be3e04afda7364e3a7b3782b64cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Sep 2014 02:11:46 -0300 Subject: your-privacy-20140904-1: updating version --- nonprism/your-privacy/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index 20068c183..07b8ababc 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package will remove support for unsafe/dangerous for privacy proto license=('GPL3') #url="https://projects.parabolagnulinux.org/blacklist.git" url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20140828 -_gitver=b88c41ea8c091a45287fa0a715d55454cea3776f +pkgver=20140904 +_gitver=404a5122c4ee08b50a51f967507cb33cd689b303 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ replaces=(your-coherence) makedepends=(librelib) #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -md5sums=('2ad92778e0a81a3e64c18b72139a1575') +md5sums=('23650cd003ef3d8edbf000907af7b52f') package() { cd "$srcdir" -- cgit v1.2.3-2-g168b