Wed Jun 4 03:57:00 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-04 04:00:35 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-04 04:00:35 +0000
commit: 8faa42b28f39ace5fc2c3ec8a054fa0a5b246eab (patch)
tree: e904cb1dcc6423b414bae5d134c3ea83ac01efa1
parent: 11196316291f49af2bacd1b4531e0a548729dea2 (diff)
41 files changed, 2032 insertions, 164 deletions
diff --git a/community/bochs/PKGBUILD b/community/bochs/PKGBUILD
index 0a26bfc4f..37357c57e 100644
--- a/community/bochs/PKGBUILD
+++ b/community/bochs/PKGBUILD
@@ -1,27 +1,55 @@
-# $Id: PKGBUILD 92959 2013-06-20 20:17:58Z kkeen $
-#Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 112550 2014-06-03 12:08:57Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bochs
-pkgver=2.6.2
+pkgver=2.6.5
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
 url="http://bochs.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'libxrandr')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('82ecaff9826d4f29fa46f3062e2957b8')
+#makedepends=('sdl')
+#optdepends=('sdl: debuggers')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('455020b528ac31477a58779a9a4a96e4')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \
-              --enable-fpu --enable-3dnow --enable-disasm
-  make
+    cd "$srcdir/$pkgname-$pkgver"
+
+    # typos in 2.6.5
+    sed -i 's/Bx3DNowOpcode\[i->modRMForm.Ib/&\[0\]/' cpu/fetchdecode{,64}.cc
+
+    # todo, figure out why debuggers won't build (FS#38274)
+    ./configure \
+        --prefix=/usr \
+        --without-wx \
+        --with-x11 \
+        --disable-docbook \
+        --enable-cpu-level=6 \
+        --enable-fpu \
+        --enable-3dnow \
+        --enable-disasm \
+        --enable-smp \
+        --enable-x86-64 \
+        --enable-avx \
+        --enable-long-phy-address \
+        --enable-disasm \
+        --enable-pcidev \
+        --enable-usb
+        #--with-sdl
+        #--enable-debugger
+        #--enable-x86-debugger
+        #--enable-all-optimizations
+        #--enable-plugins
+    #sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
+    make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt"
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+    install -Dm644 .bochsrc "$pkgdir/etc/bochsrc-sample.txt"
 }
diff --git a/community/cmocka/PKGBUILD b/community/cmocka/PKGBUILD
index 2c11615e8..0b398aea9 100644
--- a/community/cmocka/PKGBUILD
+++ b/community/cmocka/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 110062 2014-04-23 16:53:25Z anatolik $
+# $Id: PKGBUILD 112515 2014-06-03 01:07:06Z anatolik $
 # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=cmocka
 url='http://cmocka.org/'
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc='an elegant unit testing framework for C with support for mock objects'
 arch=(i686 x86_64)
 license=(GPL)
 depends=(glibc)
 makedepends=(cmake)
-source=(https://open.cryptomilk.org/attachments/download/37/cmocka-$pkgver.tar.xz)
-sha1sums=('7fe27a6fdcf60222cf15ae67aeee83139180a759')
+source=(http://git.cryptomilk.org/projects/cmocka.git/snapshot/cmocka-$pkgver.tar.bz2)
+sha1sums=('215378198f489033d982122e34168d9d225e2f5b')
 
 build() {
   rm -rf build; mkdir build
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index e9f7fdb0c..125802624 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112473 2014-06-02 14:02:07Z spupykin $
+# $Id: PKGBUILD 112555 2014-06-03 14:43:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
@@ -28,7 +28,7 @@ source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail
 	"dbmail-pop3d.xinetd"
 	"dbmail-timsieved.xinetd"
 	"dbmail-7-systemd.diff")
-md5sums=('84d1af55891f0e2259e5f11462ddd997'
+md5sums=('SKIP'
          '890de13361afbdf4fed12d6d7eb53e66'
          '961593658cd596297d03d25eb9c9e98f'
          '4cb764894abd3914802e90602bf90a0c'
diff --git a/community/ibus-skk/PKGBUILD b/community/ibus-skk/PKGBUILD
new file mode 100644
index 000000000..67439b71a
--- /dev/null
+++ b/community/ibus-skk/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 112578 2014-06-03 18:20:31Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: eagletmt <eagletmt@gmail.com>
+
+pkgname=ibus-skk
+pkgver=1.4.1
+pkgrel=2
+pkgdesc='Japanese input method SKK engine for IBus'
+arch=('i686' 'x86_64')
+url='https://github.com/ueno/ibus-skk'
+license=('GPL')
+depends=('ibus' 'libskk')
+makedepends=('intltool')
+source=("https://github.com/downloads/ueno/$pkgname/$pkgname-$pkgver.tar.gz")
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib/ibus
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('8c2d5c9cf7b007cdd7fe64433f5ae4f0')
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index c8c059782..d93ab314e 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106141 2014-02-24 08:38:56Z spupykin $
+# $Id: PKGBUILD 112557 2014-06-03 14:43:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=2.0.3
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz)
-md5sums=('ea56d214fab7dbbaeb225f61eeba213c')
+md5sums=('8ddc98ffb591298b7440311d8f23c864')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD
index 49d03e949..5d038f13a 100644
--- a/community/libdaq/PKGBUILD
+++ b/community/libdaq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102862 2013-12-22 20:59:29Z bpiotrowski $
+# $Id: PKGBUILD 112517 2014-06-03 02:37:50Z fyan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libdaq
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc='Data Acquisition library for packet I/O.'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('libpcap')
 makedepends=('ca-certificates')
 source=(http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz{,.sig})
-md5sums=('044aa3663d44580d005293eeb8ccf175'
+md5sums=('865bf9b750a2a2ca632591a3c70b0ea0'
          'SKIP')
 
 build() {
diff --git a/community/libskk/PKGBUILD b/community/libskk/PKGBUILD
new file mode 100644
index 000000000..2244c39de
--- /dev/null
+++ b/community/libskk/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 112574 2014-06-03 16:49:22Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: eagletmt <eagletmt@gmail.com>
+# Contributor: kusanaginoturugi <kusanaginoturugi@gmail.com>
+
+pkgname=libskk
+pkgver=1.0.1
+pkgrel=2
+pkgdesc='GObject-based library to deal with Japanese kana-to-kanji conversion method'
+arch=('i686' 'x86_64')
+url='https://github.com/ueno/libskk'
+license=('GPL3')
+depends=('libgee06' 'json-glib')
+makedepends=('intltool')
+source=(https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz)
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('2052bfa898205b641bb2cc448516230f')
diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD
index 733223a9a..39f7890d6 100644
--- a/community/libvirt-python/PKGBUILD
+++ b/community/libvirt-python/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt-python
-pkgver=1.2.3
+pkgver=1.2.5
 pkgrel=1
 pkgdesc="libvirt python binding"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('git')
 options=('emptydirs')
 install="libvirt-python.install"
 source=("http://libvirt.org/sources/python/libvirt-python-$pkgver.tar.gz")
-md5sums=('6916d24595c5cc939e698926cd22888c')
+md5sums=('d155184bd2eba00be45f6d5421082884')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index b4896bb35..ccf788bd7 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109792 2014-04-18 17:31:35Z andyrtr $
+# $Id: PKGBUILD 112543 2014-06-03 10:15:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=poedit
 pkgver=1.6.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64')
 url="http://www.poedit.net/"
 license=('MIT')
-depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell')
+depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell3')
 makedepends=('boost' 'libsm')
 install=poedit.install
 #source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz)
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 348114c52..5d3568fbd 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111646 2014-05-21 22:05:45Z seblu $
+# $Id: PKGBUILD 112558 2014-06-03 15:21:40Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.3.12
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index c7fd88f87..6e874a1a4 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112221 2014-05-30 10:22:00Z spupykin $
+# $Id: PKGBUILD 112570 2014-06-03 16:23:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=xcircuit
-pkgver=3.8.61
+pkgver=3.8.63
 pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
 makedepends=('chrpath')
 source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('8baa59454c6038c4f7c080fadfb9b4cf')
+md5sums=('72456ef92140a74d894a0f27a5adeae9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index fb5cdf31d..723a262b0 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 207985 2014-03-16 14:21:28Z thomas $
+# $Id: PKGBUILD 214109 2014-06-03 19:42:39Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.42.9
-pkgrel=2
+pkgver=1.42.10
+pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
@@ -17,7 +17,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk
 backup=('etc/mke2fs.conf')
 options=('staticlibs')
 install=${pkgname}.install
-sha1sums=('fb8e3662302bcab1682d567d6ee0ff051faa1bbd'
+sha1sums=('06eba8a78ce1d5032fdcaf34f09025f01ceaca79'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index afcc4928e..8c46abe78 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=1.20.0.1
+pkgver=1.20.0.2
 pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 makedepends=('ghc')
 depends=('gmp' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('351622588b11ae799e31677666a831f6')
+md5sums=('bda72a81c22bde668244fb3a50a81f7f')
 
 build() {
   mkdir ${srcdir}/build
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index a02aed5a2..23836d344 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210085 2014-04-09 18:36:39Z anatolik $
+# $Id: PKGBUILD 214101 2014-06-03 16:12:48Z anatolik $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeremy Cowgar <jeremy@cowgar.com>
 
 pkgname=check
-pkgver=0.9.12
+pkgver=0.9.13
 pkgrel=1
 pkgdesc="A unit testing framework for C"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 install=$pkgname.install
 depends=('awk')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('46fe540d1a03714c7a1967dbc6d484e7')
+md5sums=('95530868f81a9496b2518fd2b713008a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 4922c3c3f..1d2683c83 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210419 2014-04-14 20:05:55Z jgc $
+# $Id: PKGBUILD 214056 2014-06-03 08:23:07Z jgc $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.10
-pkgrel=2
+pkgver=2.0.12
+pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=(i686 x86_64)
 url="http://www.clutter-project.org/"
@@ -11,7 +11,7 @@ license=(LGPL)
 depends=(clutter gst-plugins-base-libs libxdamage)
 makedepends=(gobject-introspection)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00')
+sha256sums=('c2f1453692b0c3ff6a500113bc1d2c95d2bde11caca0809610a6d1424bbbffb5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 1b157404e..a280f6614 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 213341 2014-05-20 15:13:56Z bpiotrowski $
+# $Id: PKGBUILD 214050 2014-06-03 07:02:13Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.2.2
-pkgrel=3
+pkgver=2.2.3
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ depends=(
       )
 makedepends=('libvdpau' 'yasm')
 source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('581affe5d820d89ce21fe3f0316ef2c3'
+md5sums=('dbb5b6b69bd010916f17df0ae596e0b1'
          'SKIP')
 
 build() {
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 1fd000f36..c80f049c7 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 210437 2014-04-14 20:06:12Z jgc $
+# $Id: PKGBUILD 214072 2014-06-03 08:48:30Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.30.7
+pkgver=2.30.8
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
 makedepends=('gtk-doc' 'gobject-introspection')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver:0:4}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('0aafc365eab1083a53f15e4828333b968219ffcb1a995ac6289c0147c9ffad06')
+sha256sums=('4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 2ec5fef7d..77d8aa102 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210581 2014-04-15 08:23:31Z jgc $
+# $Id: PKGBUILD 214068 2014-06-03 08:38:02Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.12.1
+pkgver=3.12.2
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64)
@@ -15,8 +15,8 @@ groups=(gnome-extra)
 options=('!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('75460b112bed459a0f9db60e7fb0b9e6341dc8e5c20088d929597ba030d7b653')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index c1ad18ec6..bbb39e195 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 210448 2014-04-14 20:06:21Z jgc $
+# $Id: PKGBUILD 214085 2014-06-03 12:22:17Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
 pkgver=2.6.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://spruce.sourceforge.net/gmime/"
 depends=('glib2' 'gpgme' 'zlib')
-makedepends=('gtk-sharp-2')
+makedepends=('gtk-sharp-2' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 sha256sums=('e0a170fb264c2ae4cecd852f4e7aaddb8d58e8f3f0b569ce2d2a4704f55bdf65')
 
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index d44d1fc06..c4345f85b 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210451 2014-04-14 20:06:23Z jgc $
+# $Id: PKGBUILD 214066 2014-06-03 08:33:44Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.12.1
+pkgver=3.12.2
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740')
+sha256sums=('da9dd34286979e88430b236982bf0c8b4415cd0c0caa0c19228fb521c08abe60')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 0e85b69e6..9081b35d3 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 198017 2013-10-30 12:17:45Z allan $
+# $Id: PKGBUILD 214093 2014-06-03 12:50:34Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
 depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        git-fixes.patch)
+sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71'
+            'b738c2ea37784e531a2f4517d6bb5f2d1a00e488c89a5bf0dc73fdbca70374c1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../git-fixes.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-menus/git-fixes.patch b/extra/gnome-menus/git-fixes.patch
new file mode 100644
index 000000000..443d553e9
--- /dev/null
+++ b/extra/gnome-menus/git-fixes.patch
@@ -0,0 +1,1640 @@
+diff --git a/libmenu/canonicalize.c b/libmenu/canonicalize.c
+index f601c4f..8a02dd9 100644
+--- a/libmenu/canonicalize.c
++++ b/libmenu/canonicalize.c
+@@ -15,9 +15,7 @@
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
++   License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+diff --git a/libmenu/canonicalize.h b/libmenu/canonicalize.h
+index e3ef502..2dff7f4 100644
+--- a/libmenu/canonicalize.h
++++ b/libmenu/canonicalize.h
+@@ -15,9 +15,7 @@
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
++   License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #ifndef G_CANONICALIZE_H
+ #define G_CANONICALIZE_H
+diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
+index 1e23bf2..326f311 100644
+--- a/libmenu/desktop-entries.c
++++ b/libmenu/desktop-entries.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -406,7 +404,7 @@ desktop_entry_ref (DesktopEntry *entry)
+   g_return_val_if_fail (entry != NULL, NULL);
+   g_return_val_if_fail (entry->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&entry->refcount);
++  entry->refcount += 1;
+ 
+   return entry;
+ }
+@@ -699,7 +697,7 @@ desktop_entry_set_ref (DesktopEntrySet *set)
+   g_return_val_if_fail (set != NULL, NULL);
+   g_return_val_if_fail (set->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&set->refcount);
++  set->refcount += 1;
+ 
+   return set;
+ }
+@@ -707,13 +705,11 @@ desktop_entry_set_ref (DesktopEntrySet *set)
+ void
+ desktop_entry_set_unref (DesktopEntrySet *set)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (set != NULL);
+   g_return_if_fail (set->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&set->refcount);
+-  if (is_zero)
++  set->refcount -= 1;
++  if (set->refcount == 0)
+     {
+       menu_verbose (" Deleting entry set %p\n", set);
+ 
+diff --git a/libmenu/desktop-entries.h b/libmenu/desktop-entries.h
+index 07b7c85..72ca4b8 100644
+--- a/libmenu/desktop-entries.h
++++ b/libmenu/desktop-entries.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __DESKTOP_ENTRIES_H__
+diff --git a/libmenu/entry-directories.c b/libmenu/entry-directories.c
+index 67869b4..214513b 100644
+--- a/libmenu/entry-directories.c
++++ b/libmenu/entry-directories.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -40,12 +38,12 @@ struct EntryDirectory
+ 
+   guint entry_type : 2;
+   guint is_legacy : 1;
+-  volatile gint refcount;
++  guint refcount : 24;
+ };
+ 
+ struct EntryDirectoryList
+ {
+-  volatile int refcount;
++  int    refcount;
+   int    length;
+   GList *dirs;
+ };
+@@ -64,10 +62,10 @@ struct CachedDir
+   guint have_read_entries : 1;
+   guint deleted : 1;
+ 
++  guint references;
++
+   GFunc    notify;
+   gpointer notify_data;
+-
+-  volatile gint references;
+ };
+ 
+ struct CachedDirMonitor
+@@ -83,6 +81,7 @@ static void     cached_dir_free                   (CachedDir  *dir);
+ static gboolean cached_dir_load_entries_recursive (CachedDir  *dir,
+                                                    const char *dirname);
+ static void     cached_dir_unref                  (CachedDir *dir);
++static void     cached_dir_unref_noparent         (CachedDir *dir);
+ static CachedDir * cached_dir_add_subdir          (CachedDir  *dir,
+                                                    const char *basename,
+                                                    const char *path);
+@@ -156,7 +155,7 @@ cached_dir_free (CachedDir *dir)
+   dir->entries = NULL;
+ 
+   g_slist_foreach (dir->subdirs,
+-                   (GFunc) cached_dir_unref,
++                   (GFunc) cached_dir_unref_noparent,
+                    NULL);
+   g_slist_free (dir->subdirs);
+   dir->subdirs = NULL;
+@@ -168,18 +167,14 @@ cached_dir_free (CachedDir *dir)
+ static CachedDir *
+ cached_dir_ref (CachedDir *dir)
+ {
+-  g_atomic_int_inc (&dir->references);
+-
++  dir->references++;
+   return dir;
+ }
+ 
+ static void
+ cached_dir_unref (CachedDir *dir)
+ {
+-  gboolean is_zero;
+-
+-  is_zero = g_atomic_int_dec_and_test (&dir->references);
+-  if (is_zero)
++  if (--dir->references == 0)
+     {
+       CachedDir *parent;
+ 
+@@ -195,6 +190,18 @@ cached_dir_unref (CachedDir *dir)
+     }
+ }
+ 
++static void
++cached_dir_unref_noparent (CachedDir *dir)
++{
++  if (--dir->references == 0)
++    {
++      if (dir->notify)
++        dir->notify (dir, dir->notify_data);
++
++      cached_dir_free (dir);
++    }
++}
++
+ static inline CachedDir *
+ find_subdir (CachedDir  *dir,
+              const char *subdir)
+@@ -224,13 +231,8 @@ find_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-      if (strcmp (entry_basename, basename) == 0)
+-        {
+-          return tmp->data;
+-        }
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
++        return tmp->data;
+ 
+       tmp = tmp->next;
+     }
+@@ -334,9 +336,7 @@ cached_dir_update_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-      if (strcmp (entry_basename, basename) == 0)
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
+         {
+           if (!desktop_entry_reload (tmp->data))
+ 	    {
+@@ -361,10 +361,7 @@ cached_dir_remove_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-
+-      if (strcmp (entry_basename, basename) == 0)
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
+         {
+           desktop_entry_unref (tmp->data);
+           dir->entries = g_slist_delete_link (dir->entries, tmp);
+@@ -420,11 +417,8 @@ cached_dir_remove_subdir (CachedDir  *dir,
+     {
+       subdir->deleted = TRUE;
+ 
+-      if (subdir->references == 0)
+-        {
+-          cached_dir_unref (subdir);
+-          dir->subdirs = g_slist_remove (dir->subdirs, subdir);
+-        }
++      cached_dir_unref (subdir);
++      dir->subdirs = g_slist_remove (dir->subdirs, subdir);
+ 
+       return TRUE;
+     }
+@@ -528,16 +522,11 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+   char     *basename;
+   char     *dirname;
+ 
+-  menu_verbose ("'%s' notified of '%s' %s - invalidating cache\n",
+-		dir->name,
+-                path,
+-                event == MENU_MONITOR_EVENT_CREATED ? ("created") :
+-                event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
+-
+   dirname  = g_path_get_dirname  (path);
+   basename = g_path_get_basename (path);
+ 
+   dir = cached_dir_lookup (dirname);
++  cached_dir_add_reference (dir);
+ 
+   if (g_str_has_suffix (basename, ".desktop") ||
+       g_str_has_suffix (basename, ".directory"))
+@@ -558,7 +547,7 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+           break;
+         }
+     }
+-  else /* Try recursing */
++  else if (g_file_test (path, G_FILE_TEST_IS_DIR)) /* Try recursing */
+     {
+       switch (event)
+         {
+@@ -584,6 +573,12 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+ 
+   if (handled)
+     {
++      menu_verbose ("'%s' notified of '%s' %s - invalidating cache\n",
++                    dir->name,
++                    path,
++                    event == MENU_MONITOR_EVENT_CREATED ? ("created") :
++                    event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
++
+       /* CHANGED events don't change the set of desktop entries */
+       if (event == MENU_MONITOR_EVENT_CREATED || event == MENU_MONITOR_EVENT_DELETED)
+         {
+@@ -592,6 +587,8 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+ 
+       cached_dir_queue_monitor_event (dir);
+     }
++
++  cached_dir_remove_reference (dir);
+ }
+ 
+ static void
+@@ -822,7 +819,7 @@ entry_directory_ref (EntryDirectory *ed)
+   g_return_val_if_fail (ed != NULL, NULL);
+   g_return_val_if_fail (ed->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&ed->refcount);
++  ed->refcount++;
+ 
+   return ed;
+ }
+@@ -830,13 +827,10 @@ entry_directory_ref (EntryDirectory *ed)
+ void
+ entry_directory_unref (EntryDirectory *ed)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (ed != NULL);
+   g_return_if_fail (ed->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&ed->refcount);
+-  if (is_zero)
++  if (--ed->refcount == 0)
+     {
+       cached_dir_remove_reference (ed->dir);
+ 
+@@ -952,12 +946,11 @@ entry_directory_foreach_recursive (EntryDirectory            *ed,
+ 
+       if (desktop_entry_get_type (entry) == ed->entry_type)
+         {
+-          gboolean    ret;
+-          char       *file_id;
+-          const char *basename;
++          gboolean  ret;
++          char     *file_id;
+ 
+-          basename = desktop_entry_get_basename (entry);
+-          g_string_append (relative_path, basename);
++          g_string_append (relative_path,
++                           desktop_entry_get_basename (entry));
+ 
+ 	  file_id = get_desktop_file_id_from_path (ed,
+ 						   ed->entry_type,
+@@ -1037,7 +1030,7 @@ entry_directory_get_flat_contents (EntryDirectory   *ed,
+       DesktopEntry *entry = tmp->data;
+       const char   *basename;
+ 
+-      basename = desktop_entry_get_path (entry);
++      basename = desktop_entry_get_basename (entry);
+ 
+       if (desktop_entries &&
+           desktop_entry_get_type (entry) == DESKTOP_ENTRY_DESKTOP)
+@@ -1110,7 +1103,7 @@ entry_directory_list_ref (EntryDirectoryList *list)
+   g_return_val_if_fail (list != NULL, NULL);
+   g_return_val_if_fail (list->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&list->refcount);
++  list->refcount += 1;
+ 
+   return list;
+ }
+@@ -1118,13 +1111,11 @@ entry_directory_list_ref (EntryDirectoryList *list)
+ void
+ entry_directory_list_unref (EntryDirectoryList *list)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (list != NULL);
+   g_return_if_fail (list->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&list->refcount);
+-  if (is_zero)
++  list->refcount -= 1;
++  if (list->refcount == 0)
+     {
+       g_list_foreach (list->dirs, (GFunc) entry_directory_unref, NULL);
+       g_list_free (list->dirs);
+diff --git a/libmenu/entry-directories.h b/libmenu/entry-directories.h
+index 4b1f5fb..9719a2b 100644
+--- a/libmenu/entry-directories.h
++++ b/libmenu/entry-directories.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __ENTRY_DIRECTORIES_H__
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 091a719..f8fbbd0 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -1242,12 +1240,8 @@ gmenu_tree_directory_make_path (GMenuTreeDirectory *directory,
+   append_directory_path (directory, path);
+ 
+   if (entry != NULL)
+-    {
+-      const char *basename;
+-
+-      basename = desktop_entry_get_basename (entry->desktop_entry);
+-      g_string_append (path, basename);
+-    }
++    g_string_append (path,
++		     desktop_entry_get_basename (entry->desktop_entry));
+ 
+   return g_string_free (path, FALSE);
+ }
+@@ -1277,7 +1271,7 @@ gmenu_tree_entry_get_desktop_file_path (GMenuTreeEntry *entry)
+ const char *
+ gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry)
+ {
+-  g_return_val_if_fail (entry != NULL, FALSE);
++  g_return_val_if_fail (entry != NULL, NULL);
+ 
+   return entry->desktop_file_id;
+ }
+diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
+index 4ccdb2b..283d25b 100644
+--- a/libmenu/gmenu-tree.h
++++ b/libmenu/gmenu-tree.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __GMENU_TREE_H__
+diff --git a/libmenu/menu-layout.c b/libmenu/menu-layout.c
+index 4b2a02c..cdd3763 100644
+--- a/libmenu/menu-layout.c
++++ b/libmenu/menu-layout.c
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-layout.h b/libmenu/menu-layout.h
+index 1a6af13..05ecfca 100644
+--- a/libmenu/menu-layout.h
++++ b/libmenu/menu-layout.h
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_LAYOUT_H__
+diff --git a/libmenu/menu-monitor.c b/libmenu/menu-monitor.c
+index 8895b49..c9fabf5 100644
+--- a/libmenu/menu-monitor.c
++++ b/libmenu/menu-monitor.c
+@@ -15,9 +15,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-monitor.h b/libmenu/menu-monitor.h
+index 4a37ce2..0522e57 100644
+--- a/libmenu/menu-monitor.h
++++ b/libmenu/menu-monitor.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_MONITOR_H__
+diff --git a/libmenu/menu-util.c b/libmenu/menu-util.c
+index 7bc6fd1..10f88a8 100644
+--- a/libmenu/menu-util.c
++++ b/libmenu/menu-util.c
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-util.h b/libmenu/menu-util.h
+index 5b0a3f4..be73086 100644
+--- a/libmenu/menu-util.h
++++ b/libmenu/menu-util.h
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_UTIL_H__
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 7a3fc8f..8cde878 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -33,6 +33,7 @@ fr
+ fur
+ fy
+ ga
++gd
+ gl
+ gn
+ gu
+diff --git a/po/el.po b/po/el.po
+index e3fcc56..6678cfb 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -10,16 +10,16 @@ msgstr ""
+ "Project-Id-Version: el\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-02-19 22:31+0000\n"
+-"PO-Revision-Date: 2013-02-24 10:21+0300\n"
++"POT-Creation-Date: 2013-12-18 20:58+0000\n"
++"PO-Revision-Date: 2013-12-23 08:45+0300\n"
+ "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
+-"Language-Team: team@gnome.gr\n"
++"Language-Team: team@lists.gnome.gr\n"
+ "Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+-"X-Generator: Virtaal 0.7.1\n"
++"X-Generator: Virtaal 0.7.0\n"
+ "X-Project-Style: gnome\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+@@ -117,7 +117,7 @@ msgstr "Διάφορα"
+ 
+ #: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
+ msgid "Utilities"
+-msgstr "Βοηθήματα"
++msgstr "Βοηθητικά προγράμματα"
+ 
+ #: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
+ msgid "Small but useful GNOME tools"
+diff --git a/po/fr.po b/po/fr.po
+index 5721f91..e227f32 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -14,7 +14,7 @@ msgstr ""
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+ "POT-Creation-Date: 2013-02-20 09:33+0000\n"
+-"PO-Revision-Date: 2013-02-20 21:14+0100\n"
++"PO-Revision-Date: 2013-10-23 16:35+0200\n"
+ "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+ "Language-Team: GNOME French team <gnomefr@traduc.org>\n"
+ "Language: \n"
+@@ -72,7 +72,7 @@ msgstr "Bureautique"
+ 
+ #: ../desktop-directories/Office.directory.in.h:2
+ msgid "Office Applications"
+-msgstr "Autres applications"
++msgstr "Applications de bureautique"
+ 
+ #: ../desktop-directories/System-Tools.directory.in.h:1
+ msgid "System Tools"
+diff --git a/po/gd.po b/po/gd.po
+new file mode 100644
+index 0000000..b74033c
+--- /dev/null
++++ b/po/gd.po
+@@ -0,0 +1,274 @@
++# Gaelic; Scottish translation for gnome-menus
++# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
++# This file is distributed under the same license as the gnome-menus package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gnome-menus\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-08-26 14:17+0000\n"
++"PO-Revision-Date: 2013-09-17 11:39+0100\n"
++"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
++"Language-Team: Gaelic; Scottish <gd@li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Launchpad-Export-Date: 2013-09-15 06:16+0000\n"
++"X-Generator: Launchpad (build 16761)\n"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:1
++msgid "Sound & Video"
++msgstr "Fuaim ⁊ video"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:2
++msgid "Multimedia menu"
++msgstr "Clàr-taice nan ioma-mheadhanan"
++
++#: ../desktop-directories/Development.directory.in.h:1
++msgid "Programming"
++msgstr "Prògramachadh"
++
++#: ../desktop-directories/Development.directory.in.h:2
++msgid "Tools for software development"
++msgstr "Innealan airson leasachadh bathair-bhog"
++
++#: ../desktop-directories/Education.directory.in.h:1
++msgid "Education"
++msgstr "Foghlam"
++
++#: ../desktop-directories/Game.directory.in.h:1
++msgid "Games"
++msgstr "Geamannan"
++
++#: ../desktop-directories/Game.directory.in.h:2
++msgid "Games and amusements"
++msgstr "Geamannan ⁊ fealla-dhà"
++
++#: ../desktop-directories/Graphics.directory.in.h:1
++msgid "Graphics"
++msgstr "Grafaigeachd"
++
++#: ../desktop-directories/Graphics.directory.in.h:2
++msgid "Graphics applications"
++msgstr "Prògraman grafaigeachd"
++
++#: ../desktop-directories/Network.directory.in.h:1
++msgid "Internet"
++msgstr "An t-eadar-lìon"
++
++#: ../desktop-directories/Network.directory.in.h:2
++msgid "Programs for Internet access such as web and email"
++msgstr "Prògraman leis am faighear cothrom air an eadar-lìon, can brabhsairean is prògraman puist-d"
++
++#: ../desktop-directories/Office.directory.in.h:1
++msgid "Office"
++msgstr "Oifis"
++
++#: ../desktop-directories/Office.directory.in.h:2
++msgid "Office Applications"
++msgstr "Prògaman oifise"
++
++#: ../desktop-directories/System-Tools.directory.in.h:1
++msgid "System Tools"
++msgstr "Innealan siostaim"
++
++#: ../desktop-directories/System-Tools.directory.in.h:2
++msgid "System configuration and monitoring"
++msgstr "Rèiteachadh an t-siostaim agus marasgladh"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
++msgid "Universal Access"
++msgstr "Inntrigeadh uile-choitcheann"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
++msgid "Universal Access Settings"
++msgstr "Roghainnean an inntrigidh uile-choitchinn"
++
++#: ../desktop-directories/Utility.directory.in.h:1
++msgid "Accessories"
++msgstr "Trealaich"
++
++#: ../desktop-directories/Utility.directory.in.h:2
++msgid "Desktop accessories"
++msgstr "Trealaich an deasga"
++
++#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
++msgid "Applications"
++msgstr "Aplacaidean"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
++msgid "Other"
++msgstr "Feadhainn eile"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:2
++msgid "Applications that did not fit in other categories"
++msgstr "Aplacaidean aig nach eil roinn-seòrsa iomchaidh eile"
++
++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1
++msgid "Sundry"
++msgstr "An corr"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
++msgid "Utilities"
++msgstr "Goireasachdan"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
++msgid "Small but useful GNOME tools"
++msgstr "Innealan GNOME a tha beag ach feumail"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1
++msgid "Web Applications"
++msgstr "Aplacaidean-lìn"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2
++msgid "Applications and sites saved from Web"
++msgstr "Aplacaidean is làraichean a chaidh a shàbhaladh on lìon"
++
++#~ msgid "Action"
++#~ msgstr "Action"
++
++#~ msgid "Action games"
++#~ msgstr "Geamannan action"
++
++#~ msgid "Adventure"
++#~ msgstr "Driod-fhortan"
++
++#~ msgid "Adventure style games"
++#~ msgstr "Geamannan driod-fhortain"
++
++#~ msgid "Arcade"
++#~ msgstr "Arcade"
++
++#~ msgid "Arcade style games"
++#~ msgstr "Geamannan arcade"
++
++#~ msgid "Falling blocks"
++#~ msgstr "Blocaichean a' tuiteam"
++
++#~ msgid "Falling blocks games"
++#~ msgstr "Geamannan sa bheil blocaichean a' tuiteam"
++
++#~ msgid "Board"
++#~ msgstr "Bòrd"
++
++#~ msgid "Board games"
++#~ msgstr "Geamannan-bùird"
++
++#~ msgid "Cards"
++#~ msgstr "Cairtean"
++
++#~ msgid "Card games"
++#~ msgstr "Geamannan chairtean"
++
++#~ msgid "Debian"
++#~ msgstr "Debian"
++
++#~ msgid "The Debian menu"
++#~ msgstr "Clàr-taice Debian"
++
++#~ msgid "Science"
++#~ msgstr "Saidheans"
++
++#~ msgid "Scientific applications"
++#~ msgstr "Aplacaidean saidheansail"
++
++#~ msgid "Kids"
++#~ msgstr "Clann"
++
++#~ msgid "Games for kids"
++#~ msgstr "Geamannan cloinne"
++
++#~ msgid "Logic"
++#~ msgstr "Loidig"
++
++#~ msgid "Logic and puzzle games"
++#~ msgstr "Geamannan loidig ⁊ tòimhseachain"
++
++#~ msgid "Role playing"
++#~ msgstr "Cluich mas fhìor"
++
++#~ msgid "Role playing games"
++#~ msgstr "Geamannan cluich mas fhìor"
++
++#~ msgid "Administration"
++#~ msgstr "Rianachd"
++
++#~ msgid "Change system-wide settings (affects all users)"
++#~ msgstr ""
++#~ "Atharraich roghainnean aig am bi buaidh air feadh an t-siostaim (air gach "
++#~ "cleachdaiche)"
++
++#~ msgid "Preferences"
++#~ msgstr "Roghainnean"
++
++#~ msgid "Personal preferences"
++#~ msgstr "Roghainnean pearsanta"
++
++#~ msgid "Simulation"
++#~ msgstr "Samhlachadh"
++
++#~ msgid "Simulation games"
++#~ msgstr "Geamannan samhlachaidh"
++
++#~ msgid "Sports"
++#~ msgstr "Spòrs"
++
++#~ msgid "Sports games"
++#~ msgstr "Geamannan spòrs"
++
++#~ msgid "Strategy"
++#~ msgstr "Ro-innleachd"
++
++#~ msgid "Strategy games"
++#~ msgstr "Geamannan ro-innleachdail"
++
++#~ msgid "Name"
++#~ msgstr "Ainm"
++
++#~ msgid "Hardware"
++#~ msgstr "Bathar Cruaidh"
++
++#~ msgid "Personal"
++#~ msgstr "Pearsanta"
++
++#~ msgid "System"
++#~ msgstr "Siostam"
++
++#~ msgid "_Applications:"
++#~ msgstr "_Prògraman:"
++
++#~ msgid "_Menus:"
++#~ msgstr "_Clàr-iùilean:"
++
++#~ msgid "Simple Menu Editor %s"
++#~ msgstr "Deasaiche clar-taic simplidh %s"
++
++#~ msgid "Personal settings"
++#~ msgstr "Suidheachaidhean pearsanta"
++
++#~ msgid "System settings"
++#~ msgstr "Suidheachaidhean siostam"
++
++#~ msgid "Edit Menus"
++#~ msgstr "Deasaich clàr-iùilean"
++
++#~ msgid "Menu Editor"
++#~ msgstr "Deasaiche clàr-iùil"
++
++#~ msgid "_Defaults"
++#~ msgstr "_Bunaitean"
++
++#~ msgid ""
++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
++#~ "in environment"
++#~ msgstr ""
++#~ "Cha b'urrainn faighinn lorg air am phasgan dhachaigh: neo-stèidheachd an /"
++#~ "etc/passwd agus gun luach airson $HOME anns a àrainneachd"
++
++#~ msgid "Show"
++#~ msgstr "Seall"
++
++#~ msgid "Settings for several hardware devices"
++#~ msgstr "Suidheachaidhean iomadaidh innleachd bathar cruaidh"
+diff --git a/po/km.po b/po/km.po
+index a56429f..b8c08ed 100644
+--- a/po/km.po
++++ b/po/km.po
+@@ -1,176 +1,179 @@
+-# translation of gnome-menus.master.po to Khmer
+-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+-# This file is distributed under the same license as the PACKAGE package.
+-# Khoem Sokhem <khoemsokhem@khmeros.info>, 2012.
+-# Morn Met <mornmet@khmeros.info>, 2012.
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: gnome-menus.master\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2011-12-20 08:46+0000\n"
+-"PO-Revision-Date: 2012-03-01 10:09+0700\n"
+-"Last-Translator: Morn Met <mornmet@khmeros.info>\n"
+-"Language-Team: Khmer <support@khmeros.info>\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: WordForge 0.8 RC1\n"
+-"X-Language: km-KH\n"
+-
+-#: ../desktop-directories/AudioVideo.directory.in.h:1
+-msgid "Multimedia menu"
+-msgstr "ម៉ឺនុយពហុមេឌៀ"
+-
+-#: ../desktop-directories/AudioVideo.directory.in.h:2
+-msgid "Sound & Video"
+-msgstr "សំឡេង និងវីដេអូ"
+-
+-#: ../desktop-directories/Development.directory.in.h:1
+-msgid "Programming"
+-msgstr "ការសរសេរកម្មវិធី"
+-
+-#: ../desktop-directories/Development.directory.in.h:2
+-msgid "Tools for software development"
+-msgstr "ឧបករណ៍សម្រាប់ការអភិវឌ្ឍកម្មវិធី"
+-
+-#: ../desktop-directories/Education.directory.in.h:1
+-msgid "Education"
+-msgstr "ការអប់រំ"
+-
+-#: ../desktop-directories/Game.directory.in.h:1
+-msgid "Games"
+-msgstr "ល្បែង"
+-
+-#: ../desktop-directories/Game.directory.in.h:2
+-msgid "Games and amusements"
+-msgstr "ល្បែង និងការកម្សាន្ត"
+-
+-#: ../desktop-directories/Graphics.directory.in.h:1
+-msgid "Graphics"
+-msgstr "ក្រាហ្វិក"
+-
+-#: ../desktop-directories/Graphics.directory.in.h:2
+-msgid "Graphics applications"
+-msgstr "កម្មវិធីក្រាហ្វិក"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:1
+-msgid "Hardware"
+-msgstr "ផ្នែករឹង"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:2
+-msgid "Settings for several hardware devices"
+-msgstr "ការកំណត់ឧបករណ៍ផ្នែករឹងមួយចំនួន"
+-
+-#: ../desktop-directories/Network.directory.in.h:1
+-msgid "Internet"
+-msgstr "អ៊ីនធឺណិត"
+-
+-#: ../desktop-directories/Network.directory.in.h:2
+-msgid "Programs for Internet access such as web and email"
+-msgstr "កម្មវិធីសម្រាប់ដំណើរការអ៊ីនធឺណិតដូចជា បណ្ដាញ និងអ៊ីមែល"
+-
+-#: ../desktop-directories/Office.directory.in.h:1
+-msgid "Office"
+-msgstr "ការិយាល័យ"
+-
+-#: ../desktop-directories/Office.directory.in.h:2
+-msgid "Office Applications"
+-msgstr "កម្មវិធីការិយាល័យ"
+-
+-#. Translators: this is Personal as in "Personal settings"
+-#: ../desktop-directories/Personal.directory.in.h:2
+-msgid "Personal"
+-msgstr "ផ្ទាល់ខ្លួន"
+-
+-#: ../desktop-directories/Personal.directory.in.h:3
+-msgid "Personal settings"
+-msgstr "ការកំណត់ផ្ទាល់ខ្លួន"
+-
+-#: ../desktop-directories/System.directory.in.h:1
+-msgid "System"
+-msgstr "ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System.directory.in.h:2
+-msgid "System settings"
+-msgstr "ការកំណត់ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System-Tools.directory.in.h:1
+-msgid "System Tools"
+-msgstr "ឧបករណ៍ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System-Tools.directory.in.h:2
+-msgid "System configuration and monitoring"
+-msgstr "ការត្រួតពិនិត្យ និងការកំណត់រចនាសម្ព័ន្ធប្រព័ន្ធ"
+-
+-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+-msgid "Universal Access"
+-msgstr "ការចូលដំណើរការសកល"
+-
+-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+-msgid "Universal Access Settings"
+-msgstr "ការកំណត់ការចូលដំណើរការសកល"
+-
+-#: ../desktop-directories/Utility.directory.in.h:1
+-msgid "Accessories"
+-msgstr "ប្រដាប់ប្រដា"
+-
+-#: ../desktop-directories/Utility.directory.in.h:2
+-msgid "Desktop accessories"
+-msgstr "ប្រដាប់ប្រដាផ្ទៃតុ"
+-
+-#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
+-msgid "Applications"
+-msgstr "កម្មវិធី"
+-
+-#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
+-msgid "Applications that did not fit in other categories"
+-msgstr "កម្មវិធីដែលមិនសមនៅក្នុងប្រភេទផ្សេងៗទៀត"
+-
+-#: ../desktop-directories/X-GNOME-Other.directory.in.h:2
+-msgid "Other"
+-msgstr "ផ្សេងទៀត"
+-
+-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
+-msgid "Menu Editor"
+-msgstr "កម្មវិធីកែសម្រួលម៉ឺនុយ"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:1
+-msgid "Edit Menus"
+-msgstr "កែសម្រួលម៉ឺនុយ"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:2
+-msgid "_Applications:"
+-msgstr "កម្មវិធី ៖"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:3
+-msgid "_Defaults"
+-msgstr "លំនាំដើម"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:4
+-msgid "_Menus:"
+-msgstr "ម៉ឺនុយ ៖"
+-
+-#. Translators: %s is the version number
+-#: ../simple-editor/GMenuSimpleEditor/main.py:44
+-#, python-format
+-msgid "Simple Menu Editor %s"
+-msgstr "កម្មវិធីកែសម្រួលម៉ឺនុយសាមញ្ញ %s"
+-
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124
+-msgid "Name"
+-msgstr "ឈ្មោះ"
+-
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116
+-msgid "Show"
+-msgstr "បង្ហាញ"
+-
+-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
+-msgid ""
+-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
+-"environment"
+-msgstr ""
+-"រកមិនឃើញថតផ្ទះ ៖ មិនត្រូវបានកំណត់នៅក្នុង /etc/passwd "
+-"និងគ្មានតម្លៃសម្រាប់ $HOME នៅក្នុងបរិស្ថានទេ"
+-
++# translation of gnome-menus.master.po to Khmer
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# Khoem Sokhem <khoemsokhem@khmeros.info>, 2012.
++# Morn Met <mornmet@khmeros.info>, 2012.
++msgid ""
++msgstr ""
++"Project-Id-Version: gnome-menus.master\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
++"menus&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2014-04-02 07:20+0000\n"
++"PO-Revision-Date: 2012-03-01 10:09+0700\n"
++"Last-Translator: Morn Met <mornmet@khmeros.info>\n"
++"Language-Team: Khmer <support@khmeros.info>\n"
++"Language: \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: WordForge 0.8 RC1\n"
++"X-Language: km-KH\n"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:1
++msgid "Sound & Video"
++msgstr "សំឡេង និងវីដេអូ"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:2
++msgid "Multimedia menu"
++msgstr "ម៉ឺនុយពហុមេឌៀ"
++
++#: ../desktop-directories/Development.directory.in.h:1
++msgid "Programming"
++msgstr "ការសរសេរកម្មវិធី"
++
++#: ../desktop-directories/Development.directory.in.h:2
++msgid "Tools for software development"
++msgstr "ឧបករណ៍សម្រាប់ការអភិវឌ្ឍកម្មវិធី"
++
++#: ../desktop-directories/Education.directory.in.h:1
++msgid "Education"
++msgstr "ការអប់រំ"
++
++#: ../desktop-directories/Game.directory.in.h:1
++msgid "Games"
++msgstr "ល្បែង"
++
++#: ../desktop-directories/Game.directory.in.h:2
++msgid "Games and amusements"
++msgstr "ល្បែង និងការកម្សាន្ត"
++
++#: ../desktop-directories/Graphics.directory.in.h:1
++msgid "Graphics"
++msgstr "ក្រាហ្វិក"
++
++#: ../desktop-directories/Graphics.directory.in.h:2
++msgid "Graphics applications"
++msgstr "កម្មវិធីក្រាហ្វិក"
++
++#: ../desktop-directories/Network.directory.in.h:1
++msgid "Internet"
++msgstr "អ៊ីនធឺណិត"
++
++#: ../desktop-directories/Network.directory.in.h:2
++msgid "Programs for Internet access such as web and email"
++msgstr "កម្មវិធីសម្រាប់ដំណើរការអ៊ីនធឺណិតដូចជា បណ្ដាញ និងអ៊ីមែល"
++
++#: ../desktop-directories/Office.directory.in.h:1
++msgid "Office"
++msgstr "ការិយាល័យ"
++
++#: ../desktop-directories/Office.directory.in.h:2
++msgid "Office Applications"
++msgstr "កម្មវិធីការិយាល័យ"
++
++#: ../desktop-directories/System-Tools.directory.in.h:1
++msgid "System Tools"
++msgstr "ឧបករណ៍ប្រព័ន្ធ"
++
++#: ../desktop-directories/System-Tools.directory.in.h:2
++msgid "System configuration and monitoring"
++msgstr "ការត្រួតពិនិត្យ និងការកំណត់រចនាសម្ព័ន្ធប្រព័ន្ធ"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
++msgid "Universal Access"
++msgstr "ការចូលដំណើរការសកល"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
++msgid "Universal Access Settings"
++msgstr "ការកំណត់ការចូលដំណើរការសកល"
++
++#: ../desktop-directories/Utility.directory.in.h:1
++msgid "Accessories"
++msgstr "ប្រដាប់ប្រដា"
++
++#: ../desktop-directories/Utility.directory.in.h:2
++msgid "Desktop accessories"
++msgstr "ប្រដាប់ប្រដាផ្ទៃតុ"
++
++#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
++msgid "Applications"
++msgstr "កម្មវិធី"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
++msgid "Other"
++msgstr "ផ្សេងទៀត"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:2
++msgid "Applications that did not fit in other categories"
++msgstr "កម្មវិធីដែលមិនសមនៅក្នុងប្រភេទផ្សេងៗទៀត"
++
++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1
++msgid "Sundry"
++msgstr "ផ្សេងៗ"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
++msgid "Utilities"
++msgstr "ការប្រើប្រាស់"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
++msgid "Small but useful GNOME tools"
++msgstr "តូចប៉ុន្តែជាកម្មវិធី GNOME ដ៏មានប្រយោជន៍"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1
++#| msgid "Applications"
++msgid "Web Applications"
++msgstr "កម្មវិធីបណ្ដាញ"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2
++msgid "Applications and sites saved from Web"
++msgstr "បានរក្សាទុកកម្មវិធី និងតំបន់បណ្ដាញពីបណ្ដាញ"
++
++#~ msgid "Hardware"
++#~ msgstr "ផ្នែករឹង"
++
++#~ msgid "Settings for several hardware devices"
++#~ msgstr "ការកំណត់ឧបករណ៍ផ្នែករឹងមួយចំនួន"
++
++#~ msgid "Personal"
++#~ msgstr "ផ្ទាល់ខ្លួន"
++
++#~ msgid "Personal settings"
++#~ msgstr "ការកំណត់ផ្ទាល់ខ្លួន"
++
++#~ msgid "System"
++#~ msgstr "ប្រព័ន្ធ"
++
++#~ msgid "System settings"
++#~ msgstr "ការកំណត់ប្រព័ន្ធ"
++
++#~ msgid "Menu Editor"
++#~ msgstr "កម្មវិធីកែសម្រួលម៉ឺនុយ"
++
++#~ msgid "Edit Menus"
++#~ msgstr "កែសម្រួលម៉ឺនុយ"
++
++#~ msgid "_Applications:"
++#~ msgstr "កម្មវិធី ៖"
++
++#~ msgid "_Defaults"
++#~ msgstr "លំនាំដើម"
++
++#~ msgid "_Menus:"
++#~ msgstr "ម៉ឺនុយ ៖"
++
++#~ msgid "Simple Menu Editor %s"
++#~ msgstr "កម្មវិធីកែសម្រួលម៉ឺនុយសាមញ្ញ %s"
++
++#~ msgid "Name"
++#~ msgstr "ឈ្មោះ"
++
++#~ msgid "Show"
++#~ msgstr "បង្ហាញ"
++
++#~ msgid ""
++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
++#~ "in environment"
++#~ msgstr ""
++#~ "រកមិនឃើញថតផ្ទះ ៖ មិនត្រូវបានកំណត់នៅក្នុង /etc/passwd និងគ្មានតម្លៃសម្រាប់ $HOME នៅក្នុង"
++#~ "បរិស្ថានទេ"
+diff --git a/po/kn.po b/po/kn.po
+index 89045ea..fb69edf 100644
+--- a/po/kn.po
++++ b/po/kn.po
+@@ -1,7 +1,7 @@
+ # translation of gnome-menus.master.kn.po to Kannada
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++# 
+ # Shankar Prasad <svenkate@redhat.com>, 2007, 2008, 2009, 2010, 2012, 2013.
+ msgid ""
+ msgstr ""
+@@ -9,15 +9,15 @@ msgstr ""
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+ "POT-Creation-Date: 2013-02-19 22:31+0000\n"
+-"PO-Revision-Date: 2013-03-18 16:02+0530\n"
++"PO-Revision-Date: 2013-03-18 06:32-0400\n"
+ "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+ "Language-Team: Kannada <kde-i18n-doc@kde.org>\n"
+-"Language: kn\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 1.5\n"
+-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
++"Language: kn\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Zanata 3.2.3\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+ msgid "Sound & Video"
+@@ -126,125 +126,3 @@ msgstr "ಜಾಲ ಅನ್ವಯಗಳು"
+ #: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2
+ msgid "Applications and sites saved from Web"
+ msgstr "ಜಾಲದಿಂದ ಉಳಿಸಲಾದ ಅನ್ವಯಗಳು ಮತ್ತು ತಾಣಗಳು"
+-
+-#~ msgid "Hardware"
+-#~ msgstr "ಯಂತ್ರಾಂಶ"
+-
+-#~ msgid "Settings for several hardware devices"
+-#~ msgstr "ಹಲವಾರು ಯಂತ್ರಾಂಶ ಸಾಧನಗಳಿಗಾಗಿನ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Personal"
+-#~ msgstr "ವೈಯಕ್ತಿಕ"
+-
+-#~ msgid "Personal settings"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "System"
+-#~ msgstr "ವ್ಯವಸ್ಥೆ"
+-
+-#~ msgid "System settings"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Menu Editor"
+-#~ msgstr "ಪರಿವಿಡಿ ಸಂಪಾದಕ"
+-
+-#~ msgid "Edit Menus"
+-#~ msgstr "ಪರಿವಿಡಿಗಳನ್ನು ಸಂಪಾದಿಸು"
+-
+-#~ msgid "_Defaults"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ (_D)"
+-
+-#~ msgid "_Menus:"
+-#~ msgstr "ಪರಿವಿಡಿಗಳು (_M):"
+-
+-#~ msgid "_Applications:"
+-#~ msgstr "ಅನ್ವಯಗಳು (_A):"
+-
+-#~ msgid "Simple Menu Editor %s"
+-#~ msgstr "ಸರಳ ಪರಿವಿಡಿ ಸಂಪಾದಕ %s"
+-
+-#~ msgid "Name"
+-#~ msgstr "ಹೆಸರು"
+-
+-#~ msgid "Show"
+-#~ msgstr "ತೋರಿಸು"
+-
+-#~ msgid ""
+-#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
+-#~ "in environment"
+-#~ msgstr ""
+-#~ "ನೆಲೆ ಕಡತಕೋಶವು ಕಂಡುಬಂದಿಲ್ಲ: /etc/passwd ನಲ್ಲಿ ಸಿದ್ಧಗೊಳಿಸಿಲ್ಲ ಹಾಗು ವಾತಾವರಣದಲ್ಲಿ "
+-#~ "$HOME ಗೆ ಯಾವುದೇ ಮೌಲ್ಯವಿಲ್ಲ"
+-
+-#~ msgid "Internet and Network"
+-#~ msgstr "ಅಂತರಜಾಲ ಹಾಗು ಜಾಲಬಂಧ"
+-
+-#~ msgid "Network-related settings"
+-#~ msgstr "ಜಾಲಬಂಧ-ಸಂಬಂಧಿತ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Look and Feel"
+-#~ msgstr "ನೋಟ ಹಾಗು ಮಾಟ"
+-
+-#~ msgid "Settings controlling the desktop appearance and behavior"
+-#~ msgstr "ಗಣಕತೆರೆಯ ಸ್ವರೂಪ ಹಾಗು ವರ್ತನೆಯನ್ನು ನಿಯಂತ್ರಿಸುವ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Administration"
+-#~ msgstr "ನಿರ್ವಹಣೆ"
+-
+-#~ msgid "Change system-wide settings (affects all users)"
+-#~ msgstr ""
+-#~ "ವ್ಯವಸ್ಥೆಯಾದ್ಯಂತದ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸಿ (ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಮೇಲೂ ಪರಿಣಾಮಬೀರುತ್ತದೆ)"
+-
+-#~ msgid "Personal preferences"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Preferences"
+-#~ msgstr "ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Personal preferences and administration settings"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು ಹಾಗು ನಿರ್ವಹಣಾ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Menu file"
+-#~ msgstr "ಮೆನು ಕಡತ"
+-
+-#~ msgid "MENU_FILE"
+-#~ msgstr "MENU_FILE"
+-
+-#~ msgid "Monitor for menu changes"
+-#~ msgstr "ಮೆನು ಬದಲಾವಣೆಗಳ ಪರಿವೀಕ್ಷಕ"
+-
+-#~ msgid "Include <Exclude>d entries"
+-#~ msgstr "<Exclude>ಆದಂತಹ ನಮೂದುಗಳನ್ನು ಅಡಕಗೊಳಿಸು"
+-
+-#~ msgid "Include NoDisplay=true entries"
+-#~ msgstr "NoDisplay=true ನಮೂದನ್ನು ಅಡಕಗೊಳಿಸು"
+-
+-#~ msgid "Invalid desktop file ID"
+-#~ msgstr "ಸಿಂಧುವಲ್ಲದ ಗಣಕತೆರೆ ಕಡತ ID"
+-
+-#~ msgid "[Invalid Filename]"
+-#~ msgstr "[ಸಿಂಧುವಲ್ಲದ ಕಡತಹೆಸರು]"
+-
+-#~ msgid " <excluded>"
+-#~ msgstr " <excluded>"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "\n"
+-#~ "\n"
+-#~ "==== Menu changed, reloading ====\n"
+-#~ "\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "\n"
+-#~ "\n"
+-#~ "==== ಮೆನು ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ, ಪುನಃ ಲೋಡ್ ಆಗುತ್ತಿದೆ ====\n"
+-#~ "\n"
+-#~ "\n"
+-
+-#~ msgid "Menu tree is empty"
+-#~ msgstr "ಮೆನು ವೃಕ್ಷವು(tree) ಖಾಲಿ ಇದೆ"
+-
+-#~ msgid "- test GNOME's implementation of the Desktop Menu Specification"
+-#~ msgstr "- ಗಣಕತೆರೆ ಮೆನು ಸೂಚನೆಗಳ GNOME ನ ಅನ್ವಯಿಸುವಿಕೆಯನ್ನು ಪರೀಕ್ಷಿಸುತ್ತದೆ"
+diff --git a/po/ml.po b/po/ml.po
+index 3ab08af..bdee38d 100644
+--- a/po/ml.po
++++ b/po/ml.po
+@@ -5,14 +5,15 @@
+ # Ani Peter <peter.ani@gmail.com>, 2006.
+ # Praveen|പ്രവീണ്‍ A|എ <pravi.a@gmail.com>, 2007,2008.
+ # Ani Peter <apeter@redhat.com>, 2007, 2012, 2013.
++# Akhilan <akhilkrishnans@gmail.com, 2013
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-menus.master.ml\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-03-18 10:33+0000\n"
+-"PO-Revision-Date: 2013-03-25 19:17+0530\n"
+-"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
++"POT-Creation-Date: 2013-10-23 14:43+0000\n"
++"PO-Revision-Date: 2013-11-03 14:28+0530\n"
++"Last-Translator: Akhilan <akhilkrishnans@gmail.com>\n"
+ "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
+ "Language: ml\n"
+ "MIME-Version: 1.0\n"
+@@ -27,7 +28,7 @@ msgstr "ശബ്ദവും ചലച്ചിത്രവും"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:2
+ msgid "Multimedia menu"
+-msgstr "മള്‍ട്ടീമീഡിയ മെനു"
++msgstr "മള്‍ട്ടീമീഡിയ ഐച്ഛികം"
+ 
+ #: ../desktop-directories/Development.directory.in.h:1
+ msgid "Programming"
+@@ -95,7 +96,7 @@ msgstr "ഉപകരണങ്ങള്‍"
+ 
+ #: ../desktop-directories/Utility.directory.in.h:2
+ msgid "Desktop accessories"
+-msgstr "പണിയിടോപകരണങ്ങള്‍"
++msgstr "പണിയിട ഉപകരണങ്ങള്‍"
+ 
+ #: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
+ msgid "Applications"
+diff --git a/po/sv.po b/po/sv.po
+index 6b7970d..5be5a40 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -1,22 +1,25 @@
+ # Swedish messages for gnome-menus.
+-# Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
++# Copyright © 2004, 2005, 2006, 2007, 2009, 2012, 2014 Free Software Foundation, Inc.
+ # Christian Rose <menthos@menthos.com>, 2004, 2005, 2006.
+ # Daniel Nylander <po@danielnylander.se>, 2007, 2009, 2012.
++# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014.
+ #
+ # $Id: sv.po,v 1.7 2006/01/08 20:42:48 menthos Exp $
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-menus\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-09-02 11:58+0200\n"
+-"PO-Revision-Date: 2012-09-02 11:59+0100\n"
+-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
++"menus&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2014-04-10 07:23+0000\n"
++"PO-Revision-Date: 2014-04-10 17:46+0100\n"
++"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+ "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+ "Language: sv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 1.5.4\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+ msgid "Sound & Video"
+@@ -54,14 +57,6 @@ msgstr "Grafik"
+ msgid "Graphics applications"
+ msgstr "Grafikprogram"
+ 
+-#: ../desktop-directories/Hardware.directory.in.h:1
+-msgid "Hardware"
+-msgstr "Hårdvara"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:2
+-msgid "Settings for several hardware devices"
+-msgstr "Inställningar för ett flertal hårdvaruenheter"
+-
+ #: ../desktop-directories/Network.directory.in.h:1
+ msgid "Internet"
+ msgstr "Internet"
+@@ -78,23 +73,6 @@ msgstr "Kontor"
+ msgid "Office Applications"
+ msgstr "Kontorsprogram"
+ 
+-#. Translators: this is Personal as in "Personal settings"
+-#: ../desktop-directories/Personal.directory.in.h:2
+-msgid "Personal"
+-msgstr "Personligt"
+-
+-#: ../desktop-directories/Personal.directory.in.h:3
+-msgid "Personal settings"
+-msgstr "Personliga inställningar"
+-
+-#: ../desktop-directories/System.directory.in.h:1
+-msgid "System"
+-msgstr "System"
+-
+-#: ../desktop-directories/System.directory.in.h:2
+-msgid "System settings"
+-msgstr "Systeminställningar"
+-
+ #: ../desktop-directories/System-Tools.directory.in.h:1
+ msgid "System Tools"
+ msgstr "Systemverktyg"
+@@ -131,6 +109,18 @@ msgstr "Övrigt"
+ msgid "Applications that did not fit in other categories"
+ msgstr "Program som inte passar in i någon annan kategori"
+ 
++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1
++msgid "Sundry"
++msgstr "Diverse"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
++msgid "Utilities"
++msgstr "Nyttoprogram"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
++msgid "Small but useful GNOME tools"
++msgstr "Små men praktiska GNOME-verktyg"
++
+ #: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1
+ msgid "Web Applications"
+ msgstr "Webbapplikationer"
+@@ -139,44 +129,54 @@ msgstr "Webbapplikationer"
+ msgid "Applications and sites saved from Web"
+ msgstr "Program och webbplatser sparade från webben"
+ 
+-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
+-msgid "Menu Editor"
+-msgstr "Menyredigerare"
++#~ msgid "Hardware"
++#~ msgstr "Hårdvara"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:1
+-msgid "Edit Menus"
+-msgstr "Redigera menyer"
++#~ msgid "Settings for several hardware devices"
++#~ msgstr "Inställningar för ett flertal hårdvaruenheter"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:2
+-msgid "_Defaults"
+-msgstr "_Standardalternativ"
++#~ msgid "Personal"
++#~ msgstr "Personligt"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:3
+-msgid "_Menus:"
+-msgstr "_Menyer:"
++#~ msgid "Personal settings"
++#~ msgstr "Personliga inställningar"
++
++#~ msgid "System"
++#~ msgstr "System"
++
++#~ msgid "System settings"
++#~ msgstr "Systeminställningar"
++
++#~ msgid "Menu Editor"
++#~ msgstr "Menyredigerare"
++
++#~ msgid "Edit Menus"
++#~ msgstr "Redigera menyer"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:4
+-msgid "_Applications:"
+-msgstr "_Program:"
++#~ msgid "_Defaults"
++#~ msgstr "_Standardalternativ"
+ 
+-#. Translators: %s is the version number
+-#: ../simple-editor/GMenuSimpleEditor/main.py:44
+-#, python-format
+-msgid "Simple Menu Editor %s"
+-msgstr "Enkel menyredigerare %s"
++#~ msgid "_Menus:"
++#~ msgstr "_Menyer:"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124
+-msgid "Name"
+-msgstr "Namn"
++#~ msgid "_Applications:"
++#~ msgstr "_Program:"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116
+-msgid "Show"
+-msgstr "Visa"
++#~ msgid "Simple Menu Editor %s"
++#~ msgstr "Enkel menyredigerare %s"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
+-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
+-msgstr "Kan inte hitta hemkatalogen: inte angiven i /etc/passwd och inget värde för $HOME i miljön"
++#~ msgid "Name"
++#~ msgstr "Namn"
++
++#~ msgid "Show"
++#~ msgstr "Visa"
++
++#~ msgid ""
++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
++#~ "in environment"
++#~ msgstr ""
++#~ "Kan inte hitta hemkatalogen: inte angiven i /etc/passwd och inget värde "
++#~ "för $HOME i miljön"
+ 
+ #~ msgid "Internet and Network"
+ #~ msgstr "Internet och nätverk"
+diff --git a/util/test-menu-spec.c b/util/test-menu-spec.c
+index c48509e..b2c3926 100644
+--- a/util/test-menu-spec.c
++++ b/util/test-menu-spec.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -207,8 +205,6 @@ main (int argc, char **argv)
+   GMenuTreeFlags      flags;
+   GError             *error = NULL;
+ 
+-  g_type_init ();
+-
+ #if 0
+   /* See comment when defining _() at the top of this file. */
+   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
index c0e893134..32f437da6 100644
--- a/extra/gnome-tetravex/PKGBUILD
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213498 2014-05-23 23:54:54Z heftig $
+# $Id: PKGBUILD 214062 2014-06-03 08:27:39Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-tetravex
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Complete the puzzle by matching numbered tiles"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ install=gnome-tetravex.install
 url="https://live.gnome.org/Tetravex"
 groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a3537a99cd80297dbbeeed8d603659231909ebd1e8a0c054feb58d81ccbff2b6')
+sha256sums=('67a31750a22a2a852d2abcd66428c281ce0faadebac884e910d6a1b0c6e21752')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index cf2620beb..05012ec31 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213458 2014-05-23 23:30:09Z heftig $
+# $Id: PKGBUILD 214058 2014-06-03 08:24:58Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.11
+pkgver=0.20.12
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=(i686 x86_64)
@@ -12,12 +12,15 @@ license=(LGPL)
 depends=(gssdp util-linux)
 makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('648ad091c7bae1c2b45ae9b9c0052f8c72903ce740d6e5be945c493dec85c160')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('205d47b950a1b7190df1115f454cb38a44d71aacfec75d4287299e400e139b69')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
   sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
+}
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --with-context-manager=linux
   make
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 32955986c..ee78b959c 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213876 2014-05-31 01:09:27Z eric $
+# $Id: PKGBUILD 214111 2014-06-03 20:37:30Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=icewm
 pkgver=1.3.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A Window Manager designed for speed, usability, and consistency"
 arch=('i686' 'x86_64')
 url="http://www.icewm.org/"
@@ -11,17 +11,20 @@ license=('LGPL')
 depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
 makedepends=('xorg-mkfontdir')
 source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
-        ignore_workarea_hints.patch icewm-cpustatus.patch icewm-1.3.8-shutdown-reboot-command.patch)
+        ignore_workarea_hints.patch icewm-cpustatus.patch icewm-1.3.8-shutdown-reboot-command.patch
+        icewm-1.3.8-remain_power.patch)
 sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8'
           '88b4b198827d6590901c2c8bdba8826d928f6f1a'
           '0f4a02153496dadd26742f6bd3bdc166d7eafaed'
-          'd85d35b756ca2d5283f10de9d9bca23d39c68f6f')
+          'd85d35b756ca2d5283f10de9d9bca23d39c68f6f'
+          '1c5e7361bec5f4775da86f663ecb397e711b8486')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
   patch -p2 -i "${srcdir}/icewm-cpustatus.patch"
   patch -p1 -i "${srcdir}/icewm-1.3.8-shutdown-reboot-command.patch"
+  patch -p1 -i "${srcdir}/icewm-1.3.8-remain_power.patch"
 }
 
 build() {
diff --git a/extra/icewm/icewm-1.3.8-remain_power.patch b/extra/icewm/icewm-1.3.8-remain_power.patch
new file mode 100644
index 000000000..bbf650e9a
--- /dev/null
+++ b/extra/icewm/icewm-1.3.8-remain_power.patch
@@ -0,0 +1,32 @@
+--- icewm-1.3.8-orig/src/aapm.cc	2013-11-17 17:54:39.000000000 +0100
++++ icewm-1.3.8/src/aapm.cc	2014-05-30 21:50:54.131868164 +0200
+@@ -614,6 +614,11 @@
+         }
+         strcat3(buf, "/sys/class/power_supply/", BATname, "/current_now", sizeof(buf));
+         fd = fopen(buf, "r");
++        if (fd == NULL) {
++        	strcat3(buf, "/sys/class/power_supply/", BATname, "/power_now", sizeof(buf));
++        	fd = fopen(buf, "r");
++	}
++
+         if (fd != NULL && fgets(buf, sizeof(buf), fd)) {
+                 //In case it contains non-numeric value
+                 if (sscanf(buf,"%d", &BATrate) <= 0) {
+@@ -697,7 +703,7 @@
+            batCount++;
+         }
+ 
+-        if (!Tool &&
++        if (Tool &&
+             taskBarShowApmTime &&
+             BATpresent == BAT_PRESENT &&
+             //bios calculates remaining time, only while discharging
+@@ -706,7 +711,7 @@
+             //did we parse the needed values successfully?
+             BATcapacity_full >= 0 && BATcapacity_remain >= 0 && BATrate > 0) {
+             BATtime_remain = (int) (60 * (double)(BATcapacity_remain) / BATrate);
+-            sprintf(bat_info, "%d:%02d", BATtime_remain / 60, BATtime_remain % 60);
++            sprintf(bat_info, "%d:%02d (%3.0f%%)", BATtime_remain / 60, BATtime_remain % 60,100 * (double)BATcapacity_remain / BATcapacity_full);
+         }
+         else if (BATpresent == BAT_PRESENT &&
+                  //did we parse the needed values successfully?
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 44f9958a8..4015b9eef 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 210508 2014-04-14 20:07:10Z jgc $
+# $Id: PKGBUILD 214060 2014-06-03 08:26:17Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=1.0.0
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde')
+sha256sums=('887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libatasmart/0001-Dont-test-undefined-bits.patch b/extra/libatasmart/0001-Dont-test-undefined-bits.patch
new file mode 100644
index 000000000..9b32bba5d
--- /dev/null
+++ b/extra/libatasmart/0001-Dont-test-undefined-bits.patch
@@ -0,0 +1,28 @@
+Author: Phillip Susi <psusi@ubuntu.com>
+Subject: fix an incorrect IO error reading SMART status
+Description: The read SMART status command's return status
+ was testing for a success/failure value that included 8
+ bits that are "N/A" according to the standard, and required
+ that they be zeros.  At least some drives do not fill them
+ with zeros, so correct this by masking off the undefined
+ bits.
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61998
+Bug-Ubuntu: https://launchpad.net/bugs/1143495
+
+Index: b/atasmart.c
+===================================================================
+--- a/atasmart.c
++++ b/atasmart.c
+@@ -925,10 +925,10 @@
+         /* SAT/USB bridges truncate packets, so we only check for 4F,
+          * not for 2C on those */
+         if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x00C2U)) &&
+-            cmd[4] == htons(0x4F00U))
++            (cmd[4] & htons(0xFF00U)) == htons(0x4F00U))
+                 *good = TRUE;
+         else if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x002CU)) &&
+-                 cmd[4] == htons(0xF400U))
++                 (cmd[4] & htons(0xFF00U)) == htons(0xF400U))
+                 *good = FALSE;
+         else {
+                 errno = EIO;
diff --git a/extra/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch b/extra/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch
new file mode 100644
index 000000000..0655ca48e
--- /dev/null
+++ b/extra/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch
@@ -0,0 +1,93 @@
+From 6846b7c2431dbeaddd9f931c609b522c04e55732 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Fri, 19 Mar 2010 14:56:06 +0100
+Subject: [PATCH 2/2] Drop our own "many bad sectors" heuristic
+
+This currently causes a lot of false positives, because in many cases our
+threshold is either overly pessimistically low, or the raw value is implausibly
+high. Just use the normalized values vs. threshold for now.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25772
+Bug-Ubuntu: https://launchpad.net/bugs/438136
+---
+ atasmart.c |   33 +++++++++++----------------------
+ 1 files changed, 11 insertions(+), 22 deletions(-)
+
+Index: libatasmart/atasmart.c
+===================================================================
+--- libatasmart.orig/atasmart.c	2012-05-23 08:34:14.007836753 +0200
++++ libatasmart/atasmart.c	2012-05-23 08:34:43.903835695 +0200
+@@ -130,6 +130,8 @@
+         SkBool current_pending_sector_found:1;
+         uint64_t reallocated_sector_count;
+         uint64_t current_pending_sector;
++        SkBool reallocated_sector_count_bad:1;
++        SkBool current_pending_sector_bad:1;
+ 
+         void *blob;
+ };
+@@ -2190,16 +2192,23 @@
+         if (a->pretty_unit != SK_SMART_ATTRIBUTE_UNIT_SECTORS)
+                 return;
+ 
++        if (!a->current_value_valid)
++                return;
++
+         if (!strcmp(a->name, "reallocated-sector-count")) {
+                 if (a->pretty_value > d->reallocated_sector_count)
+                         d->reallocated_sector_count = a->pretty_value;
+                 d->reallocated_sector_count_found = TRUE;
++                if (a->good_now_valid && !a->good_now)
++                        d->reallocated_sector_count_bad = TRUE;
+         }
+ 
+         if (!strcmp(a->name, "current-pending-sector")) {
+                 if (a->pretty_value > d->current_pending_sector)
+                         d->current_pending_sector = a->pretty_value;
+                 d->current_pending_sector_found = TRUE;
++                if (a->good_now_valid && !a->good_now)
++                        d->current_pending_sector_bad = TRUE;
+         }
+ }
+ 
+@@ -2255,24 +2264,9 @@
+         return _P(map[overall]);
+ }
+ 
+-static uint64_t u64log2(uint64_t n) {
+-        unsigned r;
+-
+-        if (n <= 1)
+-                return 0;
+-
+-        r = 0;
+-        for (;;) {
+-                n = n >> 1;
+-                if (!n)
+-                        return r;
+-                r++;
+-        }
+-}
+-
+ int sk_disk_smart_get_overall(SkDisk *d, SkSmartOverall *overall) {
+         SkBool good;
+-        uint64_t sectors, sector_threshold;
++        uint64_t sectors;
+ 
+         assert(d);
+         assert(overall);
+@@ -2293,13 +2287,7 @@
+                         return -1;
+                 sectors = 0;
+         } else {
+-
+-                /* We use log2(n_sectors)*1024 as a threshold here. We
+-                 * had to pick something, and this makes a bit of
+-                 * sense, or doesn't it? */
+-                sector_threshold = u64log2(d->size/512) * 1024;
+-
+-                if (sectors >= sector_threshold) {
++                if (d->reallocated_sector_count_bad || d->current_pending_sector_bad) {
+                         *overall = SK_SMART_OVERALL_BAD_SECTOR_MANY;
+                         return 0;
+                 }
diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD
index 1c400b8f9..1080bdad6 100644
--- a/extra/libatasmart/PKGBUILD
+++ b/extra/libatasmart/PKGBUILD
@@ -1,16 +1,27 @@
-# $Id: PKGBUILD 198126 2013-10-30 12:56:47Z allan $
+# $Id: PKGBUILD 214091 2014-06-03 12:43:59Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libatasmart
 pkgver=0.19
-pkgrel=2
+pkgrel=3
 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('udev')
+depends=('libsystemd')
+makedepends=('systemd')
 url="http://0pointer.de/blog/projects/being-smart.html"
-source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz")
-md5sums=('53afe2b155c36f658e121fe6def33e77')
+source=(http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz
+        0001-Dont-test-undefined-bits.patch
+        0002-Drop-our-own-many-bad-sectors-heuristic.patch)
+md5sums=('53afe2b155c36f658e121fe6def33e77'
+         'eb5d0468b0d47d099e5164372a21f9da'
+         'cebd1fbed0b05d0458177d6d3ad4ea3f')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-Dont-test-undefined-bits.patch
+  patch -Np1 -i ../0002-Drop-our-own-many-bad-sectors-heuristic.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index 4bfadd516..f81d2bae9 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 210510 2014-04-14 20:07:12Z jgc $
+# $Id: PKGBUILD 214070 2014-06-03 08:40:17Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgdata
-pkgver=0.15.0
+pkgver=0.15.1
 pkgrel=1
 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'uhttpmock')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4845359248d8623d51e766fdc3eceaffaafa7a8a1fe8bec426b7604b711ae198')
+sha256sums=('28b08e7e546bcf2978c7f32ce79b86e9fcc096104f1d7563276d28cd83c0758b')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libinput/PKGBUILD b/extra/libinput/PKGBUILD
index e0009dbc8..108ee2798 100644
--- a/extra/libinput/PKGBUILD
+++ b/extra/libinput/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot
 
 pkgname=libinput
-pkgver=0.1.0
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="library that handles input devices for display servers and other applications that need to directly deal with input devices."
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('mtdev' 'libsystemd' 'libevdev')
 makedepends=('systemd')
 options=('!libtool')
 source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('63214727be5115806868ebdf9470fe2ddf4b2e1229102e080237380d22b40a1d')
+sha256sums=('822bad40cac1fa90e38569da189a989d4b5f8ef58ec6bc6fefef8b78f825599c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libmms/PKGBUILD b/extra/libmms/PKGBUILD
index f0e6de4ea..5284934f9 100644
--- a/extra/libmms/PKGBUILD
+++ b/extra/libmms/PKGBUILD
@@ -1,16 +1,16 @@
-#$Id: PKGBUILD 198198 2013-10-30 13:24:10Z allan $
+#$Id: PKGBUILD 214054 2014-06-03 08:21:41Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmms
-pkgver=0.6.2
+pkgver=0.6.4
 pkgrel=1
 pkgdesc="MMS stream protocol library"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/libmms/"
 license=(LGPL)
-depends=('glib2')
+depends=('glibc')
 source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9f63aa363deb4874e072a45850161bff')
+md5sums=('d6b665b335a6360e000976e770da7691')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD
deleted file mode 100644
index 20112ca6f..000000000
--- a/extra/libmsn/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 206627 2014-03-03 18:10:46Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Charly Ghislain <charlyghislain@gmail.com>
-
-pkgname=libmsn
-pkgver=4.2.1
-pkgrel=2
-pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
-url="http://sourceforge.net/projects/libmsn/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('openssl')
-makedepends=('cmake')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'gcc47.patch')
-md5sums=('38e46e589720eefd71f92b6b76993bf0'
-         '2d202093a4434af14b79f02f3bc2c0fc')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/gcc47.patch
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libmsn/gcc47.patch b/extra/libmsn/gcc47.patch
deleted file mode 100644
index aa6e9b08c..000000000
--- a/extra/libmsn/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN libmsn-4.2.1.orig//msn/util.cpp libmsn-4.2.1//msn/util.cpp
---- libmsn-4.2.1.orig//msn/util.cpp	2009-07-22 21:57:10.000000000 +0200
-+++ libmsn-4.2.1//msn/util.cpp	2012-05-07 12:45:47.581493381 +0200
-@@ -30,6 +30,7 @@
- #include <openssl/rand.h>
- #include <cstring>
- #include <sys/timeb.h>
-+#include <unistd.h>
- #include "md5.h"
- #include "libsiren/siren7.h"
- 
diff --git a/extra/librevenge/PKGBUILD b/extra/librevenge/PKGBUILD
index 46ea87abc..afa1495f1 100644
--- a/extra/librevenge/PKGBUILD
+++ b/extra/librevenge/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213420 2014-05-23 18:41:23Z andyrtr $
+# $Id: PKGBUILD 214098 2014-06-03 15:15:48Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=librevenge
-pkgver=0.0.0
+pkgver=0.0.1
 pkgrel=1
 pkgdesc="library for REVerses ENGineered formats filters"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('boost-libs')
 makedepends=('boost' 'doxygen')
 checkdepends=('cppunit')
 source=(http://sourceforge.net/projects/libwpd/files/librevenge/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz)
-sha1sums=('f0ede0ca90d9c94fc613407d16cb097101cd86ef')
+sha1sums=('8987ad4202035bf3bfa6d879fc689ecb9b4a80d9')
 
 build() {
 	cd $pkgname-$pkgver
@@ -22,7 +22,7 @@ build() {
 
 check() {
 	cd $pkgname-$pkgver
-	make check || /bin/true # i686 test suite fails
+	make check # || /bin/true # i686 test suite fails
 }
 
 package() {
diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD
index 51bdbcf02..e2b930f2c 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -1,19 +1,23 @@
-# $Id: PKGBUILD 198273 2013-10-30 13:51:56Z allan $
+# $Id: PKGBUILD 214083 2014-06-03 12:19:03Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcursor
 pkgver=1.1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="X cursor management library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'libxrender')
+optdepends=('gnome-themes-standard: fallback icon theme')
 makedepends=('xorg-util-macros')
-source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
-sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df')
+backup=(usr/share/icons/default/index.theme)
+source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2
+        index.theme)
+sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df'
+            '9e2707bc3466b848a70687ae34b505930b9c260a49b3d2f014145e70c4cddcd6')
 
 build() {
   cd "${srcdir}/libXcursor-${pkgver}"
@@ -25,6 +29,9 @@ package() {
   cd "${srcdir}/libXcursor-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
+  install -m755 -d "${pkgdir}/usr/share/icons/default"
+  install -m644 "$srcdir"/index.theme "${pkgdir}/usr/share/icons/default/"
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/libxcursor/index.theme b/extra/libxcursor/index.theme
new file mode 100644
index 000000000..cda0b19ae
--- /dev/null
+++ b/extra/libxcursor/index.theme
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=Adwaita
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index bb137ddf7..f4d592619 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212041 2014-05-04 16:12:39Z giovanni $
+# $Id: PKGBUILD 214103 2014-06-03 16:14:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=3.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('133ff0a31047d2c0b4640943a58535a7'
+md5sums=('15de301a673b77f839325dba10ed4fc0'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD
index 7cae118ac..33b727d45 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199304 2013-11-09 22:09:32Z bisson $
+# $Id: PKGBUILD 214079 2014-06-03 11:03:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=mpc
-pkgver=0.25
+pkgver=0.26
 pkgrel=1
 pkgdesc='Minimalist command line interface to MPD'
 url='http://www.musicpd.org/clients/mpc/'
@@ -14,7 +14,7 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('libmpdclient')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha1sums=('c649cd19e4195749ca7da309c10acd53ac139b49' 'SKIP')
+sha1sums=('dd1577cfff1d8324bc27c97fb26d88b845118800' 'SKIP')
 
 options=('!emptydirs')
 
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 54bead0dd..0ec7cf6c8 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210575 2014-04-15 07:59:02Z jgc $
+# $Id: PKGBUILD 214064 2014-06-03 08:31:33Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.22.1
+pkgver=0.22.2
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=(i686 x86_64)
@@ -21,7 +21,7 @@ backup=(etc/rygel.conf)
 install=rygel.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('11e18979682685e1c078f0205cc1e53f3e7adac768eeba91026677972b8976bc')
+sha256sums=('1adc3a008bd6433ee7e6fd64935ad8edd5906fc96e2f652ca18b80a3253fe87e')
 
 build() {
   cd $pkgname-$pkgver
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-04 04:00:35 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-04 04:00:35 +0000
commit	8faa42b28f39ace5fc2c3ec8a054fa0a5b246eab (patch)
tree	e904cb1dcc6423b414bae5d134c3ea83ac01efa1
parent	11196316291f49af2bacd1b4531e0a548729dea2 (diff)