commit 8c827954271ddd85e01a26c5a929d92255491873
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:   2012-05-15

    Update NEWS for 1.12.3 release

M	NEWS

commit ef986f8d4c4ea1ebb36c7eff33bcab2a3a42ec2c
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-05-15

    udisks2: set can_eject correctly

    Yes, can_eject can be TRUE even if the media is not removable.

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2drive.c

commit 0a47bf098e4d33c6284b9f2ef47c175c6503b932
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-05-14

    udisks2: set timeout to INTMAX when unmounting a filesystem

    It may indeed take more than 25 seconds if there's a lot of data to
    write. Related to https://bugzilla.redhat.com/show_bug.cgi?id=819492

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2mount.c

commit 052010c7ca25217fd9f3a4a9d479d98ef5f57ae5
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-05-08

    udisks2: also check for umount(8) saying "target is busy"

    Same as
    http://cgit.freedesktop.org/udisks/commit/?id=d8fa361eec2706091e9d7f166f63bb5c0f663f4b

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2mount.c

commit 01161473ed33ee682f340e6f12edcba5334475e0
Author: Matthias Clasen <mclasen@redhat.com>
Date:	2012-04-30

    afp: Use g_clear_object properly

    g_clear_object expects the address of a pointer. A recent
    change in its definition makes gcc complain about this.
    (cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)

M	daemon/gvfsafpvolume.c

commit afb88d32e167e131bcf7e6cac9370a092b05293b
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-04-27

    build: Include udisks2/what-is-shown.txt in the tarball

M	monitor/udisks2/Makefile.am

commit c633abe63766b4173eb9eb1c0e98f60d609998ee
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-04-27

    Post release version bump

M	configure.ac

commit d97ef559798e9ea03185982c3a7d06a43dd45f77
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-04-27

    Update NEWS for 1.12.2 release

M	NEWS

commit 00bc42e150dc24e47cb296b8d1cf3e5c40421f56
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2012-04-21

    afp: use the UTF-8 server name for password dialogs when it's
    available

    https://bugzilla.gnome.org/show_bug.cgi?id=674528

M	daemon/gvfsafpserver.c

commit c082899363662f494c6dae422094d814dd2d040e
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2012-04-21

    afp: convert pascal strings into utf-8

    pascal strings are in the macintosh-roman character set and therefore
    need to
    be converted into utf-8.

    https://bugzilla.gnome.org/show_bug.cgi?id=674528

M	daemon/gvfsafpconnection.c

commit b51b55b8a7e66cabecec972c96513edce6237193
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	2012-04-21

    [l10n] Update Japanese translation

    Fix format errors
    https://bugzilla.gnome.org/show_bug.cgi?id=674514

M	po/ja.po

commit e30a67f3215d829e95ee7e358c67af7d67635fe8
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-04-18

    udisks2: Set should_automount correctly when starting up

    This bug caused volumes to not automount at session startup. While it
    can be argued that we should or shouldn't at least this is

	1. a change from earlier versions of GNOME; and

	2. rather disruptive for some non-GUI users

    Basically the problem is this: We need to take into account that on
    coldplug, the heuristic of just looking at whether the volume has
    appeared within the last five seconds won't work.

    This bug report that triggered this bug fix was this one

     https://bugzilla.redhat.com/show_bug.cgi?id=813069

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volume.c
M	monitor/udisks2/gvfsudisks2volume.h
M	monitor/udisks2/gvfsudisks2volumemonitor.c

commit 071ef32304258de70404f1e897724361f2dfbca6
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-04-16

    Post release version bump

M	configure.ac

commit ebe43f878b6ba3bda001b75068b57a30caefd04c
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-04-16

    Update NEWS for 1.12.1 release

M	NEWS

commit 90cd7fc84efa5bd8cdcb725cf3f4a1590cb72cd9
Author: Antoine Jacoutot <ajacoutot@gnome.org>
Date:	2012-04-16

    afp: Prevent redefinition of GVfsAfpServer.

    GVfsAfpServer is already included in gvfsafpvolume.h which
    gvfsafpserver.h
    includes; so no need to declare GVfsAfpServer here.

    http://bugzilla-attachments.gnome.org/attachment.cgi?id=210456

    Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

M	daemon/gvfsafpserver.h

commit 0ce5ef308df86f5fef412f14b59fa46bee494e81
Author: Hajime Taira <htaira@redhat.com>
Date:	2012-04-16

    [l10n] Update Japanese translation

M	po/ja.po

commit a4cfc92d4cb0bfd0590d4f0dc177faa2a03b344c
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	2012-04-12

    Updated Persian translation

M	po/fa.po

commit 2a7341cf0e6d29a49b7ba11a0a327688ea3ee7fe
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	2012-04-12

    Updated Persian translation

M	po/fa.po

commit 31b80beeb44a69d227f9420d69cdf1780f6191bf
Author: Martin Pitt <martinpitt@gnome.org>
Date:	2012-04-11

    gphoto2: Initialize mutex early enough

    Initializing the lock mutex in do_mount() is too late, as there are
    a lot of
    code paths that call release_device() and thus g_mutex_clear()
    that run before
    a successful do_mount(). For example, when you run gvfsd-gphoto2
    with wrong
    arguments, or gp_camera_init() fails in do_mount().

    Now initialize it in g_vfs_backend_gphoto2_init().

    https://bugzilla.gnome.org/show_bug.cgi?id=673893

M	daemon/gvfsbackendgphoto2.c

commit a6026f07b32dd9543b05af7b039d73029b166aa4
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	2012-04-10

    [l10n]Updated Catalan (Valencian) translation

M	po/ca@valencia.po

commit 87cd894c32745c3e8b8163e966e2a1406ab40e5b
Author: Jordi Serratosa <jordis@softcatala.cat>
Date:	2012-04-10

    [l10n] Fixes on Catalan translation

M	po/ca.po

commit 846752e8bdab6c25570796848db4118c634411a1
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	2012-04-10

    Updated Persian translation

M	po/fa.po

commit 1d4de8fd3010d21734c16c8912b125b222051e0e
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	2012-04-10

    Updated Persian translation

M	po/fa.po

commit 31eaee9cd7609b961d683bc6220fb15cb95b1372
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-04-09

    udisks2: Update link to fstab/crypttab editing in Disks

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/what-is-shown.txt

commit d870015bff4eb8f34f465f4c45d91ca326f52a43
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-04-09

    udisks2: Fix some memory leaks

    https://bugzilla.redhat.com/show_bug.cgi?id=790062

    This was done using the following rather simple script

     #!/bin/bash
     while true; do
	 losetup -f
	 /home/davidz/Downloads/Fedora-16-x86_64-Live-Desktop.iso
	 losetup -D
     done

    and then running it as root.

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volumemonitor.c

commit 54b1069f0f21d3d748ef5d2daa3e78ac0ab6e0aa
Author: Chandan Kumar <chandankumar.093047@gmail.com>
Date:	2012-04-05

    Updated hindi translation

M	po/hi.po

commit d6f14e2fcf126af8f41159148946b6b5ae2c3819
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:	2012-04-05

    Added Persian translations

M	po/LINGUAS
A	po/fa.po

commit c9f840192312c23f7eea666f964e7eab4c2e680e
Author: Alexandre Rostovtsev <tetromino@gentoo.org>
Date:	2012-04-02

    afc: Fix building against libimobiledevice-1.1.2

    In 1.1.2, the struct idevice_event_t uuid field was renamed to udid.
    Since libimobiledevice lacks a library version macro, we are forced
    to check for the pkgconfig version in configure.

    https://bugzilla.gnome.org/show_bug.cgi?id=672693

    Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

M	configure.ac
M	daemon/gvfsbackendafc.c
M	monitor/afc/afcvolumemonitor.c

commit 2bc8621f86c6ce2d9f8bde666a0055ed88e99dda
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-03-31

    [l10n] Updated German translation

M	po/de.po

commit 7512c0e90c3455eaaf73368109636fd9d7422bdb
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-03-27

    Updated Spanish translation

M	po/es.po

commit bfe0c6730adddc7da856268aed1284ba21e9e6d9
Author: Aurimas Černius <aurisc4@gmail.com>
Date:	2012-03-26

    Updated Lithuanian translation

M	po/lt.po

commit 23c9e81e7aaf9883479fc5e31e0f4d3826964780
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-03-26

    Post release version bump

M	configure.ac

commit a4c5695c726358a3a64106e22f3f9f46f1f6ced7
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-03-26

    Update NEWS for 1.12.0 release

M	NEWS
M	configure.ac

commit 97389274b093787a772c24f925f223710ed38594
Author: Marek Černocký <marek@manet.cz>
Date:	2012-03-26

    Updated Czech translation

M	po/cs.po

commit 9619b0ec942efae45a6f0b7ba5998777953dd5f6
Author: Petr Kovar <pkovar@redhat.com>
Date:	2012-03-26

    Updated Czech translation

M	po/cs.po

commit cd3e6d11e3f83ed254b5946e46a3ad5fe7bc40e8
Author: Funda Wang <fundawang@gmail.com>
Date:	2012-03-21

    Updated zh_CN translation.

M	po/ChangeLog
M	po/zh_CN.po

commit 618ff2f778212ff2459108de2f4ca4731e082788
Author: Sasi Bhushan <sasi@swecha.net>
Date:	2012-03-20

    Updated Telugu Translations

M	po/te.po

commit b43ac18df12e8f9e7a899001cf33851f4c214220
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-03-19

    Post release version bump

M	configure.ac

commit 4de85271d345762042c9a0d11f1f9f9dda3b9565
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-03-19

    Update NEWS for 1.11.5 release

M	NEWS

commit 514944b023e95634a44bb511c80221722835a387
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2012-03-17

    Updated French translation

M	po/fr.po

commit eb79ba77b3b6b2ce7328f259a35d82c6a16172b4
Author: Sweta Kothari <swkothar@redhat.com>
Date:	2012-03-16

    Updated Gujarati Translations

M	po/gu.po

commit 390fa80bbddc36317b73405e7eb7a54bad24a676
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	2012-03-15

    [l10n]Updated Catalan (Valencian) translation

M	po/ca@valencia.po

commit d0a99e9330b4eb065a9df28ecc8247c1e1a31e4e
Author: Gil Forcada <gforcada@gnome.org>
Date:	2012-03-15

    [l10n]Updated Catalan translation

M	po/ca.po

commit 09dfd003a4825eb8667ba521fae64f12bd551bce
Author: Alexander Larsson <alexl@redhat.com>
Date:	2012-03-15

    Keep using ~/.gvfs as fallback

    If runtime dir is not specifically set we don't fall back to
    ~/.cache/gvfs, as that unnecessarily invalidates all existing
    documentation and scripts using ~/.gvfs.

    However, if it is set, we still use it.

M	client/gdaemonvfs.c
M	daemon/main.c
M	daemon/mount.c

commit bbb61d820ea319b6468e6b78c0b2f007c0338881
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date:	2012-03-15

    Updated Portuguese translation

M	po/pt.po

commit 2e511fb47e7aa76c0eb7fc2083f8f615399f9c26
Author: Anita Reitere <nitalynx@gmail.com>
Date:	2012-03-15

    Updated Latvian translation.

M	po/lv.po

commit b8e663e716ac85e6aef781083b8b17845f4781e7
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	2012-03-13

    Updated British English translation

M	po/en_GB.po

commit 6b0f553b4f05d6433f41af4a42b1e75f405ed2f1
Author: Timo Jyrinki <timo@debian.org>
Date:	2012-03-12

    Finnish translation update from
    http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint

M	po/fi.po

commit 3c20c3e0da697e223cfd3e8dfbb454942332b01b
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2012-03-10

    Updated Polish translation

M	po/pl.po

commit cdcbd83ae7b03bb441c2b6d2481f64bb302668bb
Author: Seong-ho Cho <darkcircle.0426@gmail.com>
Date:	2012-03-10

    Updated Korean translation

M	po/ko.po

commit f1ba26c5d471ec93c9c5d7c83c1459da909bf2c1
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:	2012-03-08

    Uploaded Ukranian

M	po/uk.po

commit 5ba3d7f5bd6be91e10d7e2bd9f40a8a19fb713cd
Author: Djavan Fagundes <djavanf@gnome.org>
Date:	2012-03-02

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit e276d82179b88f271c98cc4897ce14e4d2777bd8
Author: Djavan Fagundes <djavanf@gnome.org>
Date:	2012-03-02

    Reverting wrong commit "Updated Brazilian Portuguese translation by
    Fábio Nogueira <fnogueira@gnome.org> and Myself"

    This reverts commit 5b3a81f1a94c5cdaa9b44dd07f6f0d736662449c.

A	po/pt_BR.po

commit 5b3a81f1a94c5cdaa9b44dd07f6f0d736662449c
Author: Djavan Fagundes <djavanf@gnome.org>
Date:	2012-03-02

    Updated Brazilian Portuguese translation by Fábio Nogueira
    <fnogueira@gnome.org> and Myself

D	po/pt_BR.po

commit 2a79e684d73e58fe197fcd1ab7ffb52372167945
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	2012-03-06

    Updated Basque language

M	po/eu.po

commit 6d4870484dbd3e6ce2ea0c2cef84649f9d8a1df8
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:	2012-03-05

    Assamese translation completed

M	po/as.po

commit 27d7825a218cbc2d1dd12063770539eca0035bcc
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	2012-03-04

    Updated Vietnamese translation

M	po/vi.po

commit 0972f4fdd275e727d60c58357d0354c94d118ed5
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	2012-03-04

    po/vi: import from Damned Lies

M	po/vi.po

commit 31f24aa3bdfa7f53e74d4e24fcb79a3b7ed0d0ce
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-03-01

    udisks2: Set G_VOLUME_IDENTIFIER_KIND_CLASS identifier for volumes

    This identifier was discussed in

     https://bugzilla.gnome.org/show_bug.cgi?id=668295

    and added to GLib with this commit

     http://git.gnome.org/browse/glib/commit/?id=10fbfcf09010e423cfc79c54e8da50b62a0f4b8a

    For now, we do the ifndef dance instead of hard-requiring GLib master.

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volume.c

commit cd0f2d9865a508e7c1bcee52ef0d1b5394ffb406
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	2012-03-01

    Updated Hungarian translation

M	po/hu.po

commit ae9ed88a5f0492df449e0729283a09da420651c7
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	2012-02-28

    [l10n] Updated Estonian translation

M	po/et.po

commit ce9c862519f2bc338cf14927a2093019ea399d8c
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:	2012-02-27

    updated Tamil translation

M	po/ta.po

commit f65e82b4bc066a4c5a10572493eff2c8d029fbd2
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	2012-02-26

    Updated Belarusian translation.

M	po/be.po

commit a6ae644b0e56a3ae7e154a25fcf597d499ee7eea
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-02-24

    Post release version bump

M	configure.ac

commit fecbfb334e05ed25423febc993ff4ff22b8b7f90
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-02-24

    Update NEWS for 1.11.4 release

M	NEWS

commit d61d5d0094305a9a6bfdec2f5831fd1617635faf
Author: A S Alam <aalam@users.sf.net>
Date:	2012-02-24

    update Punjabi Translation

M	po/pa.po

commit 05fa75f4040a94660b8491ff33c225658930cd0a
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	2012-02-24

    Updated Russian translation

M	po/ru.po

commit 711c180a6d8400e2e2752eae41296882a60d1dd3
Author: YunQiang Su <yqsu@src.gnome.org>
Date:	2012-02-23

    fix an zh_CN translation problem

M	po/zh_CN.po

commit 6307d017a12642e71ba2f04e82fc3781425a3eb6
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-02-22

    Use /run/media/$USER instead of $XDG_RUNTIME_DIR/media

    This is because of security concerns - it is way too dangerous to let
    a system-daemon such as udisks manage directories in a user-controlled
    location such as $XDG_RUNTIME_DIR. So now udisks2 is using
    /run/media/$USER instead, see

     http://cgit.freedesktop.org/udisks/commit/?id=aa02e5fc53efdeaf66047d2ad437ed543178965b

    These bugs are related

     https://bugzilla.gnome.org/show_bug.cgi?id=669797
     https://bugzilla.gnome.org/show_bug.cgi?id=646391

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volumemonitor.c
M	monitor/udisks2/what-is-shown.txt

commit eea3b84bdf8d68c7d5127468b77607fad66c4af3
Author: Alexander Shopov <ash@kambanaria.org>
Date:	2012-02-21

    Updated Bulgarian translation

M	po/bg.po

commit 0ca728345a1dd9875b5959019ffefa4b389ee385
Author: Ask H. Larsen <asklarsen@gmail.com>
Date:	2012-02-20

    Updated Danish translation

M	po/da.po

commit 177eed9119fe00301e9a36bedfa9f00b7b8427ff
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2012-02-20

    Updated Serbian translation

M	po/sr.po
M	po/sr@latin.po

commit fd2fdc0417d03f26ecfc6a76a7d5d22b808545ad
Author: Gheyret Kenji <gheyret@gmail.com>
Date:	2012-02-19

    Updated Uyghur translation

M	po/ug.po

commit 5ae367cc6ae3746f70a13f9db7881fd6db0861bd
Author: Daniel Nylander <po@danielnylander.se>
Date:	2012-02-19

    Updated Swedish translation

M	po/sv.po

commit 60968576962f10212caf9e59a41ef0a9f77e6165
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-02-18

    udisks2: Only show $XDG_RUNTIME_DIR mounts if they are in media dir

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volumemonitor.c
M	monitor/udisks2/what-is-shown.txt

commit 184ecff8482c06ea59c7b0a176b890acc3fa8083
Author: Luca Ferretti <lferrett@gnome.org>
Date:	2012-02-17

    l10n: Updated Italian translation

M	po/it.po

commit fdecf1901712bb40705dbc2d5136d7550b6c7a56
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	2012-02-15

    Updated Belarusian translation.

M	po/be.po

commit 909441fb15c0daf14604cc57a88b74caaa2621a5
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	2012-02-11

    Updated Russian translation

M	po/ru.po

commit 99ae116200691c1dc67ea3fb74060e0d90bf482d
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-02-08

    dav: Fix free space reporting

    Based on patch by Gareth Bult
    https://bugzilla.gnome.org/show_bug.cgi?id=669258

M	daemon/gvfsbackenddav.c

commit cbee78fdf13541f01de3078244c56c84af8477c0
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-02-07

    Post release version bump

M	configure.ac

commit 8350026da9e291c7dbb2257a990f8358c05e222d
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:	2012-02-07

    Update NEWS for 1.11.3 release

M	NEWS

commit e523572e14a9042696e1c5ccd4f30cb3240fa0df
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:	2012-02-07

    GVfsJobUnmount: check that vfunc is implemented before calling it

    GVfsBackend::try_unmount is optional (like all the other try_*
    vfuncs),
    and in fact many backends don't implement it.
    In case it's NULL, returing FALSE does the right thing and schedules
    a thread for calling ->unmount.

    https://bugzilla.gnome.org/show_bug.cgi?id=669211

M	daemon/gvfsjobunmount.c

commit 989d0889afe34a0ce072edf9840b6d18314a00b3
Author: William Jon McCann <jmccann@redhat.com>
Date:	2012-02-07

    burn: Use user runtime dir instead of /tmp

    https://bugzilla.gnome.org/show_bug.cgi?id=646391

    Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

M	daemon/gvfsbackendburn.c

commit f81e381b58bf4dc8ea42ceb50311d4ef92677f72
Author: William Jon McCann <jmccann@redhat.com>
Date:	2012-02-07

    Use user runtime dir for gvfs mounts

    https://bugzilla.gnome.org/show_bug.cgi?id=646391

    Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

M	client/gdaemonvfs.c
M	daemon/main.c
M	daemon/mount.c

commit 87b5115aa18bc13858ef0d5041855658a22822be
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:	2012-02-04

    Updated Dutch translation

M	po/nl.po

commit fa53cd373efb22e427a329650ebb5c076ef3171b
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:	2012-01-29

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

M	po/zh_HK.po
M	po/zh_TW.po

commit 50ac84a753286ad37ce84b9ece034b4dbb69132e
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	2012-01-28

    Updated Hebrew translation.

M	po/he.po

commit e7d0f9ece1379b68f6d3ec22795782beefc5e600
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2012-01-25

    Updated Slovenian translation

M	po/sl.po

commit e5002669770af3d79aeeebd846f8638874d727d8
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2012-01-25

    Updated Slovenian translation

M	po/sl.po

commit 37d4bf323a05a0b46fa3cb2b4cc96aa4ceca598e
Author: David Zeuthen <davidz@redhat.com>
Date:	2012-01-24

    For mount options, switch from comment=gvfs to x-gvfs

    Recent util-linux (2.21+) supports any x-* option.

    Signed-off-by: David Zeuthen <davidz@redhat.com>

M	monitor/udisks2/gvfsudisks2volume.c
M	monitor/udisks2/gvfsudisks2volumemonitor.c
M	monitor/udisks2/what-is-shown.txt

commit ce3bda236c2c85517260fc138669acf91af1092f
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2012-01-23

    Updated Norwegian bokmål translation

M	po/nb.po

commit f47d4b10fa148972f9ff6d1d44645fd8ab4974d5
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	2012-01-23

    Updated Galician translations

M	po/gl.po

commit f5238a19f5115d63fd482a5341449c5c67ed2df1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-01-22

    Updated Spanish translation

M	po/es.po

commit 74bb0801b3d81e861be87ab5e146563875c24ab5
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2012-01-22

    Updated POTFILES.in

M	po/POTFILES.in

commit dec478831e0444e922ab8cd0e3336449fa1a743a
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2012-01-22

    afpvolume: s/afp_conn/conn/

M	daemon/gvfsafpvolume.c

commit f30a3c75f0102c69502edff77c6dba3775d90569
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2012-01-22

    afp: fix potential leak in g_vfs_afp_volume_enumerate

M	daemon/gvfsafpvolume.c

commit fa288893d51478daa7190bbb554779404a205157
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2011-11-23

    afp: split out volume specific functions into a GVfsAfpVolume object.

M	daemon/Makefile.am
M	daemon/gvfsafpconnection.c
M	daemon/gvfsafpconnection.h
M	daemon/gvfsafpserver.c
M	daemon/gvfsafpserver.h
M	daemon/gvfsafputils.c
M	daemon/gvfsafputils.h
A	daemon/gvfsafpvolume.c
A	daemon/gvfsafpvolume.h
M	daemon/gvfsbackendafp.c
M	daemon/gvfsbackendafpbrowse.c

commit a1af02aee5d076e042502569d59d350d03839baf
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2011-11-22

    afp: Add support for making backups when server has support for
    FPExchangeFiles

    Instead of deleting the temporary file after doing the FPExchangeFiles
    call we
    rename the temporary file to "~filename" since it holds the old
    contents of the
    file.

M	daemon/gvfsbackendafp.c

commit 35cf2feab74059065b23073b8bb3bcd8a3786bbf
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2011-11-22

    afp: fix leak of AfpHandle::tmp_filename

M	daemon/gvfsbackendafp.c

commit 86cca680ec185d0a74fa948485d221bc9efe9181
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2011-11-06

    afp: change g_vfs_afp_connection_get_server_info to
    g_vfs_afp_query_server_info

    It's unnecessary to create a GVfsAfpConnection to retreive the
    server info

M	daemon/gvfsafpconnection.c
M	daemon/gvfsafpconnection.h
M	daemon/gvfsafpserver.c

commit 88866fdc3c34e8b9ce2d4435098885e67212ac40
Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date:	2011-09-26

    afp: move retrieval of volumes into GVfsAfpServer

