diff options
Diffstat (limited to 'extra')
25 files changed, 9362 insertions, 132 deletions
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index a89768e62..4fd53e435 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161645 2012-06-13 05:17:46Z eric $ +# $Id: PKGBUILD 170547 2012-11-08 15:28:30Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=4 +pkgrel=5 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64') url="http://www.alsaplayer.org/" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 264d15a97..2b6362be8 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169422 2012-10-20 20:58:46Z dreisner $ +# $Id: PKGBUILD 170572 2012-11-09 00:21:44Z eric $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,15 +9,15 @@ pkgname=bitlbee pkgver=3.0.6 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64') depends=('openssl' 'glib2') -makedepends=('asciidoc' 'libotr') +makedepends=('asciidoc' 'libotr3') optdepends=('skype4py: to use skyped' - 'libotr: for OTR encryption support' + 'libotr3: for OTR encryption support' 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' @@ -32,28 +32,32 @@ backup=('etc/bitlbee/bitlbee.conf' 'etc/xinetd.d/bitlbee') install=bitlbee.install -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=openssl \ - --strip=0 \ - --otr=plugin \ - --skype=plugin - - make +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --pidfile=/run/bitlbee/bitlbee.pid \ + --ipcsocket=/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/usr/lib/systemd/system \ + --ssl=openssl \ + --strip=0 \ + --otr=plugin \ + --skype=plugin + + # hacky: build against libotr3 + sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings + sed -i 's,#include.*libotr,&3,' otr.h + + make } package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} - install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" - install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" - install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" + install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" + install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" + install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee" + install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" } diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index 293a419df..03b662c86 100644 --- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -1,4 +1,4 @@ -From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001 +From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001 From: Richard Hughes <richard@hughsie.com> Date: Fri, 21 Sep 2012 11:56:53 +0100 Subject: [PATCH] power and media-keys: Use logind for suspending and @@ -13,13 +13,16 @@ blanking the screen using the screensaver and also poking the screensaver on resume. https://bugzilla.gnome.org/show_bug.cgi?id=680689 + +Conflicts: + plugins/power/gsd-power-manager.c --- plugins/common/Makefile.am | 4 +- plugins/common/gsd-power-helper.c | 203 -------- plugins/common/gsd-power-helper.h | 35 -- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- - plugins/power/gsd-power-manager.c | 699 +++++++++++++++++++--------- - 5 files changed, 595 insertions(+), 502 deletions(-) + plugins/power/gsd-power-manager.c | 697 +++++++++++++++++++--------- + 5 files changed, 594 insertions(+), 501 deletions(-) delete mode 100644 plugins/common/gsd-power-helper.c delete mode 100644 plugins/common/gsd-power-helper.h @@ -545,7 +548,7 @@ index 9c84d7f..a2f277e 100644 GsdMediaKeysManager * diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 070cf32..18fcedf 100644 +index 1c594d8..bb7224c 100644 --- a/plugins/power/gsd-power-manager.c +++ b/plugins/power/gsd-power-manager.c @@ -1,7 +1,7 @@ @@ -584,7 +587,7 @@ index 070cf32..18fcedf 100644 /* Keep this in sync with gnome-shell */ #define SCREENSAVER_FADE_TIME 10 /* seconds */ -@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate +@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate ca_context *canberra_context; ca_proplist *critical_alert_loop_props; guint32 critical_alert_timeout_id; @@ -596,6 +599,7 @@ index 070cf32..18fcedf 100644 - guint lid_close_safety_timer_id; GtkStatusIcon *status_icon; guint xscreensaver_watchdog_timer_id; + gboolean is_virtual_machine; + + /* systemd stuff */ + GDBusProxy *logind_proxy; @@ -607,7 +611,7 @@ index 070cf32..18fcedf 100644 }; enum { -@@ -217,8 +227,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); +@@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); static gchar *engine_get_summary (GsdPowerManager *manager); static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); static void do_lid_closed_action (GsdPowerManager *manager); @@ -618,7 +622,7 @@ index 070cf32..18fcedf 100644 G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) -@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void) +@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) } static void @@ -676,7 +680,7 @@ index 070cf32..18fcedf 100644 do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type) { -@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager, +@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, switch (action_type) { case GSD_POWER_ACTION_SUSPEND: @@ -699,7 +703,7 @@ index 070cf32..18fcedf 100644 break; case GSD_POWER_ACTION_BLANK: ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager, +@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, return ret; } @@ -795,7 +799,7 @@ index 070cf32..18fcedf 100644 } /* Sets up a timer to be triggered some seconds after closing the laptop lid -@@ -2226,82 +2222,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) +@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) * again in the timeout handler to see if we can suspend then. */ static void @@ -880,8 +884,7 @@ index 070cf32..18fcedf 100644 - g_warning ("failed to turn the panel off after lid close: %s", + g_warning ("failed to turn the panel on after lid open: %s", error->message); -- g_error_free (error); -+ g_clear_error (&error); + g_clear_error (&error); } - /* only toggle keyboard if present and not already toggled */ @@ -911,7 +914,7 @@ index 070cf32..18fcedf 100644 /* play a sound, using sounds from the naming spec */ ca_context_play (manager->priv->canberra_context, 0, CA_PROP_EVENT_ID, "lid-close", -@@ -2309,21 +2296,22 @@ do_lid_closed_action (GsdPowerManager *manager) +@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), NULL); @@ -944,7 +947,7 @@ index 070cf32..18fcedf 100644 static void up_client_changed_cb (UpClient *client, GsdPowerManager *manager) { -@@ -2343,6 +2331,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) +@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) if (manager->priv->lid_is_closed == tmp) return; manager->priv->lid_is_closed = tmp; @@ -952,7 +955,7 @@ index 070cf32..18fcedf 100644 /* fake a keypress */ if (tmp) -@@ -3294,30 +3283,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) +@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) } static void @@ -983,7 +986,7 @@ index 070cf32..18fcedf 100644 idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gchar *signal_name, -@@ -3469,75 +3434,38 @@ out: +@@ -3477,75 +3442,38 @@ out: } static void @@ -1017,7 +1020,7 @@ index 070cf32..18fcedf 100644 - NULL, - sleep_cb_screensaver_proxy_ready_cb, - manager); - } +- } -} - -static void @@ -1044,13 +1047,13 @@ index 070cf32..18fcedf 100644 - NULL, - G_DBUS_CALL_FLAGS_NONE, - -1, NULL, NULL, NULL); -- } -- + } + - /* close existing notifications on resume, the system power - * state is probably different now */ - notify_close_if_showing (manager->priv->notification_low); - notify_close_if_showing (manager->priv->notification_discharging); - +- - /* ensure we turn the panel back on after resume */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, - GNOME_RR_DPMS_ON, @@ -1083,8 +1086,8 @@ index 070cf32..18fcedf 100644 } static void -@@ -3696,6 +3624,287 @@ disable_builtin_screensaver (gpointer unused) - return TRUE; +@@ -3755,6 +3683,287 @@ out: + return ret; } +static void @@ -1224,7 +1227,7 @@ index 070cf32..18fcedf 100644 + g_debug ("Removing suspend delay inhibitor"); + close (manager->priv->inhibit_suspend_fd); + manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = TRUE; ++ manager->priv->inhibit_suspend_taken = FALSE; +} + +static gboolean @@ -1371,7 +1374,7 @@ index 070cf32..18fcedf 100644 gboolean gsd_power_manager_start (GsdPowerManager *manager, GError **error) -@@ -3705,6 +3914,25 @@ gsd_power_manager_start (GsdPowerManager *manager, +@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, g_debug ("Starting power manager"); gnome_settings_profile_start (NULL); @@ -1397,7 +1400,7 @@ index 070cf32..18fcedf 100644 /* track the active session */ manager->priv->session = gnome_settings_session_new (); g_signal_connect (manager->priv->session, "notify::state", -@@ -3719,10 +3947,6 @@ gsd_power_manager_start (GsdPowerManager *manager, +@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager, G_CALLBACK (engine_settings_key_changed_cb), manager); manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); manager->priv->up_client = up_client_new (); @@ -1408,7 +1411,7 @@ index 070cf32..18fcedf 100644 manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); -@@ -3836,6 +4060,9 @@ gsd_power_manager_start (GsdPowerManager *manager, +@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); if (manager->priv->x11_screen == NULL) return FALSE; @@ -1418,7 +1421,7 @@ index 070cf32..18fcedf 100644 /* ensure the default dpms timeouts are cleared */ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -3865,6 +4092,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) +@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) { g_debug ("Stopping power manager"); @@ -1430,7 +1433,7 @@ index 070cf32..18fcedf 100644 if (manager->priv->bus_cancellable != NULL) { g_cancellable_cancel (manager->priv->bus_cancellable); g_object_unref (manager->priv->bus_cancellable); -@@ -3876,8 +4108,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) +@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) manager->priv->introspection_data = NULL; } @@ -1439,7 +1442,7 @@ index 070cf32..18fcedf 100644 g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); g_clear_object (&manager->priv->connection); -@@ -3885,6 +4115,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) +@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) g_clear_object (&manager->priv->settings); g_clear_object (&manager->priv->settings_screensaver); g_clear_object (&manager->priv->up_client); @@ -1459,7 +1462,7 @@ index 070cf32..18fcedf 100644 g_clear_object (&manager->priv->x11_screen); g_ptr_array_unref (manager->priv->devices_array); -@@ -3918,6 +4161,8 @@ static void +@@ -3980,6 +4223,8 @@ static void gsd_power_manager_init (GsdPowerManager *manager) { manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); @@ -1469,5 +1472,5 @@ index 070cf32..18fcedf 100644 static void -- -1.7.12.2 +1.8.0 diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index f3b64da0e..31a28fc46 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169912 2012-10-30 22:34:42Z heftig $ +# $Id: PKGBUILD 170537 2012-11-08 11:30:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.6.1 -pkgrel=2 +pkgver=3.6.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -15,18 +15,13 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - screensaver.patch 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) -sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a' - 'd2c32fa0262e4d0e97fc07fb631ad2627b4f2ae273e2cb3028236d9725711880' - 'f23db348593f58da755889928d7fa75817479d9ad5be67cc7a2f8cbc5db23632') +sha256sums=('d718f9fdf3bb26fc71861548f834364955d37532871ec2e89a5ad0d63857215f' + 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109') build() { cd $pkgname-$pkgver - # Disable X's built-in screensaver - patch -Np1 -i ../screensaver.patch - # logind key handling FS#31801, patch from Fedora # rebased onto screensaver.patch patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 3b25df8c1..73d2c34bb 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169924 2012-10-30 22:45:10Z heftig $ +# $Id: PKGBUILD 170557 2012-11-08 17:08:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -23,7 +23,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d') +sha256sums=('2d70b7f148c29fde365cac1afcbfdd77b7f5fc0f65e60f3790c702121c65d7c8') build() { cd $pkgname-$pkgver diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index f7a46fc26..8661ce662 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169925 2012-10-30 22:45:13Z heftig $ +# $Id: PKGBUILD 170546 2012-11-08 15:26:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" @@ -13,11 +13,12 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f') +sha256sums=('6a800c98731a93cc2b204abceeb37c55bb5529724115f5d4c4f91bd1ade67d42') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug + ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug \ + --libdir=/usr/lib make } diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 582870046..b011bda16 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169935 2012-10-30 22:45:43Z heftig $ +# $Id: PKGBUILD 170567 2012-11-08 21:26:53Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 pkgver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,16 +14,22 @@ options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + git-fixes.patch settings.ini wacom.patch) sha256sums=('fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996' + '7a6c2597faf616302455597f4720a8a8b151ffbea700e45affc4818620f31f36' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { cd "gtk+-$pkgver" + # Apply fixes from upstream git. Mainly memleak and rendering fixes + patch -Np1 -i ../git-fixes.patch # Partially revert BGO#673440 in order to fix BGO#674157 patch -Np1 -i ../wacom.patch + autoreconf -fi + CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/git-fixes.patch b/extra/gtk3/git-fixes.patch new file mode 100644 index 000000000..06041e326 --- /dev/null +++ b/extra/gtk3/git-fixes.patch @@ -0,0 +1,8346 @@ +diff --git a/configure.ac b/configure.ac +index 9e24e90..00f38b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -714,7 +714,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :, + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), + gobject gmodule-no-export) + +-dnl + dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. + dnl + gtk_save_LIBS=$LIBS +@@ -748,6 +747,19 @@ else + AC_MSG_RESULT([no]) + fi + ++# ++# Disable deprecation checks for all libraries we depend on on stable branches. ++# This is so newer versions of those libraries don't cause more warnings with ++# a stable GTK version. ++# We don't ever want to turn off deprecation warnings for master however, because ++# that's where we get rid of deprecated API we use. ++# ++if test m4_eval(gtk_minor_version % 2) = 0 ; then ++ AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, ++ [Disable deprecation warnings from glib]) ++fi ++ ++dnl + saved_cflags="$CFLAGS" + saved_ldflags="$LDFLAGS" + +diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c +index 712f232..5d04cdb 100644 +--- a/gdk/quartz/gdkevents-quartz.c ++++ b/gdk/quartz/gdkevents-quartz.c +@@ -1439,7 +1439,8 @@ gdk_event_translate (GdkEvent *event, + if (dx != 0.0 || dy != 0.0) + { + #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER +- if (gdk_quartz_osx_version() >= GDK_OSX_LION &[nsevent hasPreciseScrollingDeltas]) ++ if (gdk_quartz_osx_version() >= GDK_OSX_LION && ++ [nsevent hasPreciseScrollingDeltas]) + { + GdkEvent *emulated_event; + +diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c +index ce5777a..7088780 100644 +--- a/gtk/a11y/gtktextcellaccessible.c ++++ b/gtk/a11y/gtktextcellaccessible.c +@@ -552,7 +552,6 @@ gtk_text_cell_accessible_get_character_extents (AtkText *text, + gail_renderer = GTK_RENDERER_CELL_ACCESSIBLE (text); + g_object_get (gail_renderer, "renderer", >k_renderer, NULL); + g_object_get (gtk_renderer, "text", &renderer_text, NULL); +- g_object_unref (gtk_renderer); + if (renderer_text == NULL) + { + g_object_unref (gtk_renderer); +diff --git a/gtk/gtk-default.css b/gtk/gtk-default.css +index 2e21518..d084828 100644 +--- a/gtk/gtk-default.css ++++ b/gtk/gtk-default.css +@@ -715,5 +715,17 @@ GtkCalendar.button:hover { + } + + .spinner:active { ++ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)), ++ -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); + animation: spinner 1s infinite linear; + } +diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c +index 94115a5..b522948 100644 +--- a/gtk/gtkcsscomputedvalues.c ++++ b/gtk/gtkcsscomputedvalues.c +@@ -499,6 +499,8 @@ gtk_css_computed_values_create_css_animations (GtkCssComputedValues *values, + _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)), + _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)), + _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100)); ++ ++ _gtk_css_keyframes_unref (keyframes); + } + values->animations = g_slist_prepend (values->animations, animation); + } +diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c +index a241733..8497339 100644 +--- a/gtk/gtkcssimagegradient.c ++++ b/gtk/gtkcssimagegradient.c +@@ -79,7 +79,7 @@ fade_pattern (cairo_pattern_t *pattern, + cairo_pattern_add_color_stop_rgba (result, o, r, g, b, a * opacity); + } + +- return pattern; ++ return result; + } + + static cairo_pattern_t * +@@ -102,7 +102,7 @@ transition_pattern (cairo_pattern_t *start, + { + case CAIRO_PATTERN_TYPE_LINEAR: + cairo_pattern_get_linear_points (start, &sx0, &sy0, &sx1, &sy1); +- cairo_pattern_get_linear_points (start, &ex0, &ey0, &ex1, &ey1); ++ cairo_pattern_get_linear_points (end, &ex0, &ey0, &ex1, &ey1); + result = cairo_pattern_create_linear ((1 - progress) * sx0 + progress * ex0, + (1 - progress) * sx1 + progress * ex1, + (1 - progress) * sy0 + progress * ey0, +@@ -110,7 +110,7 @@ transition_pattern (cairo_pattern_t *start, + break; + case CAIRO_PATTERN_TYPE_RADIAL: + cairo_pattern_get_radial_circles (start, &sx0, &sy0, &sr0, &sx1, &sy1, &sr1); +- cairo_pattern_get_radial_circles (start, &ex0, &ey0, &er0, &ex1, &ey1, &er1); ++ cairo_pattern_get_radial_circles (end, &ex0, &ey0, &er0, &ex1, &ey1, &er1); + result = cairo_pattern_create_radial ((1 - progress) * sx0 + progress * ex0, + (1 - progress) * sy0 + progress * ey0, + (1 - progress) * sr0 + progress * er0, +@@ -128,7 +128,7 @@ transition_pattern (cairo_pattern_t *start, + double so, sr, sg, sb, sa, eo, er, eg, eb, ea; + + cairo_pattern_get_color_stop_rgba (start, i, &so, &sr, &sg, &sb, &sa); +- cairo_pattern_get_color_stop_rgba (start, i, &eo, &er, &eg, &eb, &ea); ++ cairo_pattern_get_color_stop_rgba (end, i, &eo, &er, &eg, &eb, &ea); + + cairo_pattern_add_color_stop_rgba (result, + (1 - progress) * so + progress * eo, +diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c +index dbc14f0..2f4bd28 100644 +--- a/gtk/gtkentrycompletion.c ++++ b/gtk/gtkentrycompletion.c +@@ -656,8 +656,7 @@ gtk_entry_completion_set_property (GObject *object, + break; + + case PROP_TEXT_COLUMN: +- gtk_entry_completion_set_text_column (completion, +- g_value_get_int (value)); ++ priv->text_column = g_value_get_int (value); + break; + + case PROP_INLINE_COMPLETION: +diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c +index dab06c3..09d6303 100644 +--- a/gtk/gtkfilechooserdefault.c ++++ b/gtk/gtkfilechooserdefault.c +@@ -6798,7 +6798,7 @@ file_system_model_got_thumbnail (GObject *object, GAsyncResult *res, gpointer da + copy_attribute (info, queried, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED); + copy_attribute (info, queried, G_FILE_ATTRIBUTE_STANDARD_ICON); + +- _gtk_file_system_model_update_file (model, file, info, FALSE); ++ _gtk_file_system_model_update_file (model, file, info); + + g_object_unref (info); + +diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c +index 1e5ffe3..132902b 100644 +--- a/gtk/gtkfilesystemmodel.c ++++ b/gtk/gtkfilesystemmodel.c +@@ -42,6 +42,9 @@ + * the special kind of usage for "search" and "recent-files", where the file chooser gives the model the + * files to be displayed. + * ++ * Internal data structure ++ * ----------------------- ++ * + * Each file is kept in a FileModelNode structure. Each FileModelNode holds a GFile* and other data. All the + * node structures have the same size, determined at runtime, depending on the number of columns that were passed + * to _gtk_file_system_model_new() or _gtk_file_system_model_new_for_directory() (that is, the size of a node is +@@ -66,7 +69,14 @@ + * + * Each FileModelNode has a node->visible field, which indicates whether the node is visible in the GtkTreeView. + * A node may be invisible if, for example, it corresponds to a hidden file and the file chooser is not showing +- * hidden files. ++ * hidden files. Also, a file filter may be explicitly set onto the model, for example, to only show files that ++ * match "*.jpg". In this case, node->filtered_out says whether the node failed the filter. The ultimate ++ * decision on whether a node is visible or not in the treeview is distilled into the node->visible field. ++ * The reason for having a separate node->filtered_out field is so that the file chooser can query whether ++ * a (filtered-out) folder should be made sensitive in the GUI. ++ * ++ * Visible rows vs. possibly-invisible nodes ++ * ----------------------------------------- + * + * Since not all nodes in the model->files array may be visible, we need a way to map visible row indexes from + * the treeview to array indexes in our array of files. And thus we introduce a bit of terminology: +@@ -95,6 +105,16 @@ + * + * You never access a node->row directly. Instead, call node_get_tree_row(). That function will validate the nodes + * up to the sought one if the node is not valid yet, and it will return a proper 0-based row. ++ * ++ * Sorting ++ * ------- ++ * ++ * The model implements the GtkTreeSortable interface. To avoid re-sorting ++ * every time a node gets added (which would lead to O(n^2) performance during ++ * the initial population of the model), the model can freeze itself (with ++ * freeze_updates()) during the intial population process. When the model is ++ * frozen, sorting will not happen. The model will sort itself when the freeze ++ * count goes back to zero, via corresponding calls to thaw_updates(). + */ + + /*** DEFINES ***/ +@@ -184,6 +204,12 @@ struct _GtkFileSystemModelClass + void (*finished_loading) (GtkFileSystemModel *model, GError *error); + }; + ++static void freeze_updates (GtkFileSystemModel *model); ++static void thaw_updates (GtkFileSystemModel *model); ++ ++static guint node_get_for_file (GtkFileSystemModel *model, ++ GFile *file); ++ + static void add_file (GtkFileSystemModel *model, + GFile *file, + GFileInfo *info); +@@ -263,13 +289,13 @@ node_invalidate_index (GtkFileSystemModel *model, guint id) + } + + static GtkTreePath * +-gtk_tree_path_new_from_node (GtkFileSystemModel *model, guint id) ++tree_path_new_from_node (GtkFileSystemModel *model, guint id) + { +- guint i = node_get_tree_row (model, id); ++ guint r = node_get_tree_row (model, id); + +- g_assert (i < model->files->len); ++ g_assert (r < model->files->len); + +- return gtk_tree_path_new_from_indices (i, -1); ++ return gtk_tree_path_new_from_indices (r, -1); + } + + static void +@@ -278,7 +304,7 @@ emit_row_inserted_for_node (GtkFileSystemModel *model, guint id) + GtkTreePath *path; + GtkTreeIter iter; + +- path = gtk_tree_path_new_from_node (model, id); ++ path = tree_path_new_from_node (model, id); + ITER_INIT_FROM_INDEX (model, &iter, id); + gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter); + gtk_tree_path_free (path); +@@ -290,7 +316,7 @@ emit_row_changed_for_node (GtkFileSystemModel *model, guint id) + GtkTreePath *path; + GtkTreeIter iter; + +- path = gtk_tree_path_new_from_node (model, id); ++ path = tree_path_new_from_node (model, id); + ITER_INIT_FROM_INDEX (model, &iter, id); + gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter); + gtk_tree_path_free (path); +@@ -570,7 +596,7 @@ gtk_file_system_model_get_path (GtkTreeModel *tree_model, + + g_return_val_if_fail (ITER_IS_VALID (model, iter), NULL); + +- return gtk_tree_path_new_from_node (model, ITER_INDEX (iter)); ++ return tree_path_new_from_node (model, ITER_INDEX (iter)); + } + + static void +@@ -1097,7 +1123,7 @@ thaw_func (gpointer data) + { + GtkFileSystemModel *model = data; + +- _gtk_file_system_model_thaw_updates (model); ++ thaw_updates (model); + model->dir_thaw_source = 0; + + return FALSE; +@@ -1119,7 +1145,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da + { + if (model->dir_thaw_source == 0) + { +- _gtk_file_system_model_freeze_updates (model); ++ freeze_updates (model); + model->dir_thaw_source = gdk_threads_add_timeout_full (IO_PRIORITY + 1, + 50, + thaw_func, +@@ -1168,7 +1194,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da + { + g_source_remove (model->dir_thaw_source); + model->dir_thaw_source = 0; +- _gtk_file_system_model_thaw_updates (model); ++ thaw_updates (model); + } + + g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0, error); +@@ -1189,13 +1215,19 @@ gtk_file_system_model_query_done (GObject * object, + GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */ + GFile *file = G_FILE (object); + GFileInfo *info; ++ guint id; + + info = g_file_query_info_finish (file, res, NULL); + if (info == NULL) + return; + + gdk_threads_enter (); +- _gtk_file_system_model_update_file (model, file, info, TRUE); ++ ++ _gtk_file_system_model_update_file (model, file, info); ++ ++ id = node_get_for_file (model, file); ++ gtk_file_system_model_sort_node (model, id); ++ + gdk_threads_leave (); + } + +@@ -1433,14 +1465,14 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model) + return; + } + +- _gtk_file_system_model_freeze_updates (model); ++ freeze_updates (model); + + /* start at index 1, don't change the editable */ + for (i = 1; i < model->files->len; i++) + node_compute_visibility_and_filters (model, i); + + model->filter_on_thaw = FALSE; +- _gtk_file_system_model_thaw_updates (model); ++ thaw_updates (model); + } + + /** +@@ -1775,6 +1807,33 @@ _gtk_file_system_model_get_iter_for_file (GtkFileSystemModel *model, + return TRUE; + } + ++/* When an element is added or removed to the model->files array, we need to ++ * update the model->file_lookup mappings of (node, index), as the indexes ++ * change. This function adds the specified increment to the index in that pair ++ * if the index is equal or after the specified id. We use this to slide the ++ * mappings up or down when a node is added or removed, respectively. ++ */ ++static void ++adjust_file_lookup (GtkFileSystemModel *model, guint id, int increment) ++{ ++ GHashTableIter iter; ++ gpointer key; ++ gpointer value; ++ ++ g_hash_table_iter_init (&iter, model->file_lookup); ++ ++ while (g_hash_table_iter_next (&iter, &key, &value)) ++ { ++ guint index = GPOINTER_TO_UINT (value); ++ ++ if (index >= id) ++ { ++ index += increment; ++ g_hash_table_iter_replace (&iter, GUINT_TO_POINTER (index)); ++ } ++ } ++} ++ + /** + * add_file: + * @model: the model +@@ -1825,6 +1884,7 @@ remove_file (GtkFileSystemModel *model, + { + FileModelNode *node; + guint id; ++ guint row; + + g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); + g_return_if_fail (G_IS_FILE (file)); +@@ -1834,17 +1894,22 @@ remove_file (GtkFileSystemModel *model, + return; + + node = get_node (model, id); +- node_set_visible_and_filtered_out (model, id, FALSE, FALSE); ++ row = node_get_tree_row (model, id); ++ ++ node_invalidate_index (model, id); + + g_hash_table_remove (model->file_lookup, file); + g_object_unref (node->file); ++ adjust_file_lookup (model, id, -1); + + if (node->info) + g_object_unref (node->info); + + g_array_remove_index (model->files, id); +- g_hash_table_remove_all (model->file_lookup); +- /* We don't need to resort, as removing a row doesn't change the sorting order */ ++ ++ /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */ ++ ++ emit_row_deleted_for_row (model, row); + } + + /** +@@ -1852,7 +1917,6 @@ remove_file (GtkFileSystemModel *model, + * @model: the model + * @file: the file + * @info: the new file info +- * @requires_resort: FIXME: get rid of this argument + * + * Tells the file system model that the file changed and that the + * new @info should be used for it now. If the file is not part of +@@ -1861,8 +1925,7 @@ remove_file (GtkFileSystemModel *model, + void + _gtk_file_system_model_update_file (GtkFileSystemModel *model, + GFile *file, +- GFileInfo *info, +- gboolean requires_resort) ++ GFileInfo *info) + { + FileModelNode *node; + guint i, id; +@@ -1894,9 +1957,6 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model, + + if (node->visible) + emit_row_changed_for_node (model, id); +- +- if (requires_resort) +- gtk_file_system_model_sort_node (model, id); + } + + /** +@@ -1967,17 +2027,16 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model) + } + + /** +- * _gtk_file_system_model_freeze_updates: ++ * freeze_updates: + * @model: a #GtkFileSystemModel + * +- * Freezes most updates on the model, so that performing multiple +- * operations on the files in the model do not cause any events. +- * Use _gtk_file_system_model_thaw_updates() to resume proper +- * operations. It is fine to call this function multiple times as +- * long as freeze and thaw calls are balanced. ++ * Freezes most updates on the model, so that performing multiple operations on ++ * the files in the model do not cause any events. Use thaw_updates() to resume ++ * proper operations. It is fine to call this function multiple times as long as ++ * freeze and thaw calls are balanced. + **/ +-void +-_gtk_file_system_model_freeze_updates (GtkFileSystemModel *model) ++static void ++freeze_updates (GtkFileSystemModel *model) + { + g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); + +@@ -1985,14 +2044,13 @@ _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model) + } + + /** +- * _gtk_file_system_model_thaw_updates: ++ * thaw_updates: + * @model: a #GtkFileSystemModel + * +- * Undoes the effect of a previous call to +- * _gtk_file_system_model_freeze_updates() ++ * Undoes the effect of a previous call to freeze_updates() + **/ +-void +-_gtk_file_system_model_thaw_updates (GtkFileSystemModel *model) ++static void ++thaw_updates (GtkFileSystemModel *model) + { + gboolean stuff_added; + +diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h +index 2264fcf..575cc23 100644 +--- a/gtk/gtkfilesystemmodel.h ++++ b/gtk/gtkfilesystemmodel.h +@@ -71,8 +71,7 @@ void _gtk_file_system_model_add_and_query_file (GtkFileSystemMode + const char *attributes); + void _gtk_file_system_model_update_file (GtkFileSystemModel *model, + GFile *file, +- GFileInfo *info, +- gboolean requires_resort); ++ GFileInfo *info); + + void _gtk_file_system_model_set_show_hidden (GtkFileSystemModel *model, + gboolean show_hidden); +@@ -82,8 +81,6 @@ void _gtk_file_system_model_set_show_files (GtkFileSystemModel + gboolean show_files); + void _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model, + gboolean show_folders); +-void _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model); +-void _gtk_file_system_model_thaw_updates (GtkFileSystemModel *model); + void _gtk_file_system_model_clear_cache (GtkFileSystemModel *model, + int column); + +diff --git a/gtk/gtkgradient.c b/gtk/gtkgradient.c +index 3c16fca..8c779d8 100644 +--- a/gtk/gtkgradient.c ++++ b/gtk/gtkgradient.c +@@ -327,6 +327,7 @@ _gtk_gradient_resolve_full (GtkGradient *gradient, + { + rgba = *_gtk_css_rgba_value_get_rgba (val); + *dependencies = _gtk_css_dependencies_union (*dependencies, stop_deps); ++ _gtk_css_value_unref (val); + } + else + { +@@ -467,7 +468,7 @@ gtk_gradient_fade (GtkGradient *gradient, + + stop = &g_array_index (gradient->stops, ColorStop, i); + color = gtk_symbolic_color_new_alpha (stop->color, opacity); +- gtk_gradient_add_color_stop (gradient, stop->offset, color); ++ gtk_gradient_add_color_stop (faded, stop->offset, color); + gtk_symbolic_color_unref (color); + } + +diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c +index 6f23914..49ee9bc 100644 +--- a/gtk/gtkiconhelper.c ++++ b/gtk/gtkiconhelper.c +@@ -20,6 +20,7 @@ + #include "config.h" + + #include "gtkiconhelperprivate.h" ++#include "string.h" + + G_DEFINE_TYPE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT) + +@@ -466,7 +467,8 @@ _gtk_icon_helper_set_stock_id (GtkIconHelper *self, + { + _gtk_icon_helper_clear (self); + +- if (stock_id != NULL) ++ if (stock_id != NULL && ++ g_strcmp0 (stock_id, "") != 0) + { + self->priv->storage_type = GTK_IMAGE_STOCK; + self->priv->stock_id = g_strdup (stock_id); +diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c +index b46dd3a..ef8f3cd 100644 +--- a/gtk/gtkmenubutton.c ++++ b/gtk/gtkmenubutton.c +@@ -806,6 +806,23 @@ gtk_menu_button_get_menu_model (GtkMenuButton *menu_button) + return menu_button->priv->model; + } + ++static void ++set_align_widget_pointer (GtkMenuButton *menu_button, ++ GtkWidget *align_widget) ++{ ++ GtkMenuButtonPrivate *priv; ++ ++ priv = menu_button->priv; ++ ++ if (priv->align_widget) ++ g_object_remove_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); ++ ++ priv->align_widget = align_widget; ++ ++ if (align_widget) ++ g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); ++} ++ + /** + * gtk_menu_button_set_align_widget: + * @menu_button: a #GtkMenuButton +@@ -832,10 +849,7 @@ gtk_menu_button_set_align_widget (GtkMenuButton *menu_button, + if (priv->align_widget == align_widget) + return; + +- priv->align_widget = align_widget; +- +- if (priv->align_widget) +- g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); ++ set_align_widget_pointer (menu_button, align_widget); + + g_object_notify (G_OBJECT (menu_button), "align-widget"); + } +@@ -926,8 +940,11 @@ gtk_menu_button_dispose (GObject *object) + menu_deactivate_cb, + object); + gtk_menu_detach (GTK_MENU (priv->popup)); ++ priv->popup = NULL; + } + ++ set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL); ++ + g_clear_object (&priv->model); + + G_OBJECT_CLASS (gtk_menu_button_parent_class)->dispose (object); +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 25c5a44..be388c9 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -221,6 +221,21 @@ gtk_scale_notify (GObject *object, + G_OBJECT_CLASS (gtk_scale_parent_class)->notify (object, pspec); + } + ++static void ++gtk_scale_update_style (GtkScale *scale) ++{ ++ gint slider_length; ++ GtkRange *range; ++ ++ range = GTK_RANGE (scale); ++ ++ gtk_widget_style_get (GTK_WIDGET (scale), ++ "slider-length", &slider_length, ++ NULL); ++ ++ gtk_range_set_min_slider_size (range, slider_length); ++ _gtk_scale_clear_layout (scale); ++} + + #define add_slider_binding(binding_set, keyval, mask, scroll) \ + gtk_binding_entry_add_signal (binding_set, keyval, mask, \ +@@ -492,6 +507,7 @@ gtk_scale_init (GtkScale *scale) + + context = gtk_widget_get_style_context (GTK_WIDGET (scale)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE); ++ gtk_scale_update_style (scale); + } + + static void +@@ -1020,18 +1036,7 @@ gtk_scale_get_mark_label_size (GtkScale *scale, + static void + gtk_scale_style_updated (GtkWidget *widget) + { +- gint slider_length; +- GtkRange *range; +- +- range = GTK_RANGE (widget); +- +- gtk_widget_style_get (widget, +- "slider-length", &slider_length, +- NULL); +- +- gtk_range_set_min_slider_size (range, slider_length); +- +- _gtk_scale_clear_layout (GTK_SCALE (widget)); ++ gtk_scale_update_style (GTK_SCALE (widget)); + + GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_updated (widget); + } +diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c +index 541acc3..9062118 100644 +--- a/gtk/gtkscrollbar.c ++++ b/gtk/gtkscrollbar.c +@@ -115,21 +115,13 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class) + } + + static void +-gtk_scrollbar_init (GtkScrollbar *scrollbar) +-{ +- GtkStyleContext *context; +- +- context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar)); +- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR); +-} +- +-static void +-gtk_scrollbar_style_updated (GtkWidget *widget) ++gtk_scrollbar_update_style (GtkScrollbar *scrollbar) + { +- GtkRange *range = GTK_RANGE (widget); + gint slider_length; + gboolean fixed_size; + gboolean has_a, has_b, has_c, has_d; ++ GtkRange *range = GTK_RANGE (scrollbar); ++ GtkWidget *widget = GTK_WIDGET (scrollbar); + + gtk_widget_style_get (widget, + "min-slider-length", &slider_length, +@@ -144,7 +136,22 @@ gtk_scrollbar_style_updated (GtkWidget *widget) + gtk_range_set_slider_size_fixed (range, fixed_size); + _gtk_range_set_steppers (range, + has_a, has_b, has_c, has_d); ++} + ++static void ++gtk_scrollbar_init (GtkScrollbar *scrollbar) ++{ ++ GtkStyleContext *context; ++ ++ context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar)); ++ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR); ++ gtk_scrollbar_update_style (scrollbar); ++} ++ ++static void ++gtk_scrollbar_style_updated (GtkWidget *widget) ++{ ++ gtk_scrollbar_update_style (GTK_SCROLLBAR (widget)); + GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_updated (widget); + } + +diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c +index a18c4cf..7929863 100644 +--- a/gtk/gtkscrolledwindow.c ++++ b/gtk/gtkscrolledwindow.c +@@ -274,9 +274,6 @@ static void gtk_scrolled_window_realize (GtkWidget *wid + static void gtk_scrolled_window_unrealize (GtkWidget *widget); + static void gtk_scrolled_window_map (GtkWidget *widget); + static void gtk_scrolled_window_unmap (GtkWidget *widget); +-static void gtk_scrolled_window_state_flags_changed (GtkWidget *widget, +- GtkStateFlags previous_state); +-static void gtk_scrolled_window_style_updated (GtkWidget *widget); + + static void gtk_scrolled_window_grab_notify (GtkWidget *widget, + gboolean was_grabbed); +@@ -352,8 +349,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) + widget_class->unrealize = gtk_scrolled_window_unrealize; + widget_class->map = gtk_scrolled_window_map; + widget_class->unmap = gtk_scrolled_window_unmap; +- widget_class->state_flags_changed = gtk_scrolled_window_state_flags_changed; +- widget_class->style_updated = gtk_scrolled_window_style_updated; + widget_class->grab_notify = gtk_scrolled_window_grab_notify; + + container_class->add = gtk_scrolled_window_add; +@@ -3379,14 +3374,13 @@ gtk_scrolled_window_realize (GtkWidget *widget) + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | +- GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK; ++ GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK | GDK_EXPOSURE_MASK; + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; + + scrolled_window->priv->overshoot_window = + gdk_window_new (gtk_widget_get_parent_window (widget), + &attributes, attributes_mask); +- + gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget); + + child_widget = gtk_bin_get_child (GTK_BIN (widget)); +@@ -3433,37 +3427,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget) + } + + static void +-_gtk_scrolled_window_update_background (GtkScrolledWindow *scrolled_window) +-{ +- GtkWidget *widget = GTK_WIDGET (scrolled_window); +- +- if (gtk_widget_get_realized (widget)) +- { +- GtkStyleContext *context; +- +- context = gtk_widget_get_style_context (widget); +- gtk_style_context_set_background (context, scrolled_window->priv->overshoot_window); +- } +-} +- +-static void +-gtk_scrolled_window_state_flags_changed (GtkWidget *widget, +- GtkStateFlags previous_state) +-{ +- _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); +- gtk_widget_queue_draw (widget); +-} +- +-static void +-gtk_scrolled_window_style_updated (GtkWidget *widget) +-{ +- GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->style_updated (widget); +- +- _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); +- gtk_widget_queue_draw (widget); +-} +- +-static void + gtk_scrolled_window_grab_notify (GtkWidget *widget, + gboolean was_grabbed) + { +diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c +index 5939e88..4b9e1e5 100644 +--- a/gtk/gtksettings.c ++++ b/gtk/gtksettings.c +@@ -1848,6 +1848,9 @@ gtk_settings_notify (GObject *object, + if (settings_update_fontconfig (settings)) + gtk_style_context_reset_widgets (priv->screen); + break; ++ case PROP_ENABLE_ANIMATIONS: ++ gtk_style_context_reset_widgets (priv->screen); ++ break; + case PROP_CURSOR_THEME_NAME: + case PROP_CURSOR_THEME_SIZE: + settings_update_cursor_theme (settings); +diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c +index b5b043d..091505a 100644 +--- a/gtk/gtksizegroup.c ++++ b/gtk/gtksizegroup.c +@@ -746,6 +746,11 @@ compute_dimension (GtkWidget *widget, + min_dimension = *minimum; + nat_dimension = *natural; + } ++ else if (!gtk_widget_get_mapped (tmp_widget) && priv->ignore_hidden) ++ { ++ min_dimension = 0; ++ nat_dimension = 0; ++ } + else + { + if (mode == GTK_SIZE_GROUP_HORIZONTAL) +@@ -754,11 +759,8 @@ compute_dimension (GtkWidget *widget, + gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension); + } + +- if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden) +- { +- min_result = MAX (min_result, min_dimension); +- nat_result = MAX (nat_result, nat_dimension); +- } ++ min_result = MAX (min_result, min_dimension); ++ nat_result = MAX (nat_result, nat_dimension); + + tmp_list = tmp_list->next; + } +diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c +index 3738d02..3d06ee4 100644 +--- a/gtk/gtktexthandle.c ++++ b/gtk/gtktexthandle.c +@@ -122,49 +122,43 @@ _gtk_text_handle_draw (GtkTextHandle *handle, + } + + static void +-_gtk_text_handle_update_shape (GtkTextHandle *handle, +- GdkWindow *window) ++_gtk_text_handle_update_shape (GtkTextHandle *handle, ++ GdkWindow *window, ++ GtkTextHandlePosition pos) + { + GtkTextHandlePrivate *priv; ++ cairo_surface_t *surface; ++ cairo_region_t *region; ++ cairo_t *cr; + + priv = handle->priv; + ++ surface = ++ gdk_window_create_similar_surface (window, ++ CAIRO_CONTENT_COLOR_ALPHA, ++ gdk_window_get_width (window), ++ gdk_window_get_height (window)); ++ ++ cr = cairo_create (surface); ++ _gtk_text_handle_draw (handle, cr, pos); ++ cairo_destroy (cr); ++ ++ region = gdk_cairo_region_create_from_surface (surface); ++ + if (gtk_widget_is_composited (priv->parent)) + gdk_window_shape_combine_region (window, NULL, 0, 0); + else +- { +- GtkTextHandlePosition pos; +- cairo_surface_t *surface; +- cairo_region_t *region; +- cairo_t *cr; +- +- if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window) +- pos = GTK_TEXT_HANDLE_POSITION_SELECTION_START; +- else if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window) +- pos = GTK_TEXT_HANDLE_POSITION_SELECTION_END; +- else +- return; ++ gdk_window_shape_combine_region (window, region, 0, 0); + +- surface = +- gdk_window_create_similar_surface (window, +- CAIRO_CONTENT_COLOR_ALPHA, +- gdk_window_get_width (window), +- gdk_window_get_height (window)); ++ gdk_window_input_shape_combine_region (window, region, 0, 0); + +- cr = cairo_create (surface); +- _gtk_text_handle_draw (handle, cr, pos); +- cairo_destroy (cr); +- +- region = gdk_cairo_region_create_from_surface (surface); +- gdk_window_shape_combine_region (window, region, 0, 0); +- +- cairo_surface_destroy (surface); +- cairo_region_destroy (region); +- } ++ cairo_surface_destroy (surface); ++ cairo_region_destroy (region); + } + + static GdkWindow * +-_gtk_text_handle_create_window (GtkTextHandle *handle) ++_gtk_text_handle_create_window (GtkTextHandle *handle, ++ GtkTextHandlePosition pos) + { + GtkTextHandlePrivate *priv; + GdkRGBA bg = { 0, 0, 0, 0 }; +@@ -200,7 +194,7 @@ _gtk_text_handle_create_window (GtkTextHandle *handle) + gdk_window_set_user_data (window, priv->parent); + gdk_window_set_background_rgba (window, &bg); + +- _gtk_text_handle_update_shape (handle, window); ++ _gtk_text_handle_update_shape (handle, window, pos); + + return window; + } +@@ -307,7 +301,7 @@ _gtk_text_handle_update_window (GtkTextHandle *handle, + gdk_window_destroy (handle_window->window); + + /* Create new window and apply old state */ +- handle_window->window = _gtk_text_handle_create_window (handle); ++ handle_window->window = _gtk_text_handle_create_window (handle, pos); + + if (visible) + { +@@ -531,9 +525,9 @@ _gtk_text_handle_set_relative_to (GtkTextHandle *handle, + { + priv->relative_to = g_object_ref (window); + priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window = +- _gtk_text_handle_create_window (handle); ++ _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_START); + priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window = +- _gtk_text_handle_create_window (handle); ++ _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_END); + priv->realized = TRUE; + } + else +@@ -580,6 +574,10 @@ _gtk_text_handle_set_mode (GtkTextHandle *handle, + } + + priv->mode = mode; ++ ++ _gtk_text_handle_update_shape (handle, ++ priv->windows[GTK_TEXT_HANDLE_POSITION_CURSOR].window, ++ GTK_TEXT_HANDLE_POSITION_CURSOR); + } + + GtkTextHandleMode +diff --git a/po/ga.po b/po/ga.po +index d0faad3..8d66617 100644 +--- a/po/ga.po ++++ b/po/ga.po +@@ -4,14 +4,14 @@ + # Seán Ó Ceallaigh <soc@users.sourceforge.net>, 1999. + # Alastair McKinstry <mckinstry@computer.org>, 2004. + # Alan Horkan <horkan@maths.tcd.ie>, 2005. +-# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010. ++# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010, 2012. + # + msgid "" + msgstr "" + "Project-Id-Version: gtk+.master\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2010-10-01 15:41-0400\n" +-"PO-Revision-Date: 2010-06-08 12:30-0600\n" ++"POT-Creation-Date: 2012-11-02 03:00-0600\n" ++"PO-Revision-Date: 2012-11-02 03:16-0600\n" + "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n" + "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" + "Language: ga\n" +@@ -20,303 +20,436 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n" + "%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n" ++"X-Generator: Gtranslator 2.91.5\n" + +-#: gdk/gdk.c:103 ++#: ../gdk/gdk.c:155 + #, c-format + msgid "Error parsing option --gdk-debug" + msgstr "Earráid agus rogha --gdk-debug á parsáil" + +-#: gdk/gdk.c:123 ++#: ../gdk/gdk.c:175 + #, c-format + msgid "Error parsing option --gdk-no-debug" + msgstr "Earráid agus rogha --gdk-no-debug á parsáil" + + #. Description of --class=CLASS in --help output +-#: gdk/gdk.c:151 ++#: ../gdk/gdk.c:203 + msgid "Program class as used by the window manager" + msgstr "Aicme chláir mar úsáidte leis an mbainisteoir fuinneoga" + + #. Placeholder in --class=CLASS in --help output +-#: gdk/gdk.c:152 ++#: ../gdk/gdk.c:204 + msgid "CLASS" + msgstr "AICME" + + #. Description of --name=NAME in --help output +-#: gdk/gdk.c:154 ++#: ../gdk/gdk.c:206 + msgid "Program name as used by the window manager" + msgstr "Ainm cláir mar úsáidte leis an mbainisteoir fuinneoga" + + #. Placeholder in --name=NAME in --help output +-#: gdk/gdk.c:155 ++#: ../gdk/gdk.c:207 + msgid "NAME" + msgstr "AINM" + + #. Description of --display=DISPLAY in --help output +-#: gdk/gdk.c:157 ++#: ../gdk/gdk.c:209 + msgid "X display to use" + msgstr "Taispeáint X le húsáid" + + #. Placeholder in --display=DISPLAY in --help output +-#: gdk/gdk.c:158 ++#: ../gdk/gdk.c:210 + msgid "DISPLAY" + msgstr "TAISPEÁINT" + +-#. Description of --screen=SCREEN in --help output +-#: gdk/gdk.c:160 +-msgid "X screen to use" +-msgstr "Scáileán X le húsáid" +- +-#. Placeholder in --screen=SCREEN in --help output +-#: gdk/gdk.c:161 +-msgid "SCREEN" +-msgstr "SCÁILEÁN" +- + #. Description of --gdk-debug=FLAGS in --help output +-#: gdk/gdk.c:164 +-#, fuzzy ++#: ../gdk/gdk.c:213 + msgid "GDK debugging flags to set" +-msgstr "Bratacha dífhabhtaithe GTK+ a shocrú" ++msgstr "Bratacha dífhabhtaithe GTK+ le socrú" + + #. Placeholder in --gdk-debug=FLAGS in --help output + #. Placeholder in --gdk-no-debug=FLAGS in --help output + #. Placeholder in --gtk-debug=FLAGS in --help output + #. Placeholder in --gtk-no-debug=FLAGS in --help output +-#: gdk/gdk.c:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536 ++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 + msgid "FLAGS" + msgstr "BRATACHA" + + #. Description of --gdk-no-debug=FLAGS in --help output +-#: gdk/gdk.c:167 +-#, fuzzy ++#: ../gdk/gdk.c:216 + msgid "GDK debugging flags to unset" +-msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú" ++msgstr "Bratacha dífhabhtaithe GTK+ le díshocrú" + +-#: gdk/keyname-table.h:3940 ++#. ++#. * Translators, the strings in the 'keyboard label' context are ++#. * display names for keyboard keys. Some of them have prefixes like ++#. * XF86 or ISO_ - these should be removed in the translation. Similarly, ++#. * underscores should be replaced by spaces. The prefix 'KP_' stands ++#. * for 'key pad' and you may want to include that in your translation. ++#. * Here are some examples of English translations: ++#. * XF86AudioMute - Audio mute ++#. * Scroll_lock - Scroll lock ++#. * KP_Space - Space (keypad) ++#. * Page_Up - Page up ++#. ++#: ../gdk/keyname-table.h:3952 + msgctxt "keyboard label" + msgid "BackSpace" + msgstr "BackSpace" + +-#: gdk/keyname-table.h:3941 ++#: ../gdk/keyname-table.h:3953 + msgctxt "keyboard label" + msgid "Tab" + msgstr "Tab" + +-#: gdk/keyname-table.h:3942 ++#: ../gdk/keyname-table.h:3954 + msgctxt "keyboard label" + msgid "Return" + msgstr "Return" + +-#: gdk/keyname-table.h:3943 ++#: ../gdk/keyname-table.h:3955 + msgctxt "keyboard label" + msgid "Pause" + msgstr "Pause" + +-#: gdk/keyname-table.h:3944 ++#: ../gdk/keyname-table.h:3956 + msgctxt "keyboard label" + msgid "Scroll_Lock" + msgstr "Scroll_Lock" + +-#: gdk/keyname-table.h:3945 ++#: ../gdk/keyname-table.h:3957 + msgctxt "keyboard label" + msgid "Sys_Req" + msgstr "Sys_Req" + +-#: gdk/keyname-table.h:3946 ++#: ../gdk/keyname-table.h:3958 + msgctxt "keyboard label" + msgid "Escape" + msgstr "Escape" + +-#: gdk/keyname-table.h:3947 ++#: ../gdk/keyname-table.h:3959 + msgctxt "keyboard label" + msgid "Multi_key" + msgstr "Multi_key" + +-#: gdk/keyname-table.h:3948 ++#: ../gdk/keyname-table.h:3960 + msgctxt "keyboard label" + msgid "Home" + msgstr "Home" + +-#: gdk/keyname-table.h:3949 ++#: ../gdk/keyname-table.h:3961 + msgctxt "keyboard label" + msgid "Left" + msgstr "Left" + +-#: gdk/keyname-table.h:3950 ++#: ../gdk/keyname-table.h:3962 + msgctxt "keyboard label" + msgid "Up" + msgstr "Up" + +-#: gdk/keyname-table.h:3951 ++#: ../gdk/keyname-table.h:3963 + msgctxt "keyboard label" + msgid "Right" + msgstr "Right" + +-#: gdk/keyname-table.h:3952 ++#: ../gdk/keyname-table.h:3964 + msgctxt "keyboard label" + msgid "Down" + msgstr "Down" + +-#: gdk/keyname-table.h:3953 ++#: ../gdk/keyname-table.h:3965 + msgctxt "keyboard label" + msgid "Page_Up" + msgstr "Page_Up" + +-#: gdk/keyname-table.h:3954 ++#: ../gdk/keyname-table.h:3966 + msgctxt "keyboard label" + msgid "Page_Down" + msgstr "Page_Down" + +-#: gdk/keyname-table.h:3955 ++#: ../gdk/keyname-table.h:3967 + msgctxt "keyboard label" + msgid "End" + msgstr "End" + +-#: gdk/keyname-table.h:3956 ++#: ../gdk/keyname-table.h:3968 + msgctxt "keyboard label" + msgid "Begin" + msgstr "Begin" + +-#: gdk/keyname-table.h:3957 ++#: ../gdk/keyname-table.h:3969 + msgctxt "keyboard label" + msgid "Print" + msgstr "Print" + +-#: gdk/keyname-table.h:3958 ++#: ../gdk/keyname-table.h:3970 + msgctxt "keyboard label" + msgid "Insert" + msgstr "Insert" + +-#: gdk/keyname-table.h:3959 ++#: ../gdk/keyname-table.h:3971 + msgctxt "keyboard label" + msgid "Num_Lock" + msgstr "Num_Lock" + +-#: gdk/keyname-table.h:3960 ++#. Translators: KP_ means 'key pad' here ++#: ../gdk/keyname-table.h:3973 + msgctxt "keyboard label" + msgid "KP_Space" + msgstr "KP_Space" + +-#: gdk/keyname-table.h:3961 ++#: ../gdk/keyname-table.h:3974 + msgctxt "keyboard label" + msgid "KP_Tab" + msgstr "KP_Tab" + +-#: gdk/keyname-table.h:3962 ++#: ../gdk/keyname-table.h:3975 + msgctxt "keyboard label" + msgid "KP_Enter" + msgstr "KP_Enter" + +-#: gdk/keyname-table.h:3963 ++#: ../gdk/keyname-table.h:3976 + msgctxt "keyboard label" + msgid "KP_Home" + msgstr "KP_Home" + +-#: gdk/keyname-table.h:3964 ++#: ../gdk/keyname-table.h:3977 + msgctxt "keyboard label" + msgid "KP_Left" + msgstr "KP_Left" + +-#: gdk/keyname-table.h:3965 ++#: ../gdk/keyname-table.h:3978 + msgctxt "keyboard label" + msgid "KP_Up" + msgstr "KP_Up" + +-#: gdk/keyname-table.h:3966 ++#: ../gdk/keyname-table.h:3979 + msgctxt "keyboard label" + msgid "KP_Right" + msgstr "KP_Right" + +-#: gdk/keyname-table.h:3967 ++#: ../gdk/keyname-table.h:3980 + msgctxt "keyboard label" + msgid "KP_Down" + msgstr "KP_Down" + +-#: gdk/keyname-table.h:3968 ++#: ../gdk/keyname-table.h:3981 + msgctxt "keyboard label" + msgid "KP_Page_Up" + msgstr "KP_Page_Up" + +-#: gdk/keyname-table.h:3969 ++#: ../gdk/keyname-table.h:3982 + msgctxt "keyboard label" + msgid "KP_Prior" + msgstr "KP_Prior" + +-#: gdk/keyname-table.h:3970 ++#: ../gdk/keyname-table.h:3983 + msgctxt "keyboard label" + msgid "KP_Page_Down" + msgstr "KP_Page_Down" + +-#: gdk/keyname-table.h:3971 ++#: ../gdk/keyname-table.h:3984 + msgctxt "keyboard label" + msgid "KP_Next" + msgstr "KP_Next" + +-#: gdk/keyname-table.h:3972 ++#: ../gdk/keyname-table.h:3985 + msgctxt "keyboard label" + msgid "KP_End" + msgstr "KP_End" + +-#: gdk/keyname-table.h:3973 ++#: ../gdk/keyname-table.h:3986 + msgctxt "keyboard label" + msgid "KP_Begin" + msgstr "KP_Begin" + +-#: gdk/keyname-table.h:3974 ++#: ../gdk/keyname-table.h:3987 + msgctxt "keyboard label" + msgid "KP_Insert" + msgstr "KP_Insert" + +-#: gdk/keyname-table.h:3975 ++#: ../gdk/keyname-table.h:3988 + msgctxt "keyboard label" + msgid "KP_Delete" + msgstr "KP_Delete" + +-#: gdk/keyname-table.h:3976 ++#: ../gdk/keyname-table.h:3989 + msgctxt "keyboard label" + msgid "Delete" + msgstr "Delete" + ++#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed ++#: ../gdk/keyname-table.h:3991 ++msgctxt "keyboard label" ++msgid "XF86MonBrightnessUp" ++msgstr "XF86MonBrightnessUp" ++ ++#: ../gdk/keyname-table.h:3992 ++msgctxt "keyboard label" ++msgid "XF86MonBrightnessDown" ++msgstr "XF86MonBrightnessDown" ++ ++#: ../gdk/keyname-table.h:3993 ++msgctxt "keyboard label" ++msgid "XF86AudioMute" ++msgstr "XF86AudioMute" ++ ++#: ../gdk/keyname-table.h:3994 ++msgctxt "keyboard label" ++msgid "XF86AudioLowerVolume" ++msgstr "XF86AudioLowerVolume" ++ ++#: ../gdk/keyname-table.h:3995 ++msgctxt "keyboard label" ++msgid "XF86AudioRaiseVolume" ++msgstr "XF86AudioRaiseVolume" ++ ++#: ../gdk/keyname-table.h:3996 ++msgctxt "keyboard label" ++msgid "XF86AudioPlay" ++msgstr "XF86AudioPlay" ++ ++#: ../gdk/keyname-table.h:3997 ++msgctxt "keyboard label" ++msgid "XF86AudioStop" ++msgstr "XF86AudioStop" ++ ++#: ../gdk/keyname-table.h:3998 ++msgctxt "keyboard label" ++msgid "XF86AudioNext" ++msgstr "XF86AudioNext" ++ ++#: ../gdk/keyname-table.h:3999 ++msgctxt "keyboard label" ++msgid "XF86AudioPrev" ++msgstr "XF86AudioPrev" ++ ++#: ../gdk/keyname-table.h:4000 ++msgctxt "keyboard label" ++msgid "XF86AudioRecord" ++msgstr "XF86AudioRecord" ++ ++#: ../gdk/keyname-table.h:4001 ++msgctxt "keyboard label" ++msgid "XF86AudioPause" ++msgstr "XF86AudioPause" ++ ++#: ../gdk/keyname-table.h:4002 ++msgctxt "keyboard label" ++msgid "XF86AudioRewind" ++msgstr "XF86AudioRewind" ++ ++#: ../gdk/keyname-table.h:4003 ++msgctxt "keyboard label" ++msgid "XF86AudioMedia" ++msgstr "XF86AudioMedia" ++ ++#: ../gdk/keyname-table.h:4004 ++msgctxt "keyboard label" ++msgid "XF86ScreenSaver" ++msgstr "XF86ScreenSaver" ++ ++#: ../gdk/keyname-table.h:4005 ++msgctxt "keyboard label" ++msgid "XF86Battery" ++msgstr "XF86Battery" ++ ++#: ../gdk/keyname-table.h:4006 ++msgctxt "keyboard label" ++msgid "XF86Launch1" ++msgstr "XF86Launch1" ++ ++#: ../gdk/keyname-table.h:4007 ++msgctxt "keyboard label" ++msgid "XF86Forward" ++msgstr "XF86Forward" ++ ++#: ../gdk/keyname-table.h:4008 ++msgctxt "keyboard label" ++msgid "XF86Back" ++msgstr "XF86Back" ++ ++#: ../gdk/keyname-table.h:4009 ++msgctxt "keyboard label" ++msgid "XF86Sleep" ++msgstr "XF86Sleep" ++ ++#: ../gdk/keyname-table.h:4010 ++msgctxt "keyboard label" ++msgid "XF86Hibernate" ++msgstr "XF86Hibernate" ++ ++#: ../gdk/keyname-table.h:4011 ++msgctxt "keyboard label" ++msgid "XF86WLAN" ++msgstr "XF86WLAN" ++ ++#: ../gdk/keyname-table.h:4012 ++msgctxt "keyboard label" ++msgid "XF86WebCam" ++msgstr "XF86WebCam" ++ ++#: ../gdk/keyname-table.h:4013 ++msgctxt "keyboard label" ++msgid "XF86Display" ++msgstr "XF86Display" ++ ++#: ../gdk/keyname-table.h:4014 ++msgctxt "keyboard label" ++msgid "XF86TouchpadToggle" ++msgstr "XF86TouchpadToggle" ++ ++#: ../gdk/keyname-table.h:4015 ++msgctxt "keyboard label" ++msgid "XF86WakeUp" ++msgstr "XF86WakeUp" ++ ++#: ../gdk/keyname-table.h:4016 ++msgctxt "keyboard label" ++msgid "XF86Suspend" ++msgstr "XF86Suspend" ++ + #. Description of --sync in --help output +-#: gdk/win32/gdkmain-win32.c:54 ++#: ../gdk/win32/gdkmain-win32.c:53 + msgid "Don't batch GDI requests" + msgstr "Ná baisc iarratais GDI" + + #. Description of --no-wintab in --help output +-#: gdk/win32/gdkmain-win32.c:56 ++#: ../gdk/win32/gdkmain-win32.c:55 + msgid "Don't use the Wintab API for tablet support" + msgstr "Ná húsáid an API Wintab le tacaíocht táibléid" + + #. Description of --ignore-wintab in --help output +-#: gdk/win32/gdkmain-win32.c:58 ++#: ../gdk/win32/gdkmain-win32.c:57 + msgid "Same as --no-wintab" + msgstr "Céanna le --no-wintab" + + #. Description of --use-wintab in --help output +-#: gdk/win32/gdkmain-win32.c:60 ++#: ../gdk/win32/gdkmain-win32.c:59 + msgid "Do use the Wintab API [default]" + msgstr "Úsáid an API Wintab [réamhshocrú]" + + #. Description of --max-colors=COLORS in --help output +-#: gdk/win32/gdkmain-win32.c:62 ++#: ../gdk/win32/gdkmain-win32.c:61 + msgid "Size of the palette in 8 bit mode" + msgstr "Méid an phailéid sa mhód 8-giotán" + + #. Placeholder in --max-colors=COLORS in --help output +-#: gdk/win32/gdkmain-win32.c:63 ++#: ../gdk/win32/gdkmain-win32.c:62 + msgid "COLORS" + msgstr "DATHANNA" + +-#: gdk/x11/gdkapplaunchcontext-x11.c:312 ++#: ../gdk/x11/gdkapplaunchcontext-x11.c:292 + #, c-format + msgid "Starting %s" + msgstr "%s á Thosú" + +-#: gdk/x11/gdkapplaunchcontext-x11.c:316 ++#: ../gdk/x11/gdkapplaunchcontext-x11.c:305 + #, c-format + msgid "Opening %s" + msgstr "%s á Oscailt" + +-#: gdk/x11/gdkapplaunchcontext-x11.c:321 ++#: ../gdk/x11/gdkapplaunchcontext-x11.c:310 + #, c-format + msgid "Opening %d Item" + msgid_plural "Opening %d Items" +@@ -326,63 +459,245 @@ msgstr[2] "%d Mhír á Oscailt" + msgstr[3] "%d Mír á Oscailt" + msgstr[4] "%d Mír á Oscailt" + +-#. Description of --sync in --help output +-#: gdk/x11/gdkmain-x11.c:96 +-msgid "Make X calls synchronous" +-msgstr "Déan sioncronach glaonna X" ++#: ../gtk/a11y/gtkspinneraccessible.c:40 ++msgctxt "throbbing progress animation widget" ++msgid "Spinner" ++msgstr "" ++ ++#: ../gtk/a11y/gtkspinneraccessible.c:41 ++msgid "Provides visual indication of progress" ++msgstr "" ++ ++#: ../gtk/a11y/gtkswitchaccessible.c:63 ++msgctxt "light switch widget" ++msgid "Switch" ++msgstr "Lasc" ++ ++#: ../gtk/a11y/gtkswitchaccessible.c:64 ++msgid "Switches between on and off states" ++msgstr "" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:425 ++msgid "" ++"Select the color you want from the outer ring. Select the darkness or " ++"lightness of that color using the inner triangle." ++msgstr "" ++"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile " ++"an datha sin leis an triantán istigh." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:451 ++msgid "" ++"Click the eyedropper, then click a color anywhere on your screen to select " ++"that color." ++msgstr "" ++"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do " ++"scáileán chun an dath sin a roghnú." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:461 ++msgid "_Hue:" ++msgstr "_Lí:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:462 ++msgid "Position on the color wheel." ++msgstr "Ionad ar roth na ndathanna." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:464 ++msgid "S_aturation:" ++msgstr "_Sáithiú:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:465 ++msgid "Intensity of the color." ++msgstr "Déine an datha." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:466 ++msgid "_Value:" ++msgstr "L_uach:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:467 ++msgid "Brightness of the color." ++msgstr "Gile an datha." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:468 ++msgid "_Red:" ++msgstr "_Dearg:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:469 ++msgid "Amount of red light in the color." ++msgstr "Méid sholais dhearg sa dath." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:470 ++msgid "_Green:" ++msgstr "_Uaine:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:471 ++msgid "Amount of green light in the color." ++msgstr "Méid sholais uaine sa dath." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:472 ++msgid "_Blue:" ++msgstr "_Gorm:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:473 ++msgid "Amount of blue light in the color." ++msgstr "Méid sholais ghorm sa dath." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:476 ++msgid "Op_acity:" ++msgstr "Teimhne_acht:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:484 ../gtk/deprecated/gtkcolorsel.c:494 ++msgid "Transparency of the color." ++msgstr "Trédhearcacht an datha." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:501 ++msgid "Color _name:" ++msgstr "Ai_nm datha:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:516 ++msgid "" ++"You can enter an HTML-style hexadecimal color value, or simply a color name " ++"such as 'orange' in this entry." ++msgstr "" ++"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó " ++"ainm datha mar shampla 'orange' a iontráil san iontráil seo." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:548 ++msgid "_Palette:" ++msgstr "_Pailéad:" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:578 ++msgid "Color Wheel" ++msgstr "Roth na nDathanna" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1072 ++msgid "" ++"The previously-selected color, for comparison to the color you're selecting " ++"now. You can drag this color to a palette entry, or select this color as " ++"current by dragging it to the other color swatch alongside." ++msgstr "" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1078 ++msgid "" ++"The color you've chosen. You can drag this color to a palette entry to save " ++"it for use in the future." ++msgstr "" ++"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go " ++"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1084 ++msgid "" ++"The previously-selected color, for comparison to the color you're selecting " ++"now." ++msgstr "" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1088 ++msgid "The color you've chosen." ++msgstr "An dath atá roghnaithe agat." ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1491 ++msgid "_Save color here" ++msgstr "_Sábháil dath anseo" ++ ++#: ../gtk/deprecated/gtkcolorsel.c:1695 ++msgid "" ++"Click this palette entry to make it the current color. To change this entry, " ++"drag a color swatch here or right-click it and select \"Save color here.\"" ++msgstr "" ++ ++#. We emit the response for the Select button manually, ++#. * since we want to save the color first ++#. ++#: ../gtk/deprecated/gtkcolorseldialog.c:201 ../gtk/gtkappchooserdialog.c:574 ++#: ../gtk/gtkcolorchooserdialog.c:150 ../gtk/gtkfontchooserdialog.c:174 ++#: ../gtk/gtkprinteroptionwidget.c:550 ++msgid "_Select" ++msgstr "_Roghnaigh" ++ ++#: ../gtk/deprecated/gtkcolorseldialog.c:219 ++msgid "Color Selection" ++msgstr "Roghnú Datha" ++ ++#. This is the default text shown in the preview entry, though the user ++#. can set it. Remember that some fonts only have capital letters. ++#: ../gtk/deprecated/gtkfontsel.c:124 ++msgid "abcdefghijk ABCDEFGHIJK" ++msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ" ++ ++#: ../gtk/deprecated/gtkfontsel.c:393 ++msgid "_Family:" ++msgstr "_Clann:" ++ ++#: ../gtk/deprecated/gtkfontsel.c:400 ++msgid "_Style:" ++msgstr "_Stíl:" ++ ++#: ../gtk/deprecated/gtkfontsel.c:407 ++msgid "Si_ze:" ++msgstr "_Méid:" ++ ++#. create the text entry widget ++#: ../gtk/deprecated/gtkfontsel.c:584 ++msgid "_Preview:" ++msgstr "_Réamhamharc:" ++ ++#: ../gtk/deprecated/gtkfontsel.c:1720 ../gtk/gtkfontchooserdialog.c:183 ++msgid "Font Selection" ++msgstr "Roghnú Cló" + + #. Translators: this is the license preamble; the string at the end + #. * contains the URL of the license. + #. +-#: gtk/gtkaboutdialog.c:101 ++#: ../gtk/gtkaboutdialog.c:104 + #, c-format +-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s" ++msgid "" ++"This program comes with ABSOLUTELY NO WARRANTY;\n" ++"for details, visit <a href=\"%s\">%s</a>" + msgstr "" + +-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235 ++#: ../gtk/gtkaboutdialog.c:357 + msgid "License" + msgstr "Ceadúnas" + +-#: gtk/gtkaboutdialog.c:340 ++#: ../gtk/gtkaboutdialog.c:358 + msgid "The license of the program" + msgstr "Ceadúnas an chláir" + + #. Add the credits button +-#: gtk/gtkaboutdialog.c:621 ++#: ../gtk/gtkaboutdialog.c:751 + msgid "C_redits" + msgstr "_Admhálacha" + + #. Add the license button +-#: gtk/gtkaboutdialog.c:635 ++#: ../gtk/gtkaboutdialog.c:764 + msgid "_License" + msgstr "_Ceadúnas" + +-#: gtk/gtkaboutdialog.c:839 ++#: ../gtk/gtkaboutdialog.c:980 + msgid "Could not show link" + msgstr "Níorbh fhéidir nasc a thaispeáint" + +-#: gtk/gtkaboutdialog.c:932 ++#: ../gtk/gtkaboutdialog.c:1017 ++msgid "Homepage" ++msgstr "Leathanach Baile" ++ ++#: ../gtk/gtkaboutdialog.c:1071 + #, c-format + msgid "About %s" + msgstr "Maidir le %s" + +-#: gtk/gtkaboutdialog.c:2153 +-msgid "Credits" +-msgstr "Admhálacha" ++#: ../gtk/gtkaboutdialog.c:2399 ++msgid "Created by" ++msgstr "Cruthaithe ag" + +-#: gtk/gtkaboutdialog.c:2185 +-msgid "Written by" +-msgstr "Scríofa ag" +- +-#: gtk/gtkaboutdialog.c:2188 ++#: ../gtk/gtkaboutdialog.c:2402 + msgid "Documented by" + msgstr "Doiciméadaithe ag" + +-#: gtk/gtkaboutdialog.c:2200 ++#: ../gtk/gtkaboutdialog.c:2412 + msgid "Translated by" + msgstr "Aistrithe ag" + +-#: gtk/gtkaboutdialog.c:2204 ++#: ../gtk/gtkaboutdialog.c:2417 + msgid "Artwork by" + msgstr "Maisiúchán le" + +@@ -391,7 +706,7 @@ msgstr "Maisiúchán le" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:160 ++#: ../gtk/gtkaccellabel.c:159 + msgctxt "keyboard label" + msgid "Shift" + msgstr "Shift" +@@ -401,7 +716,7 @@ msgstr "Shift" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:166 ++#: ../gtk/gtkaccellabel.c:165 + msgctxt "keyboard label" + msgid "Ctrl" + msgstr "Ctrl" +@@ -411,7 +726,7 @@ msgstr "Ctrl" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:172 ++#: ../gtk/gtkaccellabel.c:171 + msgctxt "keyboard label" + msgid "Alt" + msgstr "Alt" +@@ -421,7 +736,7 @@ msgstr "Alt" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:770 ++#: ../gtk/gtkaccellabel.c:805 + msgctxt "keyboard label" + msgid "Super" + msgstr "Super" +@@ -431,7 +746,7 @@ msgstr "Super" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:783 ++#: ../gtk/gtkaccellabel.c:818 + msgctxt "keyboard label" + msgid "Hyper" + msgstr "Hyper" +@@ -441,37 +756,162 @@ msgstr "Hyper" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: gtk/gtkaccellabel.c:797 ++#: ../gtk/gtkaccellabel.c:832 + msgctxt "keyboard label" + msgid "Meta" + msgstr "Meta" + +-#: gtk/gtkaccellabel.c:813 ++#: ../gtk/gtkaccellabel.c:848 + msgctxt "keyboard label" + msgid "Space" + msgstr "Space" + +-#: gtk/gtkaccellabel.c:816 ++#: ../gtk/gtkaccellabel.c:851 + msgctxt "keyboard label" + msgid "Backslash" + msgstr "Backslash" + +-#: gtk/gtkbuilderparser.c:343 ++#: ../gtk/gtkappchooserbutton.c:290 ++msgid "Other application..." ++msgstr "Feidhmchlár eile..." ++ ++#: ../gtk/gtkappchooserdialog.c:137 ++msgid "Failed to look for applications online" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:188 ++msgid "_Find applications online" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:247 ++#, fuzzy ++msgid "Could not run application" ++msgstr "Níorbh fhéidir liosta a ghlanadh" ++ ++#: ../gtk/gtkappchooserdialog.c:260 ++#, fuzzy, c-format ++msgid "Could not find '%s'" ++msgstr "Níorbh fhéidir %s a ghléasadh" ++ ++#: ../gtk/gtkappchooserdialog.c:263 ++#, fuzzy ++msgid "Could not find application" ++msgstr "Níorbh fhéidir nasc a thaispeáint" ++ ++#. Translators: %s is a filename ++#: ../gtk/gtkappchooserdialog.c:397 ++#, c-format ++msgid "Select an application to open \"%s\"" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 ++#, c-format ++msgid "No applications available to open \"%s\"" ++msgstr "" ++ ++#. Translators: %s is a file type description ++#: ../gtk/gtkappchooserdialog.c:404 ++#, c-format ++msgid "Select an application for \"%s\" files" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:406 ++#, c-format ++msgid "No applications available to open \"%s\" files" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:422 ++msgid "" ++"Click \"Show other applications\", for more options, or \"Find applications " ++"online\" to install a new application" ++msgstr "" ++ ++#: ../gtk/gtkappchooserdialog.c:492 ++#, fuzzy ++msgid "Forget association" ++msgstr "Déan _dearmad ar an bhfocal faire láithreach" ++ ++#: ../gtk/gtkappchooserdialog.c:558 ++msgid "Show other applications" ++msgstr "Taispeáin feidhmchláir eile" ++ ++#: ../gtk/gtkappchooserwidget.c:606 ++msgid "Default Application" ++msgstr "Feidhmchlár Réamhshocraithe" ++ ++#: ../gtk/gtkappchooserwidget.c:744 ++#, fuzzy ++msgid "Recommended Applications" ++msgstr "Feidhmchlár" ++ ++#: ../gtk/gtkappchooserwidget.c:759 ++#, fuzzy ++msgid "Related Applications" ++msgstr "Feidhmchlár" ++ ++#: ../gtk/gtkappchooserwidget.c:773 ++msgid "Other Applications" ++msgstr "Feidhmchláir Eile" ++ ++#: ../gtk/gtkapplication.c:1558 ++#, c-format ++msgid "" ++"%s cannot quit at this time:\n" ++"\n" ++"%s" ++msgstr "" ++ ++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 ++#: ../gtk/gtkprintoperation-win32.c:1445 ++msgid "Application" ++msgstr "Feidhmchlár" ++ ++#: ../gtk/gtkassistant.c:1008 ++#, fuzzy ++msgid "C_ontinue" ++msgstr "_Nasc" ++ ++#: ../gtk/gtkassistant.c:1011 ++#, fuzzy ++msgid "Go _Back" ++msgstr "Ar A_is" ++ ++#: ../gtk/gtkassistant.c:1015 ++#, fuzzy ++msgid "_Finish" ++msgstr "Críochnaithe" ++ ++#: ../gtk/gtkbuilder-menus.c:220 ++#, fuzzy, c-format ++msgid "Element <%s> not allowed inside <%s>" ++msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>" ++ ++#: ../gtk/gtkbuilder-menus.c:225 ++#, fuzzy, c-format ++msgid "Element <%s> not allowed at toplevel" ++msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>" ++ ++#: ../gtk/gtkbuilder-menus.c:314 ++#, c-format ++msgid "text may not appear inside <%s>" ++msgstr "" ++ ++#: ../gtk/gtkbuilderparser.c:341 + #, c-format + msgid "Invalid type function on line %d: '%s'" + msgstr "Feidhm chineáil neamhbhailí ar líne %d: '%s'" + +-#: gtk/gtkbuilderparser.c:407 ++#: ../gtk/gtkbuilderparser.c:405 + #, c-format + msgid "Duplicate object ID '%s' on line %d (previously on line %d)" + msgstr "" + +-#: gtk/gtkbuilderparser.c:859 ++#: ../gtk/gtkbuilderparser.c:865 + #, c-format + msgid "Invalid root element: '%s'" + msgstr "Fréamheilimint neamhbhailí: '%s'" + +-#: gtk/gtkbuilderparser.c:898 ++#: ../gtk/gtkbuilderparser.c:906 + #, c-format + msgid "Unhandled tag: '%s'" + msgstr "Clib gan láimhseáil: '%s'" +@@ -486,7 +926,7 @@ msgstr "Clib gan láimhseáil: '%s'" + #. * text direction of RTL and specify "calendar:YM", then the year + #. * will appear to the right of the month. + #. +-#: gtk/gtkcalendar.c:883 ++#: ../gtk/gtkcalendar.c:872 + msgid "calendar:MY" + msgstr "calendar:MY" + +@@ -494,7 +934,7 @@ msgstr "calendar:MY" + #. * first day of the week to calendar:week_start:1 if you want Monday + #. * to be the first day of the week, and so on. + #. +-#: gtk/gtkcalendar.c:921 ++#: ../gtk/gtkcalendar.c:910 + msgid "calendar:week_start:0" + msgstr "calendar:week_start:0" + +@@ -503,7 +943,7 @@ msgstr "calendar:week_start:0" + #. * + #. * If you don't understand this, leave it as "2000" + #. +-#: gtk/gtkcalendar.c:2006 ++#: ../gtk/gtkcalendar.c:1910 + msgctxt "year measurement template" + msgid "2000" + msgstr "2000" +@@ -518,7 +958,7 @@ msgstr "2000" + #. * digits. That needs support from your system and locale definition + #. * too. + #. +-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719 ++#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2633 + #, c-format + msgctxt "calendar:day:digits" + msgid "%d" +@@ -534,7 +974,7 @@ msgstr "%d" + #. * digits. That needs support from your system and locale definition + #. * too. + #. +-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579 ++#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499 + #, c-format + msgctxt "calendar:week:digits" + msgid "%d" +@@ -550,7 +990,7 @@ msgstr "%d" + #. * + #. * "%Y" is appropriate for most locales. + #. +-#: gtk/gtkcalendar.c:2361 ++#: ../gtk/gtkcalendar.c:2268 + msgctxt "calendar year format" + msgid "%Y" + msgstr "%Y" +@@ -558,7 +998,7 @@ msgstr "%Y" + #. This label is displayed in a treeview cell displaying + #. * a disabled accelerator key combination. + #. +-#: gtk/gtkcellrendereraccel.c:272 ++#: ../gtk/gtkcellrendereraccel.c:282 + msgctxt "Accelerator" + msgid "Disabled" + msgstr "Díchumasaithe" +@@ -567,7 +1007,7 @@ msgstr "Díchumasaithe" + #. * an accelerator key combination that is not valid according + #. * to gtk_accelerator_valid(). + #. +-#: gtk/gtkcellrendereraccel.c:282 ++#: ../gtk/gtkcellrendereraccel.c:292 + msgctxt "Accelerator" + msgid "Invalid" + msgstr "Neamhbhailí" +@@ -576,155 +1016,290 @@ msgstr "Neamhbhailí" + #. * an accelerator when the cell is clicked to change the + #. * acelerator. + #. +-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675 ++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 + msgid "New accelerator..." + msgstr "Aicearra nua..." + +-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452 ++#: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462 + #, c-format + msgctxt "progress bar label" + msgid "%d %%" + msgstr "%d %%" + +-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445 ++#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:449 + msgid "Pick a Color" + msgstr "Roghnaigh Dath" + +-#: gtk/gtkcolorbutton.c:336 +-msgid "Received invalid color data\n" +-msgstr "Fuair sonraí datha neamhbhailí\n" ++#: ../gtk/gtkcolorchooserdialog.c:164 ++msgid "Select a Color" ++msgstr "Roghnaigh Dath" + +-#: gtk/gtkcolorsel.c:384 +-msgid "" +-"Select the color you want from the outer ring. Select the darkness or " +-"lightness of that color using the inner triangle." +-msgstr "" +-"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile " +-"an datha sin leis an triantán istigh." ++#: ../gtk/gtkcolorchooserwidget.c:281 ++#, c-format ++msgid "Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%" ++msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%, Alfa %d%%" + +-#: gtk/gtkcolorsel.c:408 +-msgid "" +-"Click the eyedropper, then click a color anywhere on your screen to select " +-"that color." ++#: ../gtk/gtkcolorchooserwidget.c:287 ++#, c-format ++msgid "Red %d%%, Green %d%%, Blue %d%%" ++msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%" ++ ++#: ../gtk/gtkcolorchooserwidget.c:360 ++#, c-format ++msgid "Color: %s" ++msgstr "Dath: %s" ++ ++#: ../gtk/gtkcolorchooserwidget.c:419 ++msgctxt "Color name" ++msgid "Light Scarlet Red" + msgstr "" +-"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do " +-"scáileán chun an dath sin a roghnú." + +-#: gtk/gtkcolorsel.c:417 +-msgid "_Hue:" +-msgstr "_Lí:" ++#: ../gtk/gtkcolorchooserwidget.c:420 ++msgctxt "Color name" ++msgid "Scarlet Red" ++msgstr "" + +-#: gtk/gtkcolorsel.c:418 +-msgid "Position on the color wheel." +-msgstr "Ionad ar roth na ndathanna." ++#: ../gtk/gtkcolorchooserwidget.c:421 ++msgctxt "Color name" ++msgid "Dark Scarlet Red" ++msgstr "" + +-#: gtk/gtkcolorsel.c:420 +-msgid "_Saturation:" +-msgstr "_Sáithiú:" ++#: ../gtk/gtkcolorchooserwidget.c:422 ++msgctxt "Color name" ++msgid "Light Orange" ++msgstr "" + +-#: gtk/gtkcolorsel.c:421 ++#: ../gtk/gtkcolorchooserwidget.c:423 + #, fuzzy +-msgid "Intensity of the color." +-msgstr "Trédhearcacht an datha." ++msgctxt "Color name" ++msgid "Orange" ++msgstr "Raon" + +-#: gtk/gtkcolorsel.c:422 +-msgid "_Value:" +-msgstr "L_uach:" ++#: ../gtk/gtkcolorchooserwidget.c:424 ++msgctxt "Color name" ++msgid "Dark Orange" ++msgstr "" + +-#: gtk/gtkcolorsel.c:423 +-msgid "Brightness of the color." +-msgstr "Gile an datha." ++#: ../gtk/gtkcolorchooserwidget.c:425 ++msgctxt "Color name" ++msgid "Light Butter" ++msgstr "" + +-#: gtk/gtkcolorsel.c:424 +-msgid "_Red:" +-msgstr "_Dearg:" ++#: ../gtk/gtkcolorchooserwidget.c:426 ++msgctxt "Color name" ++msgid "Butter" ++msgstr "" + +-#: gtk/gtkcolorsel.c:425 +-msgid "Amount of red light in the color." +-msgstr "Méid sholais dhearg sa dath." ++#: ../gtk/gtkcolorchooserwidget.c:427 ++msgctxt "Color name" ++msgid "Dark Butter" ++msgstr "" + +-#: gtk/gtkcolorsel.c:426 +-msgid "_Green:" +-msgstr "_Uaine:" ++#: ../gtk/gtkcolorchooserwidget.c:428 ++msgctxt "Color name" ++msgid "Light Chameleon" ++msgstr "" + +-#: gtk/gtkcolorsel.c:427 +-msgid "Amount of green light in the color." +-msgstr "Méid sholais uaine sa dath." ++#: ../gtk/gtkcolorchooserwidget.c:429 ++msgctxt "Color name" ++msgid "Chameleon" ++msgstr "" + +-#: gtk/gtkcolorsel.c:428 +-msgid "_Blue:" +-msgstr "_Gorm:" ++#: ../gtk/gtkcolorchooserwidget.c:430 ++msgctxt "Color name" ++msgid "Dark Chameleon" ++msgstr "" + +-#: gtk/gtkcolorsel.c:429 +-msgid "Amount of blue light in the color." +-msgstr "Méid sholais ghorm sa dath." ++#: ../gtk/gtkcolorchooserwidget.c:431 ++msgctxt "Color name" ++msgid "Light Sky Blue" ++msgstr "" + +-#: gtk/gtkcolorsel.c:432 +-msgid "Op_acity:" +-msgstr "Teimhne_acht:" ++#: ../gtk/gtkcolorchooserwidget.c:432 ++msgctxt "Color name" ++msgid "Sky Blue" ++msgstr "" + +-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449 +-msgid "Transparency of the color." +-msgstr "Trédhearcacht an datha." ++#: ../gtk/gtkcolorchooserwidget.c:433 ++msgctxt "Color name" ++msgid "Dark Sky Blue" ++msgstr "" + +-#: gtk/gtkcolorsel.c:456 +-msgid "Color _name:" +-msgstr "Ai_nm datha:" ++#: ../gtk/gtkcolorchooserwidget.c:434 ++msgctxt "Color name" ++msgid "Light Plum" ++msgstr "" + +-#: gtk/gtkcolorsel.c:470 +-msgid "" +-"You can enter an HTML-style hexadecimal color value, or simply a color name " +-"such as 'orange' in this entry." ++#: ../gtk/gtkcolorchooserwidget.c:435 ++msgctxt "Color name" ++msgid "Plum" + msgstr "" +-"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó " +-"ainm datha mar shampla 'orange' a iontráil san iontráil seo." + +-#: gtk/gtkcolorsel.c:500 +-msgid "_Palette:" +-msgstr "_Pailéad:" ++#: ../gtk/gtkcolorchooserwidget.c:436 ++msgctxt "Color name" ++msgid "Dark Plum" ++msgstr "" + +-#: gtk/gtkcolorsel.c:529 +-msgid "Color Wheel" +-msgstr "Roth na nDathanna" ++#: ../gtk/gtkcolorchooserwidget.c:437 ++msgctxt "Color name" ++msgid "Light Chocolate" ++msgstr "" + +-#: gtk/gtkcolorsel.c:988 +-msgid "" +-"The previously-selected color, for comparison to the color you're selecting " +-"now. You can drag this color to a palette entry, or select this color as " +-"current by dragging it to the other color swatch alongside." ++#: ../gtk/gtkcolorchooserwidget.c:438 ++#, fuzzy ++msgctxt "Color name" ++msgid "Chocolate" ++msgstr "C_omhordaigh" ++ ++#: ../gtk/gtkcolorchooserwidget.c:439 ++msgctxt "Color name" ++msgid "Dark Chocolate" + msgstr "" + +-#: gtk/gtkcolorsel.c:991 +-msgid "" +-"The color you've chosen. You can drag this color to a palette entry to save " +-"it for use in the future." ++#: ../gtk/gtkcolorchooserwidget.c:440 ++msgctxt "Color name" ++msgid "Light Aluminum 1" + msgstr "" +-"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go " +-"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht." + +-#: gtk/gtkcolorsel.c:996 +-msgid "" +-"The previously-selected color, for comparison to the color you're selecting " +-"now." ++#: ../gtk/gtkcolorchooserwidget.c:441 ++msgctxt "Color name" ++msgid "Aluminum 1" + msgstr "" + +-#: gtk/gtkcolorsel.c:999 +-msgid "The color you've chosen." +-msgstr "An dath atá roghnaithe agat." ++#: ../gtk/gtkcolorchooserwidget.c:442 ++msgctxt "Color name" ++msgid "Dark Aluminum 1" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:443 ++msgctxt "Color name" ++msgid "Light Aluminum 2" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:444 ++msgctxt "Color name" ++msgid "Aluminum 2" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:445 ++msgctxt "Color name" ++msgid "Dark Aluminum 2" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:459 ++msgctxt "Color name" ++msgid "Black" ++msgstr "Dubh" ++ ++#: ../gtk/gtkcolorchooserwidget.c:460 ++msgctxt "Color name" ++msgid "Very Dark Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:461 ++msgctxt "Color name" ++msgid "Darker Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:462 ++msgctxt "Color name" ++msgid "Dark Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:463 ++#, fuzzy ++msgctxt "Color name" ++msgid "Medium Gray" ++msgstr "Measartha" ++ ++#: ../gtk/gtkcolorchooserwidget.c:464 ++msgctxt "Color name" ++msgid "Light Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:465 ++msgctxt "Color name" ++msgid "Lighter Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:466 ++msgctxt "Color name" ++msgid "Very Light Gray" ++msgstr "" ++ ++#: ../gtk/gtkcolorchooserwidget.c:467 ++msgctxt "Color name" ++msgid "White" ++msgstr "Bán" ++ ++#. translators: label for the custom section in the color chooser ++#: ../gtk/gtkcolorchooserwidget.c:516 ++msgid "Custom" ++msgstr "Saincheaptha" ++ ++#: ../gtk/gtkcolorchooserwidget.c:524 ++#, fuzzy ++msgid "Create custom color" ++msgstr "Cruthaigh Fi_llteán" + +-#: gtk/gtkcolorsel.c:1396 +-msgid "_Save color here" +-msgstr "_Sábháil dath anseo" ++#: ../gtk/gtkcolorchooserwidget.c:543 ++#, fuzzy, c-format ++msgid "Custom color %d: %s" ++msgstr "%sx%s Saincheaptha" + +-#: gtk/gtkcolorsel.c:1601 +-msgid "" +-"Click this palette entry to make it the current color. To change this entry, " +-"drag a color swatch here or right-click it and select \"Save color here.\"" +-msgstr "" ++#: ../gtk/gtkcoloreditor.c:412 ++msgid "Color Name" ++msgstr "Ainm Datha" ++ ++#: ../gtk/gtkcoloreditor.c:457 ++msgctxt "Color channel" ++msgid "Saturation" ++msgstr "Sáithiú" ++ ++#: ../gtk/gtkcoloreditor.c:463 ++msgctxt "Color channel" ++msgid "Value" ++msgstr "Luach" ++ ++#: ../gtk/gtkcoloreditor.c:471 ++msgctxt "Color channel" ++msgid "S" ++msgstr "S" ++ ++#: ../gtk/gtkcoloreditor.c:473 ++msgctxt "Color channel" ++msgid "V" ++msgstr "L" ++ ++#: ../gtk/gtkcoloreditor.c:481 ../gtk/gtkcolorscale.c:301 ++msgctxt "Color channel" ++msgid "Hue" ++msgstr "Lí" ++ ++#: ../gtk/gtkcoloreditor.c:488 ++msgctxt "Color channel" ++msgid "H" ++msgstr "Lí" ++ ++#: ../gtk/gtkcoloreditor.c:496 ../gtk/gtkcolorscale.c:303 ++msgctxt "Color channel" ++msgid "Alpha" ++msgstr "Alfa" ++ ++#: ../gtk/gtkcoloreditor.c:503 ++msgctxt "Color channel" ++msgid "A" ++msgstr "A" ++ ++#: ../gtk/gtkcolorplane.c:438 ++#, fuzzy ++msgid "Color Plane" ++msgstr "Ai_nm datha:" + +-#: gtk/gtkcolorseldialog.c:189 +-msgid "Color Selection" +-msgstr "Roghnú Datha" ++#: ../gtk/gtkcolorswatch.c:447 ++#, fuzzy ++msgid "_Customize" ++msgstr "Méid saincheaptha" + + #. Translate to the default units to use for presenting + #. * lengths to the user. Translate to default:inch if you +@@ -732,125 +1307,154 @@ msgstr "Roghnú Datha" + #. * Do *not* translate it to "predefinito:mm", if it + #. * it isn't default:mm or default:inch it will not work + #. +-#: gtk/gtkcustompaperunixdialog.c:116 ++#: ../gtk/gtkcustompaperunixdialog.c:115 + msgid "default:mm" + msgstr "default:mm" + + #. And show the custom paper dialog +-#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233 ++#: ../gtk/gtkcustompaperunixdialog.c:397 ../gtk/gtkprintunixdialog.c:3275 + msgid "Manage Custom Sizes" + msgstr "Bainistigh Méideanna Saincheaptha" + +-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790 ++#: ../gtk/gtkcustompaperunixdialog.c:558 ../gtk/gtkpagesetupunixdialog.c:778 + msgid "inch" + msgstr "orlach" + +-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788 ++#: ../gtk/gtkcustompaperunixdialog.c:560 ../gtk/gtkpagesetupunixdialog.c:776 + msgid "mm" + msgstr "mm" + +-#: gtk/gtkcustompaperunixdialog.c:581 ++#: ../gtk/gtkcustompaperunixdialog.c:605 + msgid "Margins from Printer..." + msgstr "Imill ón bPrintéir" + +-#: gtk/gtkcustompaperunixdialog.c:747 ++#: ../gtk/gtkcustompaperunixdialog.c:771 + #, c-format + msgid "Custom Size %d" + msgstr "Méid Saincheaptha %d" + +-#: gtk/gtkcustompaperunixdialog.c:1059 ++#: ../gtk/gtkcustompaperunixdialog.c:1109 + msgid "_Width:" + msgstr "_Leithead:" + +-#: gtk/gtkcustompaperunixdialog.c:1071 ++#: ../gtk/gtkcustompaperunixdialog.c:1120 + msgid "_Height:" + msgstr "_Airde:" + +-#: gtk/gtkcustompaperunixdialog.c:1083 ++#: ../gtk/gtkcustompaperunixdialog.c:1131 + msgid "Paper Size" + msgstr "Méid Pháipéir" + +-#: gtk/gtkcustompaperunixdialog.c:1092 ++#: ../gtk/gtkcustompaperunixdialog.c:1140 + msgid "_Top:" + msgstr "Ba_rr:" + +-#: gtk/gtkcustompaperunixdialog.c:1104 ++#: ../gtk/gtkcustompaperunixdialog.c:1151 + msgid "_Bottom:" + msgstr "_Bun:" + +-#: gtk/gtkcustompaperunixdialog.c:1116 ++#: ../gtk/gtkcustompaperunixdialog.c:1162 + msgid "_Left:" + msgstr "Ar _Chlé:" + +-#: gtk/gtkcustompaperunixdialog.c:1128 ++#: ../gtk/gtkcustompaperunixdialog.c:1173 + msgid "_Right:" + msgstr "Ar _Dheis:" + +-#: gtk/gtkcustompaperunixdialog.c:1169 ++#: ../gtk/gtkcustompaperunixdialog.c:1212 + msgid "Paper Margins" + msgstr "Imill an Páipéar" + +-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248 ++#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583 + msgid "Input _Methods" + msgstr "_Modhanna Ionchurtha" + +-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262 ++#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597 + msgid "_Insert Unicode Control Character" + msgstr "_Ionsáigh Carachtar Rialú Unicode" + +-#: gtk/gtkentry.c:10015 +-msgid "Caps Lock and Num Lock are on" +-msgstr "" +- +-#: gtk/gtkentry.c:10017 +-#, fuzzy +-msgid "Num Lock is on" +-msgstr "Tá Caps Lock ann" +- +-#: gtk/gtkentry.c:10019 ++#: ../gtk/gtkentry.c:10107 + msgid "Caps Lock is on" + msgstr "Tá Caps Lock ann" + ++#. * ++#. * SECTION:gtkfilechooserbutton ++#. * @Short_description: A button to launch a file selection dialog ++#. * @Title: GtkFileChooserButton ++#. * @See_also:#GtkFileChooserDialog ++#. * ++#. * The #GtkFileChooserButton is a widget that lets the user select a ++#. * file. It implements the #GtkFileChooser interface. Visually, it is a ++#. * file name with a button to bring up a #GtkFileChooserDialog. ++#. * The user can then use that dialog to change the file associated with ++#. * that button. This widget does not support setting the ++#. * #GtkFileChooser:select-multiple property to %TRUE. ++#. * ++#. * <example> ++#. * <title>Create a button to let the user select a file in /etc</title> ++#. * <programlisting> ++#. * { ++#. * GtkWidget *button; ++#. * ++#. * button = gtk_file_chooser_button_new (_("Select a file"), ++#. * GTK_FILE_CHOOSER_ACTION_OPEN); ++#. * gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button), ++#. * "/etc"); ++#. * } ++#. * </programlisting> ++#. * </example> ++#. * ++#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s ++#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER. ++#. * ++#. * <important> ++#. * The #GtkFileChooserButton will ellipsize the label, ++#. * and thus will thus request little horizontal space. To give the button ++#. * more space, you should call gtk_widget_get_preferred_size(), ++#. * gtk_file_chooser_button_set_width_chars(), or pack the button in ++#. * such a way that other interface elements give space to the widget. ++#. * </important> ++#. + #. **************** * + #. * Private Macros * + #. * **************** +-#: gtk/gtkfilechooserbutton.c:61 +-msgid "Select A File" ++#: ../gtk/gtkfilechooserbutton.c:104 ++msgid "Select a File" + msgstr "Roghnaigh Comhad" + +-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812 ++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 + msgid "Desktop" + msgstr "Deasc" + +-#: gtk/gtkfilechooserbutton.c:63 ++#: ../gtk/gtkfilechooserbutton.c:106 + msgid "(None)" + msgstr "(Neamhní)" + +-#: gtk/gtkfilechooserbutton.c:2005 ++#: ../gtk/gtkfilechooserbutton.c:2046 + msgid "Other..." + msgstr "Eile..." + +-#: gtk/gtkfilechooserdefault.c:148 ++#: ../gtk/gtkfilechooserdefault.c:152 + msgid "Type name of new folder" + msgstr "Clóscríobh ainm den fhillteán nua" + +-#: gtk/gtkfilechooserdefault.c:938 ++#: ../gtk/gtkfilechooserdefault.c:970 + msgid "Could not retrieve information about the file" + msgstr "Níorbh fhéidir eolas faoin gcomhad a fháil" + +-#: gtk/gtkfilechooserdefault.c:949 ++#: ../gtk/gtkfilechooserdefault.c:981 + msgid "Could not add a bookmark" + msgstr "Níorbh fhéidir leabharmharc a chur leis" + +-#: gtk/gtkfilechooserdefault.c:960 ++#: ../gtk/gtkfilechooserdefault.c:992 + msgid "Could not remove bookmark" + msgstr "Níorbh fhéidir leabharmharc a bhaint" + +-#: gtk/gtkfilechooserdefault.c:971 ++#: ../gtk/gtkfilechooserdefault.c:1003 + msgid "The folder could not be created" + msgstr "Níorbh fhéidir an fillteán a chruthú" + +-#: gtk/gtkfilechooserdefault.c:984 ++#: ../gtk/gtkfilechooserdefault.c:1016 + msgid "" + "The folder could not be created, as a file with the same name already " + "exists. Try using a different name for the folder, or rename the file first." +@@ -859,11 +1463,26 @@ msgstr "" + "an ainm céanna. Bain triail as úsáid ainm difriúil don fhillteán, nó " + "athainmnigh an comhad ar dtús." + +-#: gtk/gtkfilechooserdefault.c:995 ++#: ../gtk/gtkfilechooserdefault.c:1030 ++msgid "You need to choose a valid filename." ++msgstr "" ++ ++#: ../gtk/gtkfilechooserdefault.c:1033 ++#, fuzzy, c-format ++msgid "Cannot create a file under %s as it is not a folder" ++msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta" ++ ++#: ../gtk/gtkfilechooserdefault.c:1045 ++msgid "" ++"You may only select folders. The item that you selected is not a folder; " ++"try using a different item." ++msgstr "" ++ ++#: ../gtk/gtkfilechooserdefault.c:1055 + msgid "Invalid file name" + msgstr "Ainm comhaid neamhbhailí" + +-#: gtk/gtkfilechooserdefault.c:1005 ++#: ../gtk/gtkfilechooserdefault.c:1065 + msgid "The folder contents could not be displayed" + msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint" + +@@ -871,201 +1490,212 @@ msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint" + #. * is a hostname. Nautilus and the panel contain the same string + #. * to translate. + #. +-#: gtk/gtkfilechooserdefault.c:1555 ++#: ../gtk/gtkfilechooserdefault.c:1591 + #, c-format + msgid "%1$s on %2$s" + msgstr "%1$s ar %2$s" + +-#: gtk/gtkfilechooserdefault.c:1731 ++#: ../gtk/gtkfilechooserdefault.c:1740 + msgid "Search" + msgstr "Cuardaigh" + +-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289 ++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 + msgid "Recently Used" + msgstr "Úsáidte le Déanaí" + +-#: gtk/gtkfilechooserdefault.c:2409 ++#: ../gtk/gtkfilechooserdefault.c:2363 + msgid "Select which types of files are shown" + msgstr "Roghnaigh an cineál comhad atá taispeánta" + +-#: gtk/gtkfilechooserdefault.c:2768 ++#: ../gtk/gtkfilechooserdefault.c:2722 + #, c-format + msgid "Add the folder '%s' to the bookmarks" + msgstr "Cuir an fillteán '%s' leis na leabharmharcanna" + +-#: gtk/gtkfilechooserdefault.c:2812 ++#: ../gtk/gtkfilechooserdefault.c:2766 + #, c-format + msgid "Add the current folder to the bookmarks" + msgstr "Cuir an fillteán reatha leis na leabharmharcanna" + +-#: gtk/gtkfilechooserdefault.c:2814 ++#: ../gtk/gtkfilechooserdefault.c:2768 + #, c-format + msgid "Add the selected folders to the bookmarks" + msgstr "Cuir na fillteáin roghnaithe leis na leabharmharcanna" + +-#: gtk/gtkfilechooserdefault.c:2852 ++#: ../gtk/gtkfilechooserdefault.c:2806 + #, c-format + msgid "Remove the bookmark '%s'" + msgstr "Bain an leabharmharc '%s'" + +-#: gtk/gtkfilechooserdefault.c:2854 ++#: ../gtk/gtkfilechooserdefault.c:2808 + #, c-format + msgid "Bookmark '%s' cannot be removed" + msgstr "Ní féidir leabharmharc '%s' a bhaint" + +-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725 ++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 + msgid "Remove the selected bookmark" + msgstr "Bain an leabharmharc roghnaithe" + +-#: gtk/gtkfilechooserdefault.c:3421 ++#: ../gtk/gtkfilechooserdefault.c:3379 + msgid "Remove" + msgstr "Bain" + +-#: gtk/gtkfilechooserdefault.c:3430 ++#: ../gtk/gtkfilechooserdefault.c:3388 + msgid "Rename..." + msgstr "Athainmnigh..." + + #. Accessible object name for the file chooser's shortcuts pane +-#: gtk/gtkfilechooserdefault.c:3593 ++#: ../gtk/gtkfilechooserdefault.c:3552 + msgid "Places" + msgstr "Áiteanna" + + #. Column header for the file chooser's shortcuts pane +-#: gtk/gtkfilechooserdefault.c:3650 ++#: ../gtk/gtkfilechooserdefault.c:3609 + msgid "_Places" + msgstr "_Áiteanna" + +-#: gtk/gtkfilechooserdefault.c:3706 +-msgid "_Add" +-msgstr "Cuir _Leis" +- +-#: gtk/gtkfilechooserdefault.c:3713 ++#: ../gtk/gtkfilechooserdefault.c:3689 + msgid "Add the selected folder to the Bookmarks" + msgstr "Cuir an fillteán roghnaithe leis na Leabharmharcanna" + +-#: gtk/gtkfilechooserdefault.c:3718 +-msgid "_Remove" +-msgstr "_Bain" +- +-#: gtk/gtkfilechooserdefault.c:3860 ++#: ../gtk/gtkfilechooserdefault.c:3950 + msgid "Could not select file" + msgstr "Níorbh fhéidir comhad a roghnú" + +-#: gtk/gtkfilechooserdefault.c:4035 ++#: ../gtk/gtkfilechooserdefault.c:4175 ++msgid "_Visit this file" ++msgstr "" ++ ++#: ../gtk/gtkfilechooserdefault.c:4178 ++#, fuzzy ++msgid "_Copy file's location" ++msgstr "Cóipeái_l Suíomh" ++ ++#: ../gtk/gtkfilechooserdefault.c:4181 + msgid "_Add to Bookmarks" + msgstr "_Cuir le Leabharmharcanna" + +-#: gtk/gtkfilechooserdefault.c:4048 ++#: ../gtk/gtkfilechooserdefault.c:4188 + msgid "Show _Hidden Files" + msgstr "Taispeáin Com_haid Folaithe" + +-#: gtk/gtkfilechooserdefault.c:4055 ++#: ../gtk/gtkfilechooserdefault.c:4191 + msgid "Show _Size Column" + msgstr "Taispeáin Colún _Méide" + +-#: gtk/gtkfilechooserdefault.c:4281 ++#: ../gtk/gtkfilechooserdefault.c:4416 + msgid "Files" + msgstr "Comhaid" + +-#: gtk/gtkfilechooserdefault.c:4332 ++#: ../gtk/gtkfilechooserdefault.c:4467 + msgid "Name" + msgstr "Ainm" + +-#: gtk/gtkfilechooserdefault.c:4355 ++#: ../gtk/gtkfilechooserdefault.c:4490 + msgid "Size" + msgstr "Méid" + +-#: gtk/gtkfilechooserdefault.c:4369 ++#: ../gtk/gtkfilechooserdefault.c:4504 + msgid "Modified" + msgstr "Athraithe" + + #. Label +-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801 ++#: ../gtk/gtkfilechooserdefault.c:4597 + msgid "_Name:" + msgstr "_Ainm:" + +-#: gtk/gtkfilechooserdefault.c:4667 +-msgid "_Browse for other folders" +-msgstr "_Brabhsáil ar fhillteáin eile" +- +-#: gtk/gtkfilechooserdefault.c:4937 ++#: ../gtk/gtkfilechooserdefault.c:4828 + msgid "Type a file name" + msgstr "Clóscríobh ainm comhaid" + ++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 ++#, fuzzy ++msgid "Please select a folder below" ++msgstr "Roghnaigh fillteán" ++ ++#: ../gtk/gtkfilechooserdefault.c:4881 ++#, fuzzy ++msgid "Please type a file name" ++msgstr "Clóscríobh ainm comhaid" ++ + #. Create Folder +-#: gtk/gtkfilechooserdefault.c:4980 ++#: ../gtk/gtkfilechooserdefault.c:4952 + msgid "Create Fo_lder" + msgstr "Cruthaigh Fi_llteán" + +-#: gtk/gtkfilechooserdefault.c:4990 ++#: ../gtk/gtkfilechooserdefault.c:5000 ++msgid "Search:" ++msgstr "Cuardaigh:" ++ ++#: ../gtk/gtkfilechooserdefault.c:5051 + msgid "_Location:" + msgstr "_Suíomh:" + +-#: gtk/gtkfilechooserdefault.c:5194 ++#: ../gtk/gtkfilechooserdefault.c:5502 + msgid "Save in _folder:" + msgstr "Sábháil i bh_fillteán:" + +-#: gtk/gtkfilechooserdefault.c:5196 ++#: ../gtk/gtkfilechooserdefault.c:5504 + msgid "Create in _folder:" + msgstr "Cruthaigh i bh_fillteán:" + +-#: gtk/gtkfilechooserdefault.c:6248 ++#: ../gtk/gtkfilechooserdefault.c:6591 + #, c-format + msgid "Could not read the contents of %s" + msgstr "Níorbh fhéidir ábhair %s a léamh" + +-#: gtk/gtkfilechooserdefault.c:6252 ++#: ../gtk/gtkfilechooserdefault.c:6595 + msgid "Could not read the contents of the folder" + msgstr "Níorbh fhéidir ábhair an fhíllteáin a léamh" + +-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413 +-#: gtk/gtkfilechooserdefault.c:6558 ++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 ++#: ../gtk/gtkfilechooserdefault.c:6936 + msgid "Unknown" + msgstr "Anaithnid" + +-#: gtk/gtkfilechooserdefault.c:6360 ++#: ../gtk/gtkfilechooserdefault.c:6703 + msgid "%H:%M" + msgstr "%H:%M" + +-#: gtk/gtkfilechooserdefault.c:6362 ++#: ../gtk/gtkfilechooserdefault.c:6705 + msgid "Yesterday at %H:%M" + msgstr "Inné ar a %H:%M" + +-#: gtk/gtkfilechooserdefault.c:7028 ++#: ../gtk/gtkfilechooserdefault.c:7407 + msgid "Cannot change to folder because it is not local" + msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta" + +-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646 ++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 + #, c-format + msgid "Shortcut %s already exists" + msgstr "Tá aicearra %s ann cheana" + +-#: gtk/gtkfilechooserdefault.c:7736 ++#: ../gtk/gtkfilechooserdefault.c:8122 + #, c-format + msgid "Shortcut %s does not exist" + msgstr "Níl aicearra %s ann" + +-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480 ++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 + #, c-format + msgid "A file named \"%s\" already exists. Do you want to replace it?" + msgstr "Tá comhad darbh ainm \"%s\" ann cheana. Ar mhaith leat é a athchur?" + +-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484 ++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 + #, c-format + msgid "" + "The file already exists in \"%s\". Replacing it will overwrite its contents." + msgstr "" + "Tá an comhad ann i \"%s\" cheana. Forscríobhfar a ábhair má ionadaítear é." + +-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491 ++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 + msgid "_Replace" + msgstr "_Ionadaigh" + +-#: gtk/gtkfilechooserdefault.c:8658 ++#: ../gtk/gtkfilechooserdefault.c:9183 + msgid "Could not start the search process" + msgstr "Níorbh fhéidir an próiseas cuardaigh a thosú" + +-#: gtk/gtkfilechooserdefault.c:8659 ++#: ../gtk/gtkfilechooserdefault.c:9184 + msgid "" + "The program was not able to create a connection to the indexer daemon. " + "Please make sure it is running." +@@ -1074,221 +1704,192 @@ msgstr "" + "innéacsóra.\n" + "Cinntigh go bhfuil sé á rith, le do thoil." + +-#: gtk/gtkfilechooserdefault.c:8673 ++#: ../gtk/gtkfilechooserdefault.c:9198 + msgid "Could not send the search request" + msgstr "Níorbh fhéidir an t-iarratas cuardaigh a sheoladh" + +-#: gtk/gtkfilechooserdefault.c:8861 +-msgid "Search:" +-msgstr "Cuardaigh:" +- +-#: gtk/gtkfilechooserdefault.c:9466 ++#: ../gtk/gtkfilechooserdefault.c:9808 + #, c-format + msgid "Could not mount %s" + msgstr "Níorbh fhéidir %s a ghléasadh" + +-#. Translators: this is shown in the feedback for Tab-completion in a file +-#. * chooser's text entry, when the user enters an invalid path. +-#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169 +-msgid "Invalid path" +-msgstr "Conair neamhbhailí" +- +-#. translators: this text is shown when there are no completions +-#. * for something the user typed in a file chooser entry +-#. +-#: gtk/gtkfilechooserentry.c:1101 +-msgid "No match" +-msgstr "Gan rud comhoiriúnach" +- +-#. translators: this text is shown when there is exactly one completion +-#. * for something the user typed in a file chooser entry +-#. +-#: gtk/gtkfilechooserentry.c:1112 +-msgid "Sole completion" +-msgstr "An comhlánú amháin" +- +-#. translators: this text is shown when the text in a file chooser +-#. * entry is a complete filename, but could be continued to find +-#. * a longer match +-#. +-#: gtk/gtkfilechooserentry.c:1128 +-msgid "Complete, but not unique" +-msgstr "Curtha i grích, ach nach uathúil" +- +-#. Translators: this text is shown while the system is searching +-#. * for possible completions for filenames in a file chooser entry. +-#: gtk/gtkfilechooserentry.c:1160 +-msgid "Completing..." +-msgstr "Á chur i grích..." +- +-#. hostnames in a local_only file chooser? user error +-#. Translators: this is shown in the feedback for Tab-completion in a +-#. * file chooser's text entry when the user enters something like +-#. * "sftp://blahblah" in an app that only supports local filenames. +-#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207 +-msgid "Only local files may be selected" +-msgstr "Is féidir comhaid logánta amháin a roghnú" +- +-#. Another option is to complete the hostname based on the remote volumes that are mounted +-#. Translators: this is shown in the feedback for Tab-completion in a +-#. * file chooser's text entry when the user hasn't entered the first '/' +-#. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]") +-#: gtk/gtkfilechooserentry.c:1191 +-msgid "Incomplete hostname; end it with '/'" +-msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh" +- +-#. Translators: this is shown in the feedback for Tab-completion in a file +-#. * chooser's text entry when the user enters a path that does not exist +-#. * and then hits Tab +-#: gtk/gtkfilechooserentry.c:1202 +-msgid "Path does not exist" +-msgstr "Níl an conair sin ann" +- +-#: gtk/gtkfilechoosersettings.c:486 +-#, c-format +-msgid "Error creating folder '%s': %s" +-msgstr "Earráid agus fillteán '%s' á chruthú: %s" +- + #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are + #. * really pointers to GDrive, GVolume or GMount objects. We need an extra + #. * token for the fake "File System" volume. So, we'll return a pointer to + #. * this particular string. + #. +-#: gtk/gtkfilesystem.c:48 ++#: ../gtk/gtkfilesystem.c:47 + msgid "File System" + msgstr "Córas Comhaid" + +-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266 +-msgid "Pick a Font" +-msgstr "Roghnaigh Cló" +- +-#. Initialize fields +-#: gtk/gtkfontbutton.c:260 ++#: ../gtk/gtkfontbutton.c:354 + msgid "Sans 12" + msgstr "Sans 12" + +-#: gtk/gtkfontbutton.c:785 ++#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkfontbutton.c:563 ++msgid "Pick a Font" ++msgstr "Roghnaigh Cló" ++ ++#: ../gtk/gtkfontbutton.c:1121 + msgid "Font" + msgstr "Cló" + +-#. This is the default text shown in the preview entry, though the user +-#. can set it. Remember that some fonts only have capital letters. +-#: gtk/gtkfontsel.c:103 +-msgid "abcdefghijk ABCDEFGHIJK" +-msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ" +- +-#: gtk/gtkfontsel.c:370 +-msgid "_Family:" +-msgstr "_Clann:" +- +-#: gtk/gtkfontsel.c:376 +-msgid "_Style:" +-msgstr "_Stíl:" +- +-#: gtk/gtkfontsel.c:382 +-msgid "Si_ze:" +-msgstr "_Méid:" +- +-#. create the text entry widget +-#: gtk/gtkfontsel.c:559 +-msgid "_Preview:" +-msgstr "_Réamhamharc:" +- +-#: gtk/gtkfontsel.c:1659 +-msgid "Font Selection" +-msgstr "Roghnú Cló" +- +-#. Remove this icon source so we don't keep trying to +-#. * load it. +-#. +-#: gtk/gtkiconfactory.c:1356 +-#, c-format +-msgid "Error loading icon: %s" +-msgstr "Earráid agus deilbhín á luchtú: %s" ++#: ../gtk/gtkfontchooserwidget.c:110 ++msgid "No fonts matched your search. You can revise your search and try again." ++msgstr "" + +-#: gtk/gtkicontheme.c:1354 +-#, c-format +-msgid "" +-"Could not find the icon '%s'. The '%s' theme\n" +-"was not found either, perhaps you need to install it.\n" +-"You can get a copy from:\n" +-"\t%s" ++#: ../gtk/gtkfontchooserwidget.c:557 ++msgid "Search font name" + msgstr "" +-"Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n" +-"aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n" +-"gcaithfidh tú é a shuiteáil.\n" +-"Is féidir leat cóip a fháil ó:\n" +-"\t%s" + +-#: gtk/gtkicontheme.c:1535 ++#: ../gtk/gtkfontchooserwidget.c:891 ++#, fuzzy ++msgid "Font Family" ++msgstr "_Clann:" ++ ++#: ../gtk/gtkicontheme.c:1630 + #, c-format + msgid "Icon '%s' not present in theme" + msgstr "Níl deilbhín '%s' ann sa téama" + +-#: gtk/gtkicontheme.c:3048 ++#: ../gtk/gtkicontheme.c:3138 + msgid "Failed to load icon" + msgstr "Theip ar luchtú deilbhín" + +-#: gtk/gtkimmodule.c:526 ++#: ../gtk/gtkimmodule.c:515 + msgid "Simple" + msgstr "Simplí" + +-#: gtk/gtkimmulticontext.c:588 ++#: ../gtk/gtkimmulticontext.c:608 + msgctxt "input method menu" + msgid "System" + msgstr "Córas" + +-#: gtk/gtkimmulticontext.c:598 ++#: ../gtk/gtkimmulticontext.c:618 + msgctxt "input method menu" + msgid "None" + msgstr "Neamhní" + +-#: gtk/gtkimmulticontext.c:681 ++#: ../gtk/gtkimmulticontext.c:701 + #, c-format + msgctxt "input method menu" + msgid "System (%s)" + msgstr "Córas (%s)" + + #. Open Link +-#: gtk/gtklabel.c:6202 ++#: ../gtk/gtklabel.c:6224 + msgid "_Open Link" + msgstr "_Oscail Nasc" + + #. Copy Link Address +-#: gtk/gtklabel.c:6214 ++#: ../gtk/gtklabel.c:6236 + msgid "Copy _Link Address" + msgstr "Cóipeáil Seoladh an _Naisc" + +-#: gtk/gtklinkbutton.c:449 ++#: ../gtk/gtk-launch.c:73 ++msgid "APPLICATION [URI...] - launch an APPLICATION with URI." ++msgstr "" ++ ++#. Translators: this message will appear after the usage string ++#. and before the list of options. ++#: ../gtk/gtk-launch.c:77 ++msgid "" ++"Launch specified application by its desktop file info\n" ++"optionally passing list of URIs as arguments." ++msgstr "" ++ ++#: ../gtk/gtk-launch.c:89 ++#, fuzzy, c-format ++msgid "Error parsing commandline options: %s\n" ++msgstr "Earráid agus deilbhín á luchtú: %s" ++ ++#: ../gtk/gtk-launch.c:91 ../gtk/gtk-launch.c:104 ++#, c-format ++msgid "Try \"%s --help\" for more information." ++msgstr "" ++ ++#. Translators: the %s is the program name. This error message ++#. means the user is calling gtk-launch without any argument. ++#: ../gtk/gtk-launch.c:102 ++#, c-format ++msgid "%s: missing application name" ++msgstr "" ++ ++#: ../gtk/gtk-launch.c:123 ++#, c-format ++msgid "Creating AppInfo from id not supported on non unix operating systems" ++msgstr "" ++ ++#. Translators: the first %s is the program name, the second one ++#. is the application name. ++#: ../gtk/gtk-launch.c:131 ++#, c-format ++msgid "%s: no such application %s" ++msgstr "" ++ ++#. Translators: the first %s is the program name, the second one ++#. is the error message. ++#: ../gtk/gtk-launch.c:149 ++#, fuzzy, c-format ++msgid "%s: error launching application: %s\n" ++msgstr "Earráid agus deilbhín á luchtú: %s" ++ ++#: ../gtk/gtklinkbutton.c:499 + msgid "Copy URL" + msgstr "Cóipeáil URL" + +-#: gtk/gtklinkbutton.c:601 ++#: ../gtk/gtklinkbutton.c:665 + msgid "Invalid URI" + msgstr "URI Neamhbhailí" + ++#: ../gtk/gtklockbutton.c:290 ++msgid "Lock" ++msgstr "Cuir Faoi Ghlas" ++ ++#: ../gtk/gtklockbutton.c:299 ++msgid "Unlock" ++msgstr "Díghlasáil" ++ ++#: ../gtk/gtklockbutton.c:308 ++msgid "" ++"Dialog is unlocked.\n" ++"Click to prevent further changes" ++msgstr "" ++ ++#: ../gtk/gtklockbutton.c:317 ++msgid "" ++"Dialog is locked.\n" ++"Click to make changes" ++msgstr "" ++ ++#: ../gtk/gtklockbutton.c:326 ++msgid "" ++"System policy prevents changes.\n" ++"Contact your system administrator" ++msgstr "" ++ + #. Description of --gtk-module=MODULES in --help output +-#: gtk/gtkmain.c:526 ++#: ../gtk/gtkmain.c:447 + msgid "Load additional GTK+ modules" + msgstr "Luchtaigh modúil GTK+ breise" + + #. Placeholder in --gtk-module=MODULES in --help output +-#: gtk/gtkmain.c:527 ++#: ../gtk/gtkmain.c:448 + msgid "MODULES" + msgstr "MODÚIL" + + #. Description of --g-fatal-warnings in --help output +-#: gtk/gtkmain.c:529 ++#: ../gtk/gtkmain.c:450 + msgid "Make all warnings fatal" + msgstr "Déan marfach gach rabhadh" + + #. Description of --gtk-debug=FLAGS in --help output +-#: gtk/gtkmain.c:532 ++#: ../gtk/gtkmain.c:453 + msgid "GTK+ debugging flags to set" + msgstr "Bratacha dífhabhtaithe GTK+ a shocrú" + + #. Description of --gtk-no-debug=FLAGS in --help output +-#: gtk/gtkmain.c:535 ++#: ../gtk/gtkmain.c:456 + msgid "GTK+ debugging flags to unset" + msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú" + +@@ -1297,123 +1898,141 @@ msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú" + #. * Do *not* translate it to "predefinito:LTR", if it + #. * it isn't default:LTR or default:RTL it will not work + #. +-#: gtk/gtkmain.c:798 ++#: ../gtk/gtkmain.c:704 + msgid "default:LTR" + msgstr "default:LTR" + +-#: gtk/gtkmain.c:863 ++#: ../gtk/gtkmain.c:772 + #, c-format + msgid "Cannot open display: %s" + msgstr "Ní féidir taispeáint a oscailt: %s" + +-#: gtk/gtkmain.c:922 ++#: ../gtk/gtkmain.c:838 + msgid "GTK+ Options" + msgstr "Roghanna GTK+" + +-#: gtk/gtkmain.c:922 ++#: ../gtk/gtkmain.c:838 + msgid "Show GTK+ Options" + msgstr "Taispeáin Roghanna GTK+" + +-#: gtk/gtkmountoperation.c:491 ++#: ../gtk/gtkmountoperation.c:535 + msgid "Co_nnect" + msgstr "_Nasc" + +-#: gtk/gtkmountoperation.c:558 +-msgid "Connect _anonymously" ++#: ../gtk/gtkmountoperation.c:609 ++#, fuzzy ++msgid "Connect As" ++msgstr "_Nasc" ++ ++#: ../gtk/gtkmountoperation.c:618 ++#, fuzzy ++msgid "_Anonymous" + msgstr "Nasc gan _ainm" + +-#: gtk/gtkmountoperation.c:567 +-msgid "Connect as u_ser:" +-msgstr "Nasc mar ú_sáideoir:" ++#: ../gtk/gtkmountoperation.c:627 ++msgid "Registered U_ser" ++msgstr "" + +-#: gtk/gtkmountoperation.c:605 +-msgid "_Username:" ++#: ../gtk/gtkmountoperation.c:638 ++#, fuzzy ++msgid "_Username" + msgstr "_Ainm úsáideora:" + +-#: gtk/gtkmountoperation.c:610 +-msgid "_Domain:" ++#: ../gtk/gtkmountoperation.c:643 ++#, fuzzy ++msgid "_Domain" + msgstr "F_earann:" + +-#: gtk/gtkmountoperation.c:616 +-msgid "_Password:" ++#: ../gtk/gtkmountoperation.c:649 ++#, fuzzy ++msgid "_Password" + msgstr "_Focal faire:" + +-#: gtk/gtkmountoperation.c:634 ++#: ../gtk/gtkmountoperation.c:671 + msgid "Forget password _immediately" + msgstr "Déan _dearmad ar an bhfocal faire láithreach" + +-#: gtk/gtkmountoperation.c:644 ++#: ../gtk/gtkmountoperation.c:681 + msgid "Remember password until you _logout" + msgstr "Meabhraigh focal faire go dtí go _logálann tú amach" + +-#: gtk/gtkmountoperation.c:654 ++#: ../gtk/gtkmountoperation.c:691 + msgid "Remember _forever" + msgstr "Meabhraigh go d_eo" + +-#: gtk/gtkmountoperation.c:883 ++#: ../gtk/gtkmountoperation.c:1080 + #, fuzzy, c-format + msgid "Unknown Application (PID %d)" + msgstr "Feidhmchlár Anaithnid (pid %d)" + +-#: gtk/gtkmountoperation.c:1066 +-#, c-format ++#: ../gtk/gtkmountoperation.c:1263 + msgid "Unable to end process" + msgstr "Ní féidir deireadh a chur leis an bpróiseas" + +-#: gtk/gtkmountoperation.c:1103 ++#: ../gtk/gtkmountoperation.c:1300 + msgid "_End Process" + msgstr "Cuir _Deireadh Leis an bPróiseas" + +-#: gtk/gtkmountoperation-stub.c:64 ++#: ../gtk/gtkmountoperation-stub.c:62 + #, fuzzy, c-format + msgid "Cannot kill process with PID %d. Operation is not implemented." + msgstr "" + "Ní féidir an próiseas le pid %d a mharú. Níl an oibríocht curtha i ngníomh." + + #. translators: this string is a name for the 'less' command +-#: gtk/gtkmountoperation-x11.c:862 ++#: ../gtk/gtkmountoperation-x11.c:954 + msgid "Terminal Pager" + msgstr "Brabhsálaí Teirminéil" + +-#: gtk/gtkmountoperation-x11.c:863 ++#: ../gtk/gtkmountoperation-x11.c:955 + msgid "Top Command" + msgstr "Ordú Top" + +-#: gtk/gtkmountoperation-x11.c:864 ++#: ../gtk/gtkmountoperation-x11.c:956 + msgid "Bourne Again Shell" + msgstr "Blaosc Bourne Again" + +-#: gtk/gtkmountoperation-x11.c:865 ++#: ../gtk/gtkmountoperation-x11.c:957 + msgid "Bourne Shell" + msgstr "Blaosc Bourne" + +-#: gtk/gtkmountoperation-x11.c:866 ++#: ../gtk/gtkmountoperation-x11.c:958 + msgid "Z Shell" + msgstr "Blaosc Z" + +-#: gtk/gtkmountoperation-x11.c:963 ++#: ../gtk/gtkmountoperation-x11.c:1055 + #, fuzzy, c-format + msgid "Cannot end process with PID %d: %s" + msgstr "Ní féidir deireadh a chur leis an bpróiseas le pid %d: %s" + +-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170 ++#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721 + #, c-format + msgid "Page %u" + msgstr "Leathanach %u" + +-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880 ++#. Translators: the format here is used to build the string that will be rendered ++#. * in the number emblem. ++#. ++#: ../gtk/gtknumerableicon.c:482 ++#, c-format ++msgctxt "Number format" ++msgid "%d" ++msgstr "%d" ++ ++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 ++#: ../gtk/gtkpapersize.c:888 + msgid "Not a valid page setup file" + msgstr "Ní comhad socrú leathanaigh bailí é" + +-#: gtk/gtkpagesetupunixdialog.c:179 ++#: ../gtk/gtkpagesetupunixdialog.c:167 + msgid "Any Printer" + msgstr "Printéir ar Bith" + +-#: gtk/gtkpagesetupunixdialog.c:179 ++#: ../gtk/gtkpagesetupunixdialog.c:167 + msgid "For portable documents" + msgstr "Le haghaidh cáipéisí iniompartha" + +-#: gtk/gtkpagesetupunixdialog.c:809 ++#: ../gtk/gtkpagesetupunixdialog.c:796 + #, c-format + msgid "" + "Margins:\n" +@@ -1428,239 +2047,229 @@ msgstr "" + " Barr: %s %s\n" + " Bun: %s %s" + +-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284 ++#: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329 + msgid "Manage Custom Sizes..." + msgstr "Bainistigh Méideanna Saincheaptha..." + +-#: gtk/gtkpagesetupunixdialog.c:909 ++#: ../gtk/gtkpagesetupunixdialog.c:896 + msgid "_Format for:" + msgstr "_Formáid le:" + +-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456 ++#: ../gtk/gtkpagesetupunixdialog.c:917 ../gtk/gtkprintunixdialog.c:3477 + msgid "_Paper size:" + msgstr "Méid an _pháipéir:" + +-#: gtk/gtkpagesetupunixdialog.c:962 ++#: ../gtk/gtkpagesetupunixdialog.c:946 + msgid "_Orientation:" + msgstr "_Treoshuíomh:" + +-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518 ++#: ../gtk/gtkpagesetupunixdialog.c:1006 ../gtk/gtkprintunixdialog.c:3531 + msgid "Page Setup" + msgstr "Socrú Leathanaigh" + +-#: gtk/gtkpathbar.c:154 ++#: ../gtk/gtkpathbar.c:159 + msgid "Up Path" + msgstr "Conair Suas" + +-#: gtk/gtkpathbar.c:156 ++#: ../gtk/gtkpathbar.c:161 + msgid "Down Path" + msgstr "Conair Síos" + +-#: gtk/gtkpathbar.c:1497 ++#: ../gtk/gtkpathbar.c:1644 + msgid "File System Root" + msgstr "Fréamh Chóras Comhaid" + +-#: gtk/gtkprintbackend.c:749 ++#: ../gtk/gtkprintbackend.c:750 + msgid "Authentication" + msgstr "Fíordheimhniú" + +-#: gtk/gtkprinteroptionwidget.c:694 +-msgid "Not available" +-msgstr "Níl ar fáil" +- +-#: gtk/gtkprinteroptionwidget.c:794 +-msgid "Select a folder" ++#: ../gtk/gtkprinteroptionwidget.c:546 ++#, fuzzy ++msgid "Select a filename" + msgstr "Roghnaigh fillteán" + +-#: gtk/gtkprinteroptionwidget.c:813 +-msgid "_Save in folder:" +-msgstr "_Sábháil i bhfillteán:" ++#: ../gtk/gtkprinteroptionwidget.c:770 ++msgid "Not available" ++msgstr "Níl ar fáil" + + #. translators: this string is the default job title for print + #. * jobs. %s gets replaced by the application name, %d gets replaced + #. * by the job number. + #. +-#: gtk/gtkprintoperation.c:190 ++#: ../gtk/gtkprintoperation.c:260 + #, c-format + msgid "%s job #%d" + msgstr "%s jab #%d" + +-#: gtk/gtkprintoperation.c:1695 ++#: ../gtk/gtkprintoperation.c:1777 + msgctxt "print operation status" + msgid "Initial state" + msgstr "Staid tosaigh" + +-#: gtk/gtkprintoperation.c:1696 ++#: ../gtk/gtkprintoperation.c:1778 + msgctxt "print operation status" + msgid "Preparing to print" + msgstr "Priontáil á ullmhú" + +-#: gtk/gtkprintoperation.c:1697 ++#: ../gtk/gtkprintoperation.c:1779 + msgctxt "print operation status" + msgid "Generating data" + msgstr "Sonraí á nginiúint" + +-#: gtk/gtkprintoperation.c:1698 ++#: ../gtk/gtkprintoperation.c:1780 + msgctxt "print operation status" + msgid "Sending data" + msgstr "Sonraí á seoladh" + +-#: gtk/gtkprintoperation.c:1699 ++#: ../gtk/gtkprintoperation.c:1781 + msgctxt "print operation status" + msgid "Waiting" + msgstr "Ag feitheamh" + +-#: gtk/gtkprintoperation.c:1700 ++#: ../gtk/gtkprintoperation.c:1782 + msgctxt "print operation status" + msgid "Blocking on issue" + msgstr "Coiscthe mar gheall ar fhadhb" + +-#: gtk/gtkprintoperation.c:1701 ++#: ../gtk/gtkprintoperation.c:1783 + msgctxt "print operation status" + msgid "Printing" + msgstr "Á Phriontáil" + +-#: gtk/gtkprintoperation.c:1702 ++#: ../gtk/gtkprintoperation.c:1784 + msgctxt "print operation status" + msgid "Finished" + msgstr "Críochnaithe" + +-#: gtk/gtkprintoperation.c:1703 ++#: ../gtk/gtkprintoperation.c:1785 + msgctxt "print operation status" + msgid "Finished with error" + msgstr "Críochnaithe le hearráid" + +-#: gtk/gtkprintoperation.c:2270 ++#: ../gtk/gtkprintoperation.c:2349 + #, c-format + msgid "Preparing %d" + msgstr "%d á ullmhú" + +-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902 +-#, c-format ++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 + msgid "Preparing" + msgstr "Á ullmhú" + +-#: gtk/gtkprintoperation.c:2275 ++#: ../gtk/gtkprintoperation.c:2354 + #, c-format + msgid "Printing %d" + msgstr "%d á phriontáil" + +-#: gtk/gtkprintoperation.c:2932 +-#, c-format ++#: ../gtk/gtkprintoperation.c:3013 + msgid "Error creating print preview" + msgstr "Earráid agus réamhamharc priontála á chruthú" + +-#: gtk/gtkprintoperation.c:2935 +-#, c-format ++#: ../gtk/gtkprintoperation.c:3016 + msgid "The most probable reason is that a temporary file could not be created." + msgstr "Is dócha gur an chúis ná nárbh fhéidir comhad sealadach a chruthú." + +-#: gtk/gtkprintoperation-unix.c:297 ++#: ../gtk/gtkprintoperation-unix.c:307 + msgid "Error launching preview" + msgstr "Earráid agus réamhamharc á thosú" + +-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447 +-msgid "Application" +-msgstr "Feidhmchlár" +- +-#: gtk/gtkprintoperation-win32.c:611 ++#: ../gtk/gtkprintoperation-win32.c:609 + msgid "Printer offline" + msgstr "Printéir as líne" + +-#: gtk/gtkprintoperation-win32.c:613 ++#: ../gtk/gtkprintoperation-win32.c:611 + msgid "Out of paper" + msgstr "Páipéar ídithe" + + #. Translators: this is a printer status. +-#: gtk/gtkprintoperation-win32.c:615 +-#: modules/printbackends/cups/gtkprintbackendcups.c:1998 ++#: ../gtk/gtkprintoperation-win32.c:613 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2126 + msgid "Paused" + msgstr "Curtha ar sos" + +-#: gtk/gtkprintoperation-win32.c:617 ++#: ../gtk/gtkprintoperation-win32.c:615 + msgid "Need user intervention" + msgstr "Teastaíonn idirghabháil an úsáideora" + +-#: gtk/gtkprintoperation-win32.c:717 ++#: ../gtk/gtkprintoperation-win32.c:715 + msgid "Custom size" + msgstr "Méid saincheaptha" + +-#: gtk/gtkprintoperation-win32.c:1539 ++#: ../gtk/gtkprintoperation-win32.c:1537 + msgid "No printer found" + msgstr "Níor aimsíodh aon phrintéir" + +-#: gtk/gtkprintoperation-win32.c:1566 ++#: ../gtk/gtkprintoperation-win32.c:1564 + msgid "Invalid argument to CreateDC" + msgstr "Argóint neamhbhailí go CreateDC" + +-#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829 ++#: ../gtk/gtkprintoperation-win32.c:1600 ../gtk/gtkprintoperation-win32.c:1827 + msgid "Error from StartDoc" + msgstr "Earráid ó StartDoc" + +-#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707 +-#: gtk/gtkprintoperation-win32.c:1755 ++#: ../gtk/gtkprintoperation-win32.c:1682 ../gtk/gtkprintoperation-win32.c:1705 ++#: ../gtk/gtkprintoperation-win32.c:1753 + msgid "Not enough free memory" + msgstr "Cuimhne ídithe" + +-#: gtk/gtkprintoperation-win32.c:1760 ++#: ../gtk/gtkprintoperation-win32.c:1758 + msgid "Invalid argument to PrintDlgEx" + msgstr "Argóint neamhbhailí go PrintDlgEx" + +-#: gtk/gtkprintoperation-win32.c:1765 ++#: ../gtk/gtkprintoperation-win32.c:1763 + msgid "Invalid pointer to PrintDlgEx" + msgstr "Pointeoir neamhbhailí go PrintDlgEx" + +-#: gtk/gtkprintoperation-win32.c:1770 ++#: ../gtk/gtkprintoperation-win32.c:1768 + msgid "Invalid handle to PrintDlgEx" + msgstr "Lorgán neamhbhailí chuig PrintDlgEx" + +-#: gtk/gtkprintoperation-win32.c:1775 ++#: ../gtk/gtkprintoperation-win32.c:1773 + msgid "Unspecified error" + msgstr "Earráid gan sonrú" + +-#: gtk/gtkprintunixdialog.c:618 ++#: ../gtk/gtkprintunixdialog.c:681 + msgid "Getting printer information failed" + msgstr "Theip ar fháil eolais printéara" + +-#: gtk/gtkprintunixdialog.c:1873 ++#: ../gtk/gtkprintunixdialog.c:1916 + msgid "Getting printer information..." + msgstr "Eolas printéara á fháil..." + +-#: gtk/gtkprintunixdialog.c:2139 ++#: ../gtk/gtkprintunixdialog.c:2184 + msgid "Printer" + msgstr "Printéir" + + #. Translators: this is the header for the location column in the print dialog +-#: gtk/gtkprintunixdialog.c:2149 ++#: ../gtk/gtkprintunixdialog.c:2194 + msgid "Location" + msgstr "Suíomh" + + #. Translators: this is the header for the printer status column in the print dialog +-#: gtk/gtkprintunixdialog.c:2160 ++#: ../gtk/gtkprintunixdialog.c:2205 + msgid "Status" + msgstr "Stádas" + +-#: gtk/gtkprintunixdialog.c:2186 ++#: ../gtk/gtkprintunixdialog.c:2231 + msgid "Range" + msgstr "Raon" + +-#: gtk/gtkprintunixdialog.c:2190 ++#: ../gtk/gtkprintunixdialog.c:2235 + msgid "_All Pages" + msgstr "_Gach Leathanach" + +-#: gtk/gtkprintunixdialog.c:2197 ++#: ../gtk/gtkprintunixdialog.c:2240 + msgid "C_urrent Page" + msgstr "Leathanach _Reatha" + +-#: gtk/gtkprintunixdialog.c:2207 ++#: ../gtk/gtkprintunixdialog.c:2248 + msgid "Se_lection" + msgstr "_Roghnú" + +-#: gtk/gtkprintunixdialog.c:2216 ++#: ../gtk/gtkprintunixdialog.c:2254 + msgid "Pag_es:" + msgstr "_Leathanaigh:" + +-#: gtk/gtkprintunixdialog.c:2217 ++#: ../gtk/gtkprintunixdialog.c:2255 + msgid "" + "Specify one or more page ranges,\n" + " e.g. 1-3,7,11" +@@ -1668,28 +2277,28 @@ msgstr "" + "Sonraigh raon leathanaigh amháin nó níos mó,\n" + " m.s. 1-3,7,11" + +-#: gtk/gtkprintunixdialog.c:2227 ++#: ../gtk/gtkprintunixdialog.c:2264 + msgid "Pages" + msgstr "Leathanaigh" + +-#: gtk/gtkprintunixdialog.c:2240 ++#: ../gtk/gtkprintunixdialog.c:2275 + msgid "Copies" + msgstr "Cóipeanna" + + #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns +-#: gtk/gtkprintunixdialog.c:2245 ++#: ../gtk/gtkprintunixdialog.c:2280 + msgid "Copie_s:" + msgstr "Cóip_eanna:" + +-#: gtk/gtkprintunixdialog.c:2263 ++#: ../gtk/gtkprintunixdialog.c:2296 + msgid "C_ollate" + msgstr "C_omhordaigh" + +-#: gtk/gtkprintunixdialog.c:2271 ++#: ../gtk/gtkprintunixdialog.c:2302 + msgid "_Reverse" + msgstr "_Aisiompaithe" + +-#: gtk/gtkprintunixdialog.c:2291 ++#: ../gtk/gtkprintunixdialog.c:2318 + msgid "General" + msgstr "Ginearálta" + +@@ -1699,168 +2308,168 @@ msgstr "Ginearálta" + #. Translators: These strings name the possible arrangements of + #. * multiple pages on a sheet when printing + #. +-#: gtk/gtkprintunixdialog.c:3017 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3508 ++#: ../gtk/gtkprintunixdialog.c:3058 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686 + msgid "Left to right, top to bottom" + msgstr "Clé go deas, barr go bun" + +-#: gtk/gtkprintunixdialog.c:3017 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3508 ++#: ../gtk/gtkprintunixdialog.c:3058 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686 + msgid "Left to right, bottom to top" + msgstr "Clé go deas, bun go barr" + +-#: gtk/gtkprintunixdialog.c:3018 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3509 ++#: ../gtk/gtkprintunixdialog.c:3059 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687 + msgid "Right to left, top to bottom" + msgstr "Deas go clé, barr go bun" + +-#: gtk/gtkprintunixdialog.c:3018 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3509 ++#: ../gtk/gtkprintunixdialog.c:3059 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687 + msgid "Right to left, bottom to top" + msgstr "Deas go clé, bun go barr" + +-#: gtk/gtkprintunixdialog.c:3019 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3510 ++#: ../gtk/gtkprintunixdialog.c:3060 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688 + msgid "Top to bottom, left to right" + msgstr "Barr go bun, clé go deas" + +-#: gtk/gtkprintunixdialog.c:3019 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3510 ++#: ../gtk/gtkprintunixdialog.c:3060 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688 + msgid "Top to bottom, right to left" + msgstr "Barr go bunn, deas go clé" + +-#: gtk/gtkprintunixdialog.c:3020 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3511 ++#: ../gtk/gtkprintunixdialog.c:3061 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689 + msgid "Bottom to top, left to right" + msgstr "Bun go barr, clé go deas" + +-#: gtk/gtkprintunixdialog.c:3020 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3511 ++#: ../gtk/gtkprintunixdialog.c:3061 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689 + msgid "Bottom to top, right to left" + msgstr "Barr go bun, deas go clé" + + #. Translators, this string is used to label the option in the print + #. * dialog that controls in what order multiple pages are arranged + #. +-#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3543 ++#: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3766 + msgid "Page Ordering" + msgstr "Cur in Ord Leathanaigh" + +-#: gtk/gtkprintunixdialog.c:3053 ++#: ../gtk/gtkprintunixdialog.c:3094 + msgid "Left to right" + msgstr "Clé go deas" + +-#: gtk/gtkprintunixdialog.c:3054 ++#: ../gtk/gtkprintunixdialog.c:3095 + msgid "Right to left" + msgstr "Deas go clé" + +-#: gtk/gtkprintunixdialog.c:3066 ++#: ../gtk/gtkprintunixdialog.c:3107 + msgid "Top to bottom" + msgstr "Barr go bun" + +-#: gtk/gtkprintunixdialog.c:3067 ++#: ../gtk/gtkprintunixdialog.c:3108 + msgid "Bottom to top" + msgstr "Bun go barr" + +-#: gtk/gtkprintunixdialog.c:3307 ++#: ../gtk/gtkprintunixdialog.c:3352 + msgid "Layout" + msgstr "Leagan Amach" + +-#: gtk/gtkprintunixdialog.c:3311 ++#: ../gtk/gtkprintunixdialog.c:3356 + msgid "T_wo-sided:" + msgstr "_Déthaobhach:" + +-#: gtk/gtkprintunixdialog.c:3326 ++#: ../gtk/gtkprintunixdialog.c:3368 + msgid "Pages per _side:" + msgstr "Leathanaigh sa _taobh:" + +-#: gtk/gtkprintunixdialog.c:3343 ++#: ../gtk/gtkprintunixdialog.c:3382 + msgid "Page or_dering:" + msgstr "Cur in _ord leathanaigh:" + +-#: gtk/gtkprintunixdialog.c:3359 ++#: ../gtk/gtkprintunixdialog.c:3395 + msgid "_Only print:" + msgstr "_Ná priontáil ach:" + + #. In enum order +-#: gtk/gtkprintunixdialog.c:3374 ++#: ../gtk/gtkprintunixdialog.c:3407 + msgid "All sheets" + msgstr "Gach leathán" + +-#: gtk/gtkprintunixdialog.c:3375 ++#: ../gtk/gtkprintunixdialog.c:3408 + msgid "Even sheets" + msgstr "Leatháin chothroma" + +-#: gtk/gtkprintunixdialog.c:3376 ++#: ../gtk/gtkprintunixdialog.c:3409 + msgid "Odd sheets" + msgstr "Leatháin chorra" + +-#: gtk/gtkprintunixdialog.c:3379 ++#: ../gtk/gtkprintunixdialog.c:3412 + msgid "Sc_ale:" + msgstr "_Scála:" + +-#: gtk/gtkprintunixdialog.c:3406 ++#: ../gtk/gtkprintunixdialog.c:3436 + msgid "Paper" + msgstr "Páipéar" + +-#: gtk/gtkprintunixdialog.c:3410 ++#: ../gtk/gtkprintunixdialog.c:3440 + msgid "Paper _type:" + msgstr "Cineál an pháipéir:" + +-#: gtk/gtkprintunixdialog.c:3425 ++#: ../gtk/gtkprintunixdialog.c:3452 + msgid "Paper _source:" + msgstr "_Foinse an pháipéir:" + +-#: gtk/gtkprintunixdialog.c:3440 ++#: ../gtk/gtkprintunixdialog.c:3464 + msgid "Output t_ray:" + msgstr "T_ráidire aschurtha:" + +-#: gtk/gtkprintunixdialog.c:3480 ++#: ../gtk/gtkprintunixdialog.c:3497 + msgid "Or_ientation:" + msgstr "_Treoshuíomh:" + + #. In enum order +-#: gtk/gtkprintunixdialog.c:3495 ++#: ../gtk/gtkprintunixdialog.c:3509 + msgid "Portrait" + msgstr "Portráid" + +-#: gtk/gtkprintunixdialog.c:3496 ++#: ../gtk/gtkprintunixdialog.c:3510 + msgid "Landscape" + msgstr "Tírdhreach" + +-#: gtk/gtkprintunixdialog.c:3497 ++#: ../gtk/gtkprintunixdialog.c:3511 + msgid "Reverse portrait" + msgstr "Portráid aisiompaithe" + +-#: gtk/gtkprintunixdialog.c:3498 ++#: ../gtk/gtkprintunixdialog.c:3512 + msgid "Reverse landscape" + msgstr "Tírdhreach aisiompaithe" + +-#: gtk/gtkprintunixdialog.c:3543 ++#: ../gtk/gtkprintunixdialog.c:3556 + msgid "Job Details" + msgstr "Sonraí Jab:" + +-#: gtk/gtkprintunixdialog.c:3549 ++#: ../gtk/gtkprintunixdialog.c:3560 + msgid "Pri_ority:" + msgstr "Tosaí_ocht:" + +-#: gtk/gtkprintunixdialog.c:3564 ++#: ../gtk/gtkprintunixdialog.c:3572 + msgid "_Billing info:" + msgstr "Eolas billeáil" + +-#: gtk/gtkprintunixdialog.c:3582 ++#: ../gtk/gtkprintunixdialog.c:3587 + msgid "Print Document" + msgstr "Priontáil Cáipéis" + + #. Translators: this is one of the choices for the print at option + #. * in the print dialog + #. +-#: gtk/gtkprintunixdialog.c:3591 ++#: ../gtk/gtkprintunixdialog.c:3594 + msgid "_Now" + msgstr "A_nois" + +-#: gtk/gtkprintunixdialog.c:3602 ++#: ../gtk/gtkprintunixdialog.c:3603 + msgid "A_t:" + msgstr "A_g:" + +@@ -1868,7 +2477,7 @@ msgstr "A_g:" + #. * You can remove the am/pm values below for your locale if they are not + #. * supported. + #. +-#: gtk/gtkprintunixdialog.c:3608 ++#: ../gtk/gtkprintunixdialog.c:3609 + msgid "" + "Specify the time of print,\n" + " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm" +@@ -1876,121 +2485,105 @@ msgstr "" + "Sonraigh am an phriontála,\n" + " m.s. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm" + +-#: gtk/gtkprintunixdialog.c:3618 ++#: ../gtk/gtkprintunixdialog.c:3617 + msgid "Time of print" + msgstr "Am priontála" + +-#: gtk/gtkprintunixdialog.c:3634 ++#: ../gtk/gtkprintunixdialog.c:3631 + msgid "On _hold" + msgstr "Ar feit_heamh" + +-#: gtk/gtkprintunixdialog.c:3635 ++#: ../gtk/gtkprintunixdialog.c:3632 + msgid "Hold the job until it is explicitly released" + msgstr "Coinnigh an jab go dtí go scaoiltear é go follasach" + +-#: gtk/gtkprintunixdialog.c:3655 ++#: ../gtk/gtkprintunixdialog.c:3650 + msgid "Add Cover Page" + msgstr "Cuir Leathanach Cumhdaigh Leis" + + #. Translators, this is the label used for the option in the print + #. * dialog that controls the front cover page. + #. +-#: gtk/gtkprintunixdialog.c:3664 ++#: ../gtk/gtkprintunixdialog.c:3657 + msgid "Be_fore:" + msgstr "_Roimh:" + + #. Translators, this is the label used for the option in the print + #. * dialog that controls the back cover page. + #. +-#: gtk/gtkprintunixdialog.c:3682 ++#: ../gtk/gtkprintunixdialog.c:3672 + msgid "_After:" + msgstr "_Tar Éis:" + + #. Translators: this is the tab label for the notebook tab containing + #. * job-specific options in the print dialog + #. +-#: gtk/gtkprintunixdialog.c:3700 ++#: ../gtk/gtkprintunixdialog.c:3687 + msgid "Job" + msgstr "Jab" + +-#: gtk/gtkprintunixdialog.c:3766 ++#: ../gtk/gtkprintunixdialog.c:3753 + msgid "Advanced" + msgstr "Casta" + + #. Translators: this will appear as tab label in print dialog. +-#: gtk/gtkprintunixdialog.c:3804 ++#: ../gtk/gtkprintunixdialog.c:3791 + msgid "Image Quality" + msgstr "Cáilíocht Íomhá" + + #. Translators: this will appear as tab label in print dialog. +-#: gtk/gtkprintunixdialog.c:3808 ++#: ../gtk/gtkprintunixdialog.c:3795 + msgid "Color" + msgstr "Dath" + + #. Translators: this will appear as tab label in print dialog. + #. It's a typographical term, as in "Binding and finishing" +-#: gtk/gtkprintunixdialog.c:3813 ++#: ../gtk/gtkprintunixdialog.c:3800 + msgid "Finishing" + msgstr "Ag críochnú" + +-#: gtk/gtkprintunixdialog.c:3823 ++#: ../gtk/gtkprintunixdialog.c:3810 + msgid "Some of the settings in the dialog conflict" + msgstr "Tá cuid de na socruithe sa dialóg in aghaidh a chéile" + +-#: gtk/gtkprintunixdialog.c:3846 ++#: ../gtk/gtkprintunixdialog.c:3836 + msgid "Print" + msgstr "Priontáil" + +-#: gtk/gtkrc.c:2834 +-#, c-format +-msgid "Unable to find include file: \"%s\"" +-msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\"" +- +-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473 +-#, c-format +-msgid "Unable to locate image file in pixmap_path: \"%s\"" +-msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\"" +- +-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173 +-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623 +-#, c-format +-msgid "This function is not implemented for widgets of class '%s'" +-msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'" +- +-#: gtk/gtkrecentchooserdefault.c:482 ++#: ../gtk/gtkrecentchooserdefault.c:480 + msgid "Select which type of documents are shown" + msgstr "Roghnaigh an cineál cáipéisí le taispeáint" + +-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175 ++#: ../gtk/gtkrecentchooserdefault.c:1130 ../gtk/gtkrecentchooserdefault.c:1167 + #, c-format + msgid "No item for URI '%s' found" + msgstr "Níor aimsíodh mír le URI '%s'" + +-#: gtk/gtkrecentchooserdefault.c:1302 ++#: ../gtk/gtkrecentchooserdefault.c:1294 + msgid "Untitled filter" + msgstr "Scagaire gan teideal" + +-#: gtk/gtkrecentchooserdefault.c:1655 ++#: ../gtk/gtkrecentchooserdefault.c:1647 + msgid "Could not remove item" + msgstr "Níorbh fhéidir mír a bhaint" + +-#: gtk/gtkrecentchooserdefault.c:1699 ++#: ../gtk/gtkrecentchooserdefault.c:1691 + msgid "Could not clear list" + msgstr "Níorbh fhéidir liosta a ghlanadh" + +-#: gtk/gtkrecentchooserdefault.c:1783 ++#: ../gtk/gtkrecentchooserdefault.c:1775 + msgid "Copy _Location" + msgstr "Cóipeái_l Suíomh" + +-#: gtk/gtkrecentchooserdefault.c:1796 ++#: ../gtk/gtkrecentchooserdefault.c:1788 + msgid "_Remove From List" + msgstr "_Bain den Liosta" + +-#: gtk/gtkrecentchooserdefault.c:1805 ++#: ../gtk/gtkrecentchooserdefault.c:1797 + msgid "_Clear List" + msgstr "_Glan Liosta" + +-#: gtk/gtkrecentchooserdefault.c:1819 ++#: ../gtk/gtkrecentchooserdefault.c:1811 + msgid "Show _Private Resources" + msgstr "Taispeáin _Acmhainní Príobháideacha" + +@@ -2004,21 +2597,21 @@ msgstr "Taispeáin _Acmhainní Príobháideacha" + #. * user appended or prepended custom menu items to the + #. * recent chooser menu widget. + #. +-#: gtk/gtkrecentchoosermenu.c:369 ++#: ../gtk/gtkrecentchoosermenu.c:360 + msgid "No items found" + msgstr "Níor aimsíodh mír ar bith" + +-#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591 ++#: ../gtk/gtkrecentchoosermenu.c:526 ../gtk/gtkrecentchoosermenu.c:582 + #, c-format + msgid "No recently used resource found with URI `%s'" + msgstr "Níor aimsíodh aon acmhainn úsáidte le déanaí leis an URI `%s'" + +-#: gtk/gtkrecentchoosermenu.c:802 ++#: ../gtk/gtkrecentchoosermenu.c:792 + #, c-format + msgid "Open '%s'" + msgstr "Oscail '%s'" + +-#: gtk/gtkrecentchoosermenu.c:832 ++#: ../gtk/gtkrecentchoosermenu.c:822 + msgid "Unknown item" + msgstr "Mír anaithnid" + +@@ -2027,7 +2620,7 @@ msgstr "Mír anaithnid" + #. * the %s is the name of the item. Please keep the _ in front + #. * of the number to give these menu items a mnemonic. + #. +-#: gtk/gtkrecentchoosermenu.c:843 ++#: ../gtk/gtkrecentchoosermenu.c:833 + #, c-format + msgctxt "recent menu label" + msgid "_%d. %s" +@@ -2036,46 +2629,42 @@ msgstr "_%d. %s" + #. This is the format that is used for items in a recent files menu. + #. * The %d is the number of the item, the %s is the name of the item. + #. +-#: gtk/gtkrecentchoosermenu.c:848 ++#: ../gtk/gtkrecentchoosermenu.c:838 + #, c-format + msgctxt "recent menu label" + msgid "%d. %s" + msgstr "%d. %s" + +-#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993 +-#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141 +-#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203 +-#: gtk/gtkrecentmanager.c:1218 ++#: ../gtk/gtkrecentmanager.c:1010 ../gtk/gtkrecentmanager.c:1023 ++#: ../gtk/gtkrecentmanager.c:1160 ../gtk/gtkrecentmanager.c:1170 ++#: ../gtk/gtkrecentmanager.c:1222 ../gtk/gtkrecentmanager.c:1231 ++#: ../gtk/gtkrecentmanager.c:1246 + #, c-format + msgid "Unable to find an item with URI '%s'" + msgstr "Ní féidir mír a aimsiú le URI '%s'" + +-#: gtk/gtkspinner.c:456 +-msgctxt "throbbing progress animation widget" +-msgid "Spinner" +-msgstr "" +- +-#: gtk/gtkspinner.c:457 +-msgid "Provides visual indication of progress" ++#: ../gtk/gtkrecentmanager.c:2446 ++#, c-format ++msgid "No registered application with name '%s' for item with URI '%s' found" + msgstr "" + + #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate +-#: gtk/gtkstock.c:313 ++#: ../gtk/gtkstock.c:324 + msgctxt "Stock label" + msgid "Information" + msgstr "Eolas" + +-#: gtk/gtkstock.c:314 ++#: ../gtk/gtkstock.c:325 + msgctxt "Stock label" + msgid "Warning" + msgstr "Rabhadh" + +-#: gtk/gtkstock.c:315 ++#: ../gtk/gtkstock.c:326 + msgctxt "Stock label" + msgid "Error" + msgstr "Earráid" + +-#: gtk/gtkstock.c:316 ++#: ../gtk/gtkstock.c:327 + msgctxt "Stock label" + msgid "Question" + msgstr "Ceist" +@@ -2083,695 +2672,707 @@ msgstr "Ceist" + #. FIXME these need accelerators when appropriate, and + #. * need the mnemonics to be rationalized + #. +-#: gtk/gtkstock.c:321 ++#: ../gtk/gtkstock.c:332 + msgctxt "Stock label" + msgid "_About" + msgstr "_Maidir Leis Seo" + +-#: gtk/gtkstock.c:322 ++#: ../gtk/gtkstock.c:333 + msgctxt "Stock label" + msgid "_Add" + msgstr "Cuir _Leis" + +-#: gtk/gtkstock.c:323 ++#: ../gtk/gtkstock.c:334 + msgctxt "Stock label" + msgid "_Apply" + msgstr "Cuir i bh_Feidhm" + +-#: gtk/gtkstock.c:324 ++#: ../gtk/gtkstock.c:335 + msgctxt "Stock label" + msgid "_Bold" + msgstr "_Trom" + +-#: gtk/gtkstock.c:325 ++#: ../gtk/gtkstock.c:336 + msgctxt "Stock label" + msgid "_Cancel" + msgstr "_Cealaigh" + +-#: gtk/gtkstock.c:326 ++#: ../gtk/gtkstock.c:337 + #, fuzzy + msgctxt "Stock label" + msgid "_CD-ROM" + msgstr "_CD-ROM" + +-#: gtk/gtkstock.c:327 ++#: ../gtk/gtkstock.c:338 + msgctxt "Stock label" + msgid "_Clear" + msgstr "_Glan" + +-#: gtk/gtkstock.c:328 ++#: ../gtk/gtkstock.c:339 + msgctxt "Stock label" + msgid "_Close" + msgstr "_Dún" + +-#: gtk/gtkstock.c:329 ++#: ../gtk/gtkstock.c:340 + msgctxt "Stock label" + msgid "C_onnect" + msgstr "_Nasc" + +-#: gtk/gtkstock.c:330 ++#: ../gtk/gtkstock.c:341 + msgctxt "Stock label" + msgid "_Convert" + msgstr "_Tiontaigh" + +-#: gtk/gtkstock.c:331 ++#: ../gtk/gtkstock.c:342 + msgctxt "Stock label" + msgid "_Copy" + msgstr "_Cóipeáil" + +-#: gtk/gtkstock.c:332 ++#: ../gtk/gtkstock.c:343 + msgctxt "Stock label" + msgid "Cu_t" + msgstr "_Gearr" + +-#: gtk/gtkstock.c:333 ++#: ../gtk/gtkstock.c:344 + msgctxt "Stock label" + msgid "_Delete" + msgstr "_Scrios" + +-#: gtk/gtkstock.c:334 ++#: ../gtk/gtkstock.c:345 + msgctxt "Stock label" + msgid "_Discard" + msgstr "_Cuir i Leataobh" + +-#: gtk/gtkstock.c:335 ++#: ../gtk/gtkstock.c:346 + msgctxt "Stock label" + msgid "_Disconnect" + msgstr "_Dínasc" + +-#: gtk/gtkstock.c:336 ++#: ../gtk/gtkstock.c:347 + msgctxt "Stock label" + msgid "_Execute" + msgstr "_Rith" + +-#: gtk/gtkstock.c:337 ++#: ../gtk/gtkstock.c:348 + msgctxt "Stock label" + msgid "_Edit" + msgstr "Cuir in _Eagar" + +-#: gtk/gtkstock.c:338 ++#: ../gtk/gtkstock.c:349 + #, fuzzy + msgctxt "Stock label" + msgid "_File" + msgstr "Comhad" + +-#: gtk/gtkstock.c:339 ++#: ../gtk/gtkstock.c:350 + msgctxt "Stock label" + msgid "_Find" + msgstr "_Aimsigh" + +-#: gtk/gtkstock.c:340 ++#: ../gtk/gtkstock.c:351 + msgctxt "Stock label" + msgid "Find and _Replace" + msgstr "Aimsigh agus _Ionadaigh" + +-#: gtk/gtkstock.c:341 ++#: ../gtk/gtkstock.c:352 + msgctxt "Stock label" + msgid "_Floppy" + msgstr "Diosca _Bog" + +-#: gtk/gtkstock.c:342 ++#: ../gtk/gtkstock.c:353 + msgctxt "Stock label" + msgid "_Fullscreen" + msgstr "_Lánscáileán" + +-#: gtk/gtkstock.c:343 ++#: ../gtk/gtkstock.c:354 + msgctxt "Stock label" + msgid "_Leave Fullscreen" + msgstr "_Fág Lánscáileán" + + #. This is a navigation label as in "go to the bottom of the page" +-#: gtk/gtkstock.c:345 ++#: ../gtk/gtkstock.c:356 + msgctxt "Stock label, navigation" + msgid "_Bottom" + msgstr "_Bun:" + + #. This is a navigation label as in "go to the first page" +-#: gtk/gtkstock.c:347 ++#: ../gtk/gtkstock.c:358 + msgctxt "Stock label, navigation" + msgid "_First" + msgstr "An _Chéad" + + #. This is a navigation label as in "go to the last page" +-#: gtk/gtkstock.c:349 ++#: ../gtk/gtkstock.c:360 + msgctxt "Stock label, navigation" + msgid "_Last" + msgstr "An _Deireanach" + + #. This is a navigation label as in "go to the top of the page" +-#: gtk/gtkstock.c:351 ++#: ../gtk/gtkstock.c:362 + msgctxt "Stock label, navigation" + msgid "_Top" + msgstr "Ba_rr:" + + #. This is a navigation label as in "go back" +-#: gtk/gtkstock.c:353 ++#: ../gtk/gtkstock.c:364 + msgctxt "Stock label, navigation" + msgid "_Back" + msgstr "Ar A_is" + + #. This is a navigation label as in "go down" +-#: gtk/gtkstock.c:355 ++#: ../gtk/gtkstock.c:366 + msgctxt "Stock label, navigation" + msgid "_Down" + msgstr "_Síos" + + #. This is a navigation label as in "go forward" +-#: gtk/gtkstock.c:357 ++#: ../gtk/gtkstock.c:368 + msgctxt "Stock label, navigation" + msgid "_Forward" + msgstr "Ar A_ghaidh" + + #. This is a navigation label as in "go up" +-#: gtk/gtkstock.c:359 ++#: ../gtk/gtkstock.c:370 + msgctxt "Stock label, navigation" + msgid "_Up" + msgstr "_Siar" + +-#: gtk/gtkstock.c:360 ++#: ../gtk/gtkstock.c:371 + #, fuzzy + msgctxt "Stock label" + msgid "_Hard Disk" + msgstr "Diosca _Crua" + +-#: gtk/gtkstock.c:361 ++#: ../gtk/gtkstock.c:372 + msgctxt "Stock label" + msgid "_Help" + msgstr "Cab_hair" + +-#: gtk/gtkstock.c:362 ++#: ../gtk/gtkstock.c:373 + msgctxt "Stock label" + msgid "_Home" + msgstr "_Baile" + +-#: gtk/gtkstock.c:363 ++#: ../gtk/gtkstock.c:374 + msgctxt "Stock label" + msgid "Increase Indent" + msgstr "Méadaigh Eang" + +-#: gtk/gtkstock.c:364 ++#: ../gtk/gtkstock.c:375 + msgctxt "Stock label" + msgid "Decrease Indent" + msgstr "Laghdaigh Eang" + +-#: gtk/gtkstock.c:365 ++#: ../gtk/gtkstock.c:376 + msgctxt "Stock label" + msgid "_Index" + msgstr "_Innéacs" + +-#: gtk/gtkstock.c:366 ++#: ../gtk/gtkstock.c:377 + msgctxt "Stock label" + msgid "_Information" + msgstr "_Eolas" + +-#: gtk/gtkstock.c:367 ++#: ../gtk/gtkstock.c:378 + msgctxt "Stock label" + msgid "_Italic" + msgstr "Cló _Iodálach" + +-#: gtk/gtkstock.c:368 ++#: ../gtk/gtkstock.c:379 + msgctxt "Stock label" + msgid "_Jump to" + msgstr "_Léim Go" + + #. This is about text justification, "centered text" +-#: gtk/gtkstock.c:370 ++#: ../gtk/gtkstock.c:381 + msgctxt "Stock label" + msgid "_Center" + msgstr "_Láraigh" + + #. This is about text justification +-#: gtk/gtkstock.c:372 ++#: ../gtk/gtkstock.c:383 + msgctxt "Stock label" + msgid "_Fill" + msgstr "_Líon" + + #. This is about text justification, "left-justified text" +-#: gtk/gtkstock.c:374 ++#: ../gtk/gtkstock.c:385 + msgctxt "Stock label" + msgid "_Left" + msgstr "Ar _Chlé" + + #. This is about text justification, "right-justified text" +-#: gtk/gtkstock.c:376 ++#: ../gtk/gtkstock.c:387 + msgctxt "Stock label" + msgid "_Right" + msgstr "Ar _Dheis" + + #. Media label, as in "fast forward" +-#: gtk/gtkstock.c:379 ++#: ../gtk/gtkstock.c:390 + msgctxt "Stock label, media" + msgid "_Forward" + msgstr "_Ar Aghaidh" + + #. Media label, as in "next song" +-#: gtk/gtkstock.c:381 ++#: ../gtk/gtkstock.c:392 + msgctxt "Stock label, media" + msgid "_Next" + msgstr "Ar _Aghaidh" + + #. Media label, as in "pause music" +-#: gtk/gtkstock.c:383 ++#: ../gtk/gtkstock.c:394 + msgctxt "Stock label, media" + msgid "P_ause" + msgstr "_Sos" + + #. Media label, as in "play music" +-#: gtk/gtkstock.c:385 ++#: ../gtk/gtkstock.c:396 + msgctxt "Stock label, media" + msgid "_Play" + msgstr "_Seinn" + + #. Media label, as in "previous song" +-#: gtk/gtkstock.c:387 ++#: ../gtk/gtkstock.c:398 + msgctxt "Stock label, media" + msgid "Pre_vious" + msgstr "_Roimhe Seo" + + #. Media label +-#: gtk/gtkstock.c:389 ++#: ../gtk/gtkstock.c:400 + msgctxt "Stock label, media" + msgid "_Record" + msgstr "_Taifead" + + #. Media label +-#: gtk/gtkstock.c:391 ++#: ../gtk/gtkstock.c:402 + msgctxt "Stock label, media" + msgid "R_ewind" + msgstr "At_ochrais" + + #. Media label +-#: gtk/gtkstock.c:393 ++#: ../gtk/gtkstock.c:404 + msgctxt "Stock label, media" + msgid "_Stop" + msgstr "_Stad" + +-#: gtk/gtkstock.c:394 ++#: ../gtk/gtkstock.c:405 + msgctxt "Stock label" + msgid "_Network" + msgstr "Lío_nra" + +-#: gtk/gtkstock.c:395 ++#: ../gtk/gtkstock.c:406 + msgctxt "Stock label" + msgid "_New" + msgstr "_Nua" + +-#: gtk/gtkstock.c:396 ++#: ../gtk/gtkstock.c:407 + msgctxt "Stock label" + msgid "_No" + msgstr "_Níl" + +-#: gtk/gtkstock.c:397 ++#: ../gtk/gtkstock.c:408 + msgctxt "Stock label" + msgid "_OK" + msgstr "Tá g_o Maith" + +-#: gtk/gtkstock.c:398 ++#: ../gtk/gtkstock.c:409 + msgctxt "Stock label" + msgid "_Open" + msgstr "_Oscail" + + #. Page orientation +-#: gtk/gtkstock.c:400 ++#: ../gtk/gtkstock.c:411 + msgctxt "Stock label" + msgid "Landscape" + msgstr "Tírdhreach" + + #. Page orientation +-#: gtk/gtkstock.c:402 ++#: ../gtk/gtkstock.c:413 + msgctxt "Stock label" + msgid "Portrait" + msgstr "Portráid" + + #. Page orientation +-#: gtk/gtkstock.c:404 ++#: ../gtk/gtkstock.c:415 + msgctxt "Stock label" + msgid "Reverse landscape" + msgstr "Tírdhreach aisiompaithe" + + #. Page orientation +-#: gtk/gtkstock.c:406 ++#: ../gtk/gtkstock.c:417 + msgctxt "Stock label" + msgid "Reverse portrait" + msgstr "Portráid aisiompaithe" + +-#: gtk/gtkstock.c:407 ++#: ../gtk/gtkstock.c:418 + msgctxt "Stock label" + msgid "Page Set_up" + msgstr "Socrú _Leathanaigh" + +-#: gtk/gtkstock.c:408 ++#: ../gtk/gtkstock.c:419 + msgctxt "Stock label" + msgid "_Paste" + msgstr "G_reamaigh" + +-#: gtk/gtkstock.c:409 ++#: ../gtk/gtkstock.c:420 + msgctxt "Stock label" + msgid "_Preferences" + msgstr "_Sainroghanna" + +-#: gtk/gtkstock.c:410 ++#: ../gtk/gtkstock.c:421 + msgctxt "Stock label" + msgid "_Print" + msgstr "_Priontáil" + +-#: gtk/gtkstock.c:411 ++#: ../gtk/gtkstock.c:422 + msgctxt "Stock label" + msgid "Print Pre_view" + msgstr "Réamh_amharc Priontála" + +-#: gtk/gtkstock.c:412 ++#: ../gtk/gtkstock.c:423 + msgctxt "Stock label" + msgid "_Properties" + msgstr "_Airíonna" + +-#: gtk/gtkstock.c:413 ++#: ../gtk/gtkstock.c:424 + msgctxt "Stock label" + msgid "_Quit" + msgstr "_Scoir" + +-#: gtk/gtkstock.c:414 ++#: ../gtk/gtkstock.c:425 + msgctxt "Stock label" + msgid "_Redo" + msgstr "_Athfheidhmigh" + +-#: gtk/gtkstock.c:415 ++#: ../gtk/gtkstock.c:426 + msgctxt "Stock label" + msgid "_Refresh" + msgstr "_Athnuaigh" + +-#: gtk/gtkstock.c:416 ++#: ../gtk/gtkstock.c:427 + msgctxt "Stock label" + msgid "_Remove" + msgstr "_Bain" + +-#: gtk/gtkstock.c:417 ++#: ../gtk/gtkstock.c:428 + msgctxt "Stock label" + msgid "_Revert" + msgstr "_Fill" + +-#: gtk/gtkstock.c:418 ++#: ../gtk/gtkstock.c:429 + msgctxt "Stock label" + msgid "_Save" + msgstr "_Sábháil" + +-#: gtk/gtkstock.c:419 ++#: ../gtk/gtkstock.c:430 + msgctxt "Stock label" + msgid "Save _As" + msgstr "Sábháil M_ar" + +-#: gtk/gtkstock.c:420 ++#: ../gtk/gtkstock.c:431 + msgctxt "Stock label" + msgid "Select _All" + msgstr "Roghnaigh _Gach Rud" + +-#: gtk/gtkstock.c:421 ++#: ../gtk/gtkstock.c:432 + msgctxt "Stock label" + msgid "_Color" + msgstr "_Dath" + +-#: gtk/gtkstock.c:422 ++#: ../gtk/gtkstock.c:433 + msgctxt "Stock label" + msgid "_Font" + msgstr "_Cló" + + #. Sorting direction +-#: gtk/gtkstock.c:424 ++#: ../gtk/gtkstock.c:435 + msgctxt "Stock label" + msgid "_Ascending" + msgstr "_Ardaitheach" + + #. Sorting direction +-#: gtk/gtkstock.c:426 ++#: ../gtk/gtkstock.c:437 + msgctxt "Stock label" + msgid "_Descending" + msgstr "Í_slitheach" + +-#: gtk/gtkstock.c:427 ++#: ../gtk/gtkstock.c:438 + msgctxt "Stock label" + msgid "_Spell Check" + msgstr "_Litriú" + +-#: gtk/gtkstock.c:428 ++#: ../gtk/gtkstock.c:439 + msgctxt "Stock label" + msgid "_Stop" + msgstr "_Stad" + + #. Font variant +-#: gtk/gtkstock.c:430 ++#: ../gtk/gtkstock.c:441 + msgctxt "Stock label" + msgid "_Strikethrough" + msgstr "Líne _Trí" + +-#: gtk/gtkstock.c:431 ++#: ../gtk/gtkstock.c:442 + msgctxt "Stock label" + msgid "_Undelete" + msgstr "_Díscrios" + + #. Font variant +-#: gtk/gtkstock.c:433 ++#: ../gtk/gtkstock.c:444 + msgctxt "Stock label" + msgid "_Underline" + msgstr "_Líne Faoi" + +-#: gtk/gtkstock.c:434 ++#: ../gtk/gtkstock.c:445 + msgctxt "Stock label" + msgid "_Undo" + msgstr "Cea_laigh" + +-#: gtk/gtkstock.c:435 ++#: ../gtk/gtkstock.c:446 + msgctxt "Stock label" + msgid "_Yes" + msgstr "_Tá" + + #. Zoom +-#: gtk/gtkstock.c:437 ++#: ../gtk/gtkstock.c:448 + msgctxt "Stock label" + msgid "_Normal Size" + msgstr "_Gnáthmhéid" + + #. Zoom +-#: gtk/gtkstock.c:439 ++#: ../gtk/gtkstock.c:450 + msgctxt "Stock label" + msgid "Best _Fit" + msgstr "_Scothoiriúint" + +-#: gtk/gtkstock.c:440 ++#: ../gtk/gtkstock.c:451 + msgctxt "Stock label" + msgid "Zoom _In" + msgstr "Súmáil _Isteach" + +-#: gtk/gtkstock.c:441 ++#: ../gtk/gtkstock.c:452 + msgctxt "Stock label" + msgid "Zoom _Out" + msgstr "Súmáil _Amach" + +-#: gtk/gtktextbufferrichtext.c:650 ++#. Translators: if the "on" state label requires more than three ++#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for ++#. * the state ++#. ++#: ../gtk/gtkswitch.c:337 ../gtk/gtkswitch.c:392 ../gtk/gtkswitch.c:586 ++msgctxt "switch" ++msgid "ON" ++msgstr "❙" ++ ++#. Translators: if the "off" state label requires more than three ++#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state ++#. ++#: ../gtk/gtkswitch.c:345 ../gtk/gtkswitch.c:393 ../gtk/gtkswitch.c:615 ++msgctxt "switch" ++msgid "OFF" ++msgstr "○" ++ ++#: ../gtk/gtktextbufferrichtext.c:649 + #, c-format + msgid "Unknown error when trying to deserialize %s" + msgstr "" + +-#: gtk/gtktextbufferrichtext.c:709 ++#: ../gtk/gtktextbufferrichtext.c:708 + #, c-format + msgid "No deserialize function found for format %s" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821 ++#: ../gtk/gtktextbufferserialize.c:798 ../gtk/gtktextbufferserialize.c:824 + #, c-format + msgid "Both \"id\" and \"name\" were found on the <%s> element" + msgstr "Aimsíodh \"id\" agus \"name\" araon ar an eilimint <%s>" + +-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831 ++#: ../gtk/gtktextbufferserialize.c:808 ../gtk/gtktextbufferserialize.c:834 + #, c-format + msgid "The attribute \"%s\" was found twice on the <%s> element" + msgstr "Aimsíodh an tréith \"%s\" faoi dhó ar an eilimint <%s>" + +-#: gtk/gtktextbufferserialize.c:845 ++#: ../gtk/gtktextbufferserialize.c:850 + #, fuzzy, c-format + msgid "<%s> element has invalid ID \"%s\"" + msgstr "Tá ca neamhbhailí \"%2$s\" ag eilimint <%1$s>" + +-#: gtk/gtktextbufferserialize.c:855 ++#: ../gtk/gtktextbufferserialize.c:860 + #, c-format + msgid "<%s> element has neither a \"name\" nor an \"id\" attribute" + msgstr "Níl tréith \"name\" ná \"id\" ag an eilimint <%s>" + +-#: gtk/gtktextbufferserialize.c:942 ++#: ../gtk/gtktextbufferserialize.c:947 + #, c-format + msgid "Attribute \"%s\" repeated twice on the same <%s> element" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985 ++#: ../gtk/gtktextbufferserialize.c:965 ../gtk/gtktextbufferserialize.c:990 + #, c-format + msgid "Attribute \"%s\" is invalid on <%s> element in this context" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1024 ++#: ../gtk/gtktextbufferserialize.c:1029 + #, c-format + msgid "Tag \"%s\" has not been defined." + msgstr "Níor sainmhíníodh an chlib \"%s\"." + +-#: gtk/gtktextbufferserialize.c:1036 ++#: ../gtk/gtktextbufferserialize.c:1041 + msgid "Anonymous tag found and tags can not be created." + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1047 ++#: ../gtk/gtktextbufferserialize.c:1052 + #, c-format + msgid "Tag \"%s\" does not exist in buffer and tags can not be created." + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221 +-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398 ++#: ../gtk/gtktextbufferserialize.c:1151 ../gtk/gtktextbufferserialize.c:1226 ++#: ../gtk/gtktextbufferserialize.c:1331 ../gtk/gtktextbufferserialize.c:1405 + #, c-format + msgid "Element <%s> is not allowed below <%s>" + msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>" + +-#: gtk/gtktextbufferserialize.c:1177 ++#: ../gtk/gtktextbufferserialize.c:1182 + #, c-format + msgid "\"%s\" is not a valid attribute type" + msgstr "Ní cineál tréithe bailí é \"%s\"" + +-#: gtk/gtktextbufferserialize.c:1185 ++#: ../gtk/gtktextbufferserialize.c:1190 + #, c-format + msgid "\"%s\" is not a valid attribute name" + msgstr "Ní ainm tréithe bailí é \"%s\"" + +-#: gtk/gtktextbufferserialize.c:1195 ++#: ../gtk/gtktextbufferserialize.c:1200 + #, c-format + msgid "" + "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\"" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1204 ++#: ../gtk/gtktextbufferserialize.c:1209 + #, c-format + msgid "\"%s\" is not a valid value for attribute \"%s\"" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1289 ++#: ../gtk/gtktextbufferserialize.c:1294 + #, c-format + msgid "Tag \"%s\" already defined" + msgstr "Sainmhíníodh clib \"%s\" cheana." + +-#: gtk/gtktextbufferserialize.c:1300 ++#: ../gtk/gtktextbufferserialize.c:1307 + #, c-format + msgid "Tag \"%s\" has invalid priority \"%s\"" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1353 ++#: ../gtk/gtktextbufferserialize.c:1360 + #, c-format + msgid "Outermost element in text must be <text_view_markup> not <%s>" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378 ++#: ../gtk/gtktextbufferserialize.c:1369 ../gtk/gtktextbufferserialize.c:1385 + #, c-format + msgid "A <%s> element has already been specified" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1384 ++#: ../gtk/gtktextbufferserialize.c:1391 + msgid "A <text> element can't occur before a <tags> element" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1784 ++#: ../gtk/gtktextbufferserialize.c:1790 + msgid "Serialized data is malformed" + msgstr "" + +-#: gtk/gtktextbufferserialize.c:1862 ++#: ../gtk/gtktextbufferserialize.c:1868 + msgid "" + "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001" + msgstr "" + +-#: gtk/gtktextutil.c:60 ++#: ../gtk/gtktextutil.c:58 + msgid "LRM _Left-to-right mark" + msgstr "LRM Marc _Clé-go-deas" + +-#: gtk/gtktextutil.c:61 ++#: ../gtk/gtktextutil.c:59 + msgid "RLM _Right-to-left mark" + msgstr "RLM Marc _Deas-go-clé" + +-#: gtk/gtktextutil.c:62 ++#: ../gtk/gtktextutil.c:60 + msgid "LRE Left-to-right _embedding" + msgstr "LRE _Leabú Clé-go-deas" + +-#: gtk/gtktextutil.c:63 ++#: ../gtk/gtktextutil.c:61 + msgid "RLE Right-to-left e_mbedding" + msgstr "RLE L_eabú Deas-go-clé" + +-#: gtk/gtktextutil.c:64 ++#: ../gtk/gtktextutil.c:62 + msgid "LRO Left-to-right _override" + msgstr "LRO _Sárú Clé-go-deas" + +-#: gtk/gtktextutil.c:65 ++#: ../gtk/gtktextutil.c:63 + msgid "RLO Right-to-left o_verride" + msgstr "RLO Sá_rú Deas-go-clé" + +-#: gtk/gtktextutil.c:66 ++#: ../gtk/gtktextutil.c:64 + msgid "PDF _Pop directional formatting" + msgstr "" + +-#: gtk/gtktextutil.c:67 ++#: ../gtk/gtktextutil.c:65 + msgid "ZWS _Zero width space" + msgstr "" + +-#: gtk/gtktextutil.c:68 ++#: ../gtk/gtktextutil.c:66 + msgid "ZWJ Zero width _joiner" + msgstr "" + +-#: gtk/gtktextutil.c:69 ++#: ../gtk/gtktextutil.c:67 + msgid "ZWNJ Zero width _non-joiner" + msgstr "" + +-#: gtk/gtkthemes.c:72 +-#, c-format +-msgid "Unable to locate theme engine in module_path: \"%s\"," +-msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\"," +- +-#: gtk/gtkuimanager.c:1505 ++#: ../gtk/gtkuimanager.c:1781 + #, c-format + msgid "Unexpected start tag '%s' on line %d char %d" + msgstr "" + +-#: gtk/gtkuimanager.c:1595 ++#: ../gtk/gtkuimanager.c:1871 + #, c-format + msgid "Unexpected character data on line %d char %d" + msgstr "" + +-#: gtk/gtkuimanager.c:2427 ++#: ../gtk/gtkuimanager.c:2694 + msgid "Empty" + msgstr "Folamh" + +-#: gtk/gtkvolumebutton.c:83 ++#: ../gtk/gtkvolumebutton.c:169 + msgid "Volume" + msgstr "Airde" + +-#: gtk/gtkvolumebutton.c:85 ++#: ../gtk/gtkvolumebutton.c:171 + msgid "Turns volume down or up" + msgstr "Méadaíonn nó laghdaíonn sé seo an airde" + +-#: gtk/gtkvolumebutton.c:88 ++#: ../gtk/gtkvolumebutton.c:174 + msgid "Adjusts the volume" + msgstr "Coigeartaíonn sé seo an airde" + +-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97 ++#: ../gtk/gtkvolumebutton.c:180 ../gtk/gtkvolumebutton.c:183 + msgid "Volume Down" + msgstr "Airde Síos" + +-#: gtk/gtkvolumebutton.c:96 ++#: ../gtk/gtkvolumebutton.c:182 + msgid "Decreases the volume" + msgstr "Laghdaíonn sé seo an airde" + +-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103 ++#: ../gtk/gtkvolumebutton.c:186 ../gtk/gtkvolumebutton.c:189 + msgid "Volume Up" + msgstr "Airde Suas" + +-#: gtk/gtkvolumebutton.c:102 ++#: ../gtk/gtkvolumebutton.c:188 + msgid "Increases the volume" + msgstr "Méadaíonn sé seo an airde" + +-#: gtk/gtkvolumebutton.c:160 ++#: ../gtk/gtkvolumebutton.c:246 + msgid "Muted" + msgstr "Gan fuaim" + +-#: gtk/gtkvolumebutton.c:164 ++#: ../gtk/gtkvolumebutton.c:250 + msgid "Full Volume" + msgstr "Airde Iomlán" + +@@ -2780,932 +3381,927 @@ msgstr "Airde Iomlán" + #. * Translate the "%d" to "%Id" if you want to use localised digits, + #. * or otherwise translate the "%d" to "%d". + #. +-#: gtk/gtkvolumebutton.c:177 ++#: ../gtk/gtkvolumebutton.c:263 + #, c-format + msgctxt "volume percentage" + msgid "%d %%" + msgstr "%d %%" + +-#: gtk/paper_names_offsets.c:4 ++#: ../gtk/paper_names_offsets.c:4 + msgctxt "paper size" + msgid "asme_f" + msgstr "asme_f" + +-#: gtk/paper_names_offsets.c:5 ++#: ../gtk/paper_names_offsets.c:5 + msgctxt "paper size" + msgid "A0x2" + msgstr "A0x2" + +-#: gtk/paper_names_offsets.c:6 ++#: ../gtk/paper_names_offsets.c:6 + msgctxt "paper size" + msgid "A0" + msgstr "A0" + +-#: gtk/paper_names_offsets.c:7 ++#: ../gtk/paper_names_offsets.c:7 + msgctxt "paper size" + msgid "A0x3" + msgstr "A0x3" + +-#: gtk/paper_names_offsets.c:8 ++#: ../gtk/paper_names_offsets.c:8 + msgctxt "paper size" + msgid "A1" + msgstr "A1" + +-#: gtk/paper_names_offsets.c:9 ++#: ../gtk/paper_names_offsets.c:9 + msgctxt "paper size" + msgid "A10" + msgstr "A10" + +-#: gtk/paper_names_offsets.c:10 ++#: ../gtk/paper_names_offsets.c:10 + msgctxt "paper size" + msgid "A1x3" + msgstr "A1x3" + +-#: gtk/paper_names_offsets.c:11 ++#: ../gtk/paper_names_offsets.c:11 + msgctxt "paper size" + msgid "A1x4" + msgstr "A1x4" + +-#: gtk/paper_names_offsets.c:12 ++#: ../gtk/paper_names_offsets.c:12 + msgctxt "paper size" + msgid "A2" + msgstr "A2" + +-#: gtk/paper_names_offsets.c:13 ++#: ../gtk/paper_names_offsets.c:13 + msgctxt "paper size" + msgid "A2x3" + msgstr "A2x3" + +-#: gtk/paper_names_offsets.c:14 ++#: ../gtk/paper_names_offsets.c:14 + msgctxt "paper size" + msgid "A2x4" + msgstr "A2x4" + +-#: gtk/paper_names_offsets.c:15 ++#: ../gtk/paper_names_offsets.c:15 + msgctxt "paper size" + msgid "A2x5" + msgstr "A2x5" + +-#: gtk/paper_names_offsets.c:16 ++#: ../gtk/paper_names_offsets.c:16 + msgctxt "paper size" + msgid "A3" + msgstr "A3" + +-#: gtk/paper_names_offsets.c:17 ++#: ../gtk/paper_names_offsets.c:17 + msgctxt "paper size" + msgid "A3 Extra" + msgstr "A3 Breise" + +-#: gtk/paper_names_offsets.c:18 ++#: ../gtk/paper_names_offsets.c:18 + msgctxt "paper size" + msgid "A3x3" + msgstr "A3x3" + +-#: gtk/paper_names_offsets.c:19 ++#: ../gtk/paper_names_offsets.c:19 + msgctxt "paper size" + msgid "A3x4" + msgstr "A3x4" + +-#: gtk/paper_names_offsets.c:20 ++#: ../gtk/paper_names_offsets.c:20 + msgctxt "paper size" + msgid "A3x5" + msgstr "A3x5" + +-#: gtk/paper_names_offsets.c:21 ++#: ../gtk/paper_names_offsets.c:21 + msgctxt "paper size" + msgid "A3x6" + msgstr "A3x6" + +-#: gtk/paper_names_offsets.c:22 ++#: ../gtk/paper_names_offsets.c:22 + msgctxt "paper size" + msgid "A3x7" + msgstr "A3x7" + +-#: gtk/paper_names_offsets.c:23 ++#: ../gtk/paper_names_offsets.c:23 + msgctxt "paper size" + msgid "A4" + msgstr "A4" + +-#: gtk/paper_names_offsets.c:24 ++#: ../gtk/paper_names_offsets.c:24 + msgctxt "paper size" + msgid "A4 Extra" + msgstr "A4 Breise" + +-#: gtk/paper_names_offsets.c:25 ++#: ../gtk/paper_names_offsets.c:25 + msgctxt "paper size" + msgid "A4 Tab" + msgstr "A4 Clib" + +-#: gtk/paper_names_offsets.c:26 ++#: ../gtk/paper_names_offsets.c:26 + msgctxt "paper size" + msgid "A4x3" + msgstr "A4x3" + +-#: gtk/paper_names_offsets.c:27 ++#: ../gtk/paper_names_offsets.c:27 + msgctxt "paper size" + msgid "A4x4" + msgstr "A4x4" + +-#: gtk/paper_names_offsets.c:28 ++#: ../gtk/paper_names_offsets.c:28 + msgctxt "paper size" + msgid "A4x5" + msgstr "A4x5" + +-#: gtk/paper_names_offsets.c:29 ++#: ../gtk/paper_names_offsets.c:29 + msgctxt "paper size" + msgid "A4x6" + msgstr "A4x6" + +-#: gtk/paper_names_offsets.c:30 ++#: ../gtk/paper_names_offsets.c:30 + msgctxt "paper size" + msgid "A4x7" + msgstr "A4x7" + +-#: gtk/paper_names_offsets.c:31 ++#: ../gtk/paper_names_offsets.c:31 + msgctxt "paper size" + msgid "A4x8" + msgstr "A4x8" + +-#: gtk/paper_names_offsets.c:32 ++#: ../gtk/paper_names_offsets.c:32 + msgctxt "paper size" + msgid "A4x9" + msgstr "A4x9" + +-#: gtk/paper_names_offsets.c:33 ++#: ../gtk/paper_names_offsets.c:33 + msgctxt "paper size" + msgid "A5" + msgstr "A5" + +-#: gtk/paper_names_offsets.c:34 ++#: ../gtk/paper_names_offsets.c:34 + msgctxt "paper size" + msgid "A5 Extra" + msgstr "A5 Breise" + +-#: gtk/paper_names_offsets.c:35 ++#: ../gtk/paper_names_offsets.c:35 + msgctxt "paper size" + msgid "A6" + msgstr "A6" + +-#: gtk/paper_names_offsets.c:36 ++#: ../gtk/paper_names_offsets.c:36 + msgctxt "paper size" + msgid "A7" + msgstr "A7" + +-#: gtk/paper_names_offsets.c:37 ++#: ../gtk/paper_names_offsets.c:37 + msgctxt "paper size" + msgid "A8" + msgstr "A8" + +-#: gtk/paper_names_offsets.c:38 ++#: ../gtk/paper_names_offsets.c:38 + msgctxt "paper size" + msgid "A9" + msgstr "A9" + +-#: gtk/paper_names_offsets.c:39 ++#: ../gtk/paper_names_offsets.c:39 + msgctxt "paper size" + msgid "B0" + msgstr "B0" + +-#: gtk/paper_names_offsets.c:40 ++#: ../gtk/paper_names_offsets.c:40 + msgctxt "paper size" + msgid "B1" + msgstr "B1" + +-#: gtk/paper_names_offsets.c:41 ++#: ../gtk/paper_names_offsets.c:41 + msgctxt "paper size" + msgid "B10" + msgstr "B10" + +-#: gtk/paper_names_offsets.c:42 ++#: ../gtk/paper_names_offsets.c:42 + msgctxt "paper size" + msgid "B2" + msgstr "B2" + +-#: gtk/paper_names_offsets.c:43 ++#: ../gtk/paper_names_offsets.c:43 + msgctxt "paper size" + msgid "B3" + msgstr "B3" + +-#: gtk/paper_names_offsets.c:44 ++#: ../gtk/paper_names_offsets.c:44 + msgctxt "paper size" + msgid "B4" + msgstr "B4" + +-#: gtk/paper_names_offsets.c:45 ++#: ../gtk/paper_names_offsets.c:45 + msgctxt "paper size" + msgid "B5" + msgstr "B5" + +-#: gtk/paper_names_offsets.c:46 ++#: ../gtk/paper_names_offsets.c:46 + msgctxt "paper size" + msgid "B5 Extra" + msgstr "B5 Breise" + +-#: gtk/paper_names_offsets.c:47 ++#: ../gtk/paper_names_offsets.c:47 + msgctxt "paper size" + msgid "B6" + msgstr "B6" + +-#: gtk/paper_names_offsets.c:48 ++#: ../gtk/paper_names_offsets.c:48 + msgctxt "paper size" + msgid "B6/C4" + msgstr "B6/C4" + +-#: gtk/paper_names_offsets.c:49 ++#: ../gtk/paper_names_offsets.c:49 + msgctxt "paper size" + msgid "B7" + msgstr "B7" + +-#: gtk/paper_names_offsets.c:50 ++#: ../gtk/paper_names_offsets.c:50 + msgctxt "paper size" + msgid "B8" + msgstr "B8" + +-#: gtk/paper_names_offsets.c:51 ++#: ../gtk/paper_names_offsets.c:51 + msgctxt "paper size" + msgid "B9" + msgstr "B9" + +-#: gtk/paper_names_offsets.c:52 ++#: ../gtk/paper_names_offsets.c:52 + msgctxt "paper size" + msgid "C0" + msgstr "C0" + +-#: gtk/paper_names_offsets.c:53 ++#: ../gtk/paper_names_offsets.c:53 + msgctxt "paper size" + msgid "C1" + msgstr "C1" + +-#: gtk/paper_names_offsets.c:54 ++#: ../gtk/paper_names_offsets.c:54 + msgctxt "paper size" + msgid "C10" + msgstr "C10" + +-#: gtk/paper_names_offsets.c:55 ++#: ../gtk/paper_names_offsets.c:55 + msgctxt "paper size" + msgid "C2" + msgstr "C2" + +-#: gtk/paper_names_offsets.c:56 ++#: ../gtk/paper_names_offsets.c:56 + msgctxt "paper size" + msgid "C3" + msgstr "C3" + +-#: gtk/paper_names_offsets.c:57 ++#: ../gtk/paper_names_offsets.c:57 + msgctxt "paper size" + msgid "C4" + msgstr "C4" + +-#: gtk/paper_names_offsets.c:58 ++#: ../gtk/paper_names_offsets.c:58 + msgctxt "paper size" + msgid "C5" + msgstr "C5" + +-#: gtk/paper_names_offsets.c:59 ++#: ../gtk/paper_names_offsets.c:59 + msgctxt "paper size" + msgid "C6" + msgstr "C6" + +-#: gtk/paper_names_offsets.c:60 ++#: ../gtk/paper_names_offsets.c:60 + msgctxt "paper size" + msgid "C6/C5" + msgstr "C6/C5" + +-#: gtk/paper_names_offsets.c:61 ++#: ../gtk/paper_names_offsets.c:61 + msgctxt "paper size" + msgid "C7" + msgstr "C7" + +-#: gtk/paper_names_offsets.c:62 ++#: ../gtk/paper_names_offsets.c:62 + msgctxt "paper size" + msgid "C7/C6" + msgstr "C7/C6" + +-#: gtk/paper_names_offsets.c:63 ++#: ../gtk/paper_names_offsets.c:63 + msgctxt "paper size" + msgid "C8" + msgstr "C8" + +-#: gtk/paper_names_offsets.c:64 ++#: ../gtk/paper_names_offsets.c:64 + msgctxt "paper size" + msgid "C9" + msgstr "C9" + +-#: gtk/paper_names_offsets.c:65 ++#: ../gtk/paper_names_offsets.c:65 + msgctxt "paper size" + msgid "DL Envelope" + msgstr "Clúdach DL" + +-#: gtk/paper_names_offsets.c:66 ++#: ../gtk/paper_names_offsets.c:66 + msgctxt "paper size" + msgid "RA0" + msgstr "RA0" + +-#: gtk/paper_names_offsets.c:67 ++#: ../gtk/paper_names_offsets.c:67 + msgctxt "paper size" + msgid "RA1" + msgstr "RA1" + +-#: gtk/paper_names_offsets.c:68 ++#: ../gtk/paper_names_offsets.c:68 + msgctxt "paper size" + msgid "RA2" + msgstr "RA2" + +-#: gtk/paper_names_offsets.c:69 ++#: ../gtk/paper_names_offsets.c:69 + msgctxt "paper size" + msgid "SRA0" + msgstr "SRA0" + +-#: gtk/paper_names_offsets.c:70 ++#: ../gtk/paper_names_offsets.c:70 + msgctxt "paper size" + msgid "SRA1" + msgstr "SRA1" + +-#: gtk/paper_names_offsets.c:71 ++#: ../gtk/paper_names_offsets.c:71 + msgctxt "paper size" + msgid "SRA2" + msgstr "SRA2" + +-#: gtk/paper_names_offsets.c:72 ++#: ../gtk/paper_names_offsets.c:72 + msgctxt "paper size" + msgid "JB0" + msgstr "JB0" + +-#: gtk/paper_names_offsets.c:73 ++#: ../gtk/paper_names_offsets.c:73 + msgctxt "paper size" + msgid "JB1" + msgstr "JB1" + +-#: gtk/paper_names_offsets.c:74 ++#: ../gtk/paper_names_offsets.c:74 + msgctxt "paper size" + msgid "JB10" + msgstr "JB10" + +-#: gtk/paper_names_offsets.c:75 ++#: ../gtk/paper_names_offsets.c:75 + msgctxt "paper size" + msgid "JB2" + msgstr "JB2" + +-#: gtk/paper_names_offsets.c:76 ++#: ../gtk/paper_names_offsets.c:76 + msgctxt "paper size" + msgid "JB3" + msgstr "JB3" + +-#: gtk/paper_names_offsets.c:77 ++#: ../gtk/paper_names_offsets.c:77 + msgctxt "paper size" + msgid "JB4" + msgstr "JB4" + +-#: gtk/paper_names_offsets.c:78 ++#: ../gtk/paper_names_offsets.c:78 + msgctxt "paper size" + msgid "JB5" + msgstr "JB5" + +-#: gtk/paper_names_offsets.c:79 ++#: ../gtk/paper_names_offsets.c:79 + msgctxt "paper size" + msgid "JB6" + msgstr "JB6" + +-#: gtk/paper_names_offsets.c:80 ++#: ../gtk/paper_names_offsets.c:80 + msgctxt "paper size" + msgid "JB7" + msgstr "JB7" + +-#: gtk/paper_names_offsets.c:81 ++#: ../gtk/paper_names_offsets.c:81 + msgctxt "paper size" + msgid "JB8" + msgstr "JB8" + +-#: gtk/paper_names_offsets.c:82 ++#: ../gtk/paper_names_offsets.c:82 + msgctxt "paper size" + msgid "JB9" + msgstr "JB9" + +-#: gtk/paper_names_offsets.c:83 ++#: ../gtk/paper_names_offsets.c:83 + msgctxt "paper size" + msgid "jis exec" + msgstr "jis exec" + +-#: gtk/paper_names_offsets.c:84 ++#: ../gtk/paper_names_offsets.c:84 + msgctxt "paper size" + msgid "Choukei 2 Envelope" + msgstr "Clúdach Choukei 2" + +-#: gtk/paper_names_offsets.c:85 ++#: ../gtk/paper_names_offsets.c:85 + msgctxt "paper size" + msgid "Choukei 3 Envelope" + msgstr "Clúdach Choukei 3" + +-#: gtk/paper_names_offsets.c:86 ++#: ../gtk/paper_names_offsets.c:86 + msgctxt "paper size" + msgid "Choukei 4 Envelope" + msgstr "Clúdach Choukei 4" + +-#: gtk/paper_names_offsets.c:87 ++#: ../gtk/paper_names_offsets.c:87 + msgctxt "paper size" + msgid "hagaki (postcard)" + msgstr "hagaki (cárta poist)" + +-#: gtk/paper_names_offsets.c:88 ++#: ../gtk/paper_names_offsets.c:88 + msgctxt "paper size" + msgid "kahu Envelope" + msgstr "Clúdach kahu" + +-#: gtk/paper_names_offsets.c:89 ++#: ../gtk/paper_names_offsets.c:89 + msgctxt "paper size" + msgid "kaku2 Envelope" + msgstr "Clúdach kaku2" + +-#: gtk/paper_names_offsets.c:90 ++#: ../gtk/paper_names_offsets.c:90 + msgctxt "paper size" + msgid "oufuku (reply postcard)" + msgstr "oufuku (cárta poist freagartha)" + +-#: gtk/paper_names_offsets.c:91 ++#: ../gtk/paper_names_offsets.c:91 + msgctxt "paper size" + msgid "you4 Envelope" + msgstr "Clúdach you4" + +-#: gtk/paper_names_offsets.c:92 ++#: ../gtk/paper_names_offsets.c:92 + msgctxt "paper size" + msgid "10x11" + msgstr "10x11" + +-#: gtk/paper_names_offsets.c:93 ++#: ../gtk/paper_names_offsets.c:93 + msgctxt "paper size" + msgid "10x13" + msgstr "10x13" + +-#: gtk/paper_names_offsets.c:94 ++#: ../gtk/paper_names_offsets.c:94 + msgctxt "paper size" + msgid "10x14" + msgstr "10x14" + +-#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96 ++#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96 + msgctxt "paper size" + msgid "10x15" + msgstr "10x15" + +-#: gtk/paper_names_offsets.c:97 ++#: ../gtk/paper_names_offsets.c:97 + msgctxt "paper size" + msgid "11x12" + msgstr "11x12" + +-#: gtk/paper_names_offsets.c:98 ++#: ../gtk/paper_names_offsets.c:98 + msgctxt "paper size" + msgid "11x15" + msgstr "11x15" + +-#: gtk/paper_names_offsets.c:99 ++#: ../gtk/paper_names_offsets.c:99 + msgctxt "paper size" + msgid "12x19" + msgstr "12x19" + +-#: gtk/paper_names_offsets.c:100 ++#: ../gtk/paper_names_offsets.c:100 + msgctxt "paper size" + msgid "5x7" + msgstr "5x7" + +-#: gtk/paper_names_offsets.c:101 ++#: ../gtk/paper_names_offsets.c:101 + msgctxt "paper size" + msgid "6x9 Envelope" + msgstr "Clúdach 6x9" + +-#: gtk/paper_names_offsets.c:102 ++#: ../gtk/paper_names_offsets.c:102 + msgctxt "paper size" + msgid "7x9 Envelope" + msgstr "Clúdach 7x9" + +-#: gtk/paper_names_offsets.c:103 ++#: ../gtk/paper_names_offsets.c:103 + msgctxt "paper size" + msgid "9x11 Envelope" + msgstr "Clúdach 9x11" + +-#: gtk/paper_names_offsets.c:104 ++#: ../gtk/paper_names_offsets.c:104 + msgctxt "paper size" + msgid "a2 Envelope" + msgstr "Clúdach a2" + +-#: gtk/paper_names_offsets.c:105 ++#: ../gtk/paper_names_offsets.c:105 + msgctxt "paper size" + msgid "Arch A" + msgstr "Arch A" + +-#: gtk/paper_names_offsets.c:106 ++#: ../gtk/paper_names_offsets.c:106 + msgctxt "paper size" + msgid "Arch B" + msgstr "Arch B" + +-#: gtk/paper_names_offsets.c:107 ++#: ../gtk/paper_names_offsets.c:107 + msgctxt "paper size" + msgid "Arch C" + msgstr "Arch C" + +-#: gtk/paper_names_offsets.c:108 ++#: ../gtk/paper_names_offsets.c:108 + msgctxt "paper size" + msgid "Arch D" + msgstr "Arch D" + +-#: gtk/paper_names_offsets.c:109 ++#: ../gtk/paper_names_offsets.c:109 + msgctxt "paper size" + msgid "Arch E" + msgstr "Arch E" + +-#: gtk/paper_names_offsets.c:110 ++#: ../gtk/paper_names_offsets.c:110 + msgctxt "paper size" + msgid "b-plus" + msgstr "b-plus" + +-#: gtk/paper_names_offsets.c:111 ++#: ../gtk/paper_names_offsets.c:111 + msgctxt "paper size" + msgid "c" + msgstr "c" + +-#: gtk/paper_names_offsets.c:112 ++#: ../gtk/paper_names_offsets.c:112 + msgctxt "paper size" + msgid "c5 Envelope" + msgstr "Clúdach c5" + +-#: gtk/paper_names_offsets.c:113 ++#: ../gtk/paper_names_offsets.c:113 + msgctxt "paper size" + msgid "d" + msgstr "d" + +-#: gtk/paper_names_offsets.c:114 ++#: ../gtk/paper_names_offsets.c:114 + msgctxt "paper size" + msgid "e" + msgstr "e" + +-#: gtk/paper_names_offsets.c:115 ++#: ../gtk/paper_names_offsets.c:115 + msgctxt "paper size" + msgid "edp" + msgstr "edp" + +-#: gtk/paper_names_offsets.c:116 ++#: ../gtk/paper_names_offsets.c:116 + msgctxt "paper size" + msgid "European edp" + msgstr "edp Eorpach" + +-#: gtk/paper_names_offsets.c:117 ++#: ../gtk/paper_names_offsets.c:117 + msgctxt "paper size" + msgid "Executive" + msgstr "Feidhmeannach" + +-#: gtk/paper_names_offsets.c:118 ++#: ../gtk/paper_names_offsets.c:118 + msgctxt "paper size" + msgid "f" + msgstr "f" + +-#: gtk/paper_names_offsets.c:119 ++#: ../gtk/paper_names_offsets.c:119 + msgctxt "paper size" + msgid "FanFold European" + msgstr "FanFold Eorpach" + +-#: gtk/paper_names_offsets.c:120 ++#: ../gtk/paper_names_offsets.c:120 + msgctxt "paper size" + msgid "FanFold US" + msgstr "FanFold (SAM)" + +-#: gtk/paper_names_offsets.c:121 ++#: ../gtk/paper_names_offsets.c:121 + msgctxt "paper size" + msgid "FanFold German Legal" + msgstr "Fanfold Dlí Gearmánach" + +-#: gtk/paper_names_offsets.c:122 ++#: ../gtk/paper_names_offsets.c:122 + msgctxt "paper size" + msgid "Government Legal" + msgstr "Dlí Rialtais" + +-#: gtk/paper_names_offsets.c:123 ++#: ../gtk/paper_names_offsets.c:123 + msgctxt "paper size" + msgid "Government Letter" + msgstr "Litir Rialtais" + +-#: gtk/paper_names_offsets.c:124 ++#: ../gtk/paper_names_offsets.c:124 + msgctxt "paper size" + msgid "Index 3x5" + msgstr "Innéacs 3x5" + +-#: gtk/paper_names_offsets.c:125 ++#: ../gtk/paper_names_offsets.c:125 + msgctxt "paper size" + msgid "Index 4x6 (postcard)" + msgstr "Innéacs 4x6 (cárta poist)" + +-#: gtk/paper_names_offsets.c:126 ++#: ../gtk/paper_names_offsets.c:126 + msgctxt "paper size" + msgid "Index 4x6 ext" + msgstr "Innéacs 4x6 ext" + +-#: gtk/paper_names_offsets.c:127 ++#: ../gtk/paper_names_offsets.c:127 + msgctxt "paper size" + msgid "Index 5x8" + msgstr "Innéacs 5x8" + +-#: gtk/paper_names_offsets.c:128 ++#: ../gtk/paper_names_offsets.c:128 + msgctxt "paper size" + msgid "Invoice" + msgstr "Sonrasc" + +-#: gtk/paper_names_offsets.c:129 ++#: ../gtk/paper_names_offsets.c:129 + msgctxt "paper size" + msgid "Tabloid" + msgstr "Tablóid" + +-#: gtk/paper_names_offsets.c:130 ++#: ../gtk/paper_names_offsets.c:130 + msgctxt "paper size" + msgid "US Legal" + msgstr "Dlí (SAM)" + +-#: gtk/paper_names_offsets.c:131 ++#: ../gtk/paper_names_offsets.c:131 + msgctxt "paper size" + msgid "US Legal Extra" + msgstr "Dlí Breise (SAM)" + +-#: gtk/paper_names_offsets.c:132 ++#: ../gtk/paper_names_offsets.c:132 + msgctxt "paper size" + msgid "US Letter" + msgstr "Litir (SAM)" + +-#: gtk/paper_names_offsets.c:133 ++#: ../gtk/paper_names_offsets.c:133 + msgctxt "paper size" + msgid "US Letter Extra" + msgstr "Litir Breise (SAM)" + +-#: gtk/paper_names_offsets.c:134 ++#: ../gtk/paper_names_offsets.c:134 + msgctxt "paper size" + msgid "US Letter Plus" + msgstr "Litir Plus (SAM)" + +-#: gtk/paper_names_offsets.c:135 ++#: ../gtk/paper_names_offsets.c:135 + msgctxt "paper size" + msgid "Monarch Envelope" + msgstr "Clúdach Monarch" + +-#: gtk/paper_names_offsets.c:136 ++#: ../gtk/paper_names_offsets.c:136 + msgctxt "paper size" + msgid "#10 Envelope" + msgstr "Clúdach #10" + +-#: gtk/paper_names_offsets.c:137 ++#: ../gtk/paper_names_offsets.c:137 + msgctxt "paper size" + msgid "#11 Envelope" + msgstr "Clúdach #11" + +-#: gtk/paper_names_offsets.c:138 ++#: ../gtk/paper_names_offsets.c:138 + msgctxt "paper size" + msgid "#12 Envelope" + msgstr "Clúdach #12" + +-#: gtk/paper_names_offsets.c:139 ++#: ../gtk/paper_names_offsets.c:139 + msgctxt "paper size" + msgid "#14 Envelope" + msgstr "Clúdach #14" + +-#: gtk/paper_names_offsets.c:140 ++#: ../gtk/paper_names_offsets.c:140 + msgctxt "paper size" + msgid "#9 Envelope" + msgstr "Clúdach #9" + +-#: gtk/paper_names_offsets.c:141 ++#: ../gtk/paper_names_offsets.c:141 + msgctxt "paper size" + msgid "Personal Envelope" + msgstr "Clúdach Pearsanta" + +-#: gtk/paper_names_offsets.c:142 ++#: ../gtk/paper_names_offsets.c:142 + msgctxt "paper size" + msgid "Quarto" + msgstr "Ceathairfhillte" + +-#: gtk/paper_names_offsets.c:143 ++#: ../gtk/paper_names_offsets.c:143 + msgctxt "paper size" + msgid "Super A" + msgstr "Super A" + +-#: gtk/paper_names_offsets.c:144 ++#: ../gtk/paper_names_offsets.c:144 + msgctxt "paper size" + msgid "Super B" + msgstr "Super B" + +-#: gtk/paper_names_offsets.c:145 ++#: ../gtk/paper_names_offsets.c:145 + msgctxt "paper size" + msgid "Wide Format" + msgstr "Formáid Leathan" + +-#: gtk/paper_names_offsets.c:146 ++#: ../gtk/paper_names_offsets.c:146 + msgctxt "paper size" + msgid "Dai-pa-kai" + msgstr "Dai-pa-kai" + +-#: gtk/paper_names_offsets.c:147 ++#: ../gtk/paper_names_offsets.c:147 + msgctxt "paper size" + msgid "Folio" + msgstr "Fóilió" + +-#: gtk/paper_names_offsets.c:148 ++#: ../gtk/paper_names_offsets.c:148 + msgctxt "paper size" + msgid "Folio sp" + msgstr "Fóilió sp" + +-#: gtk/paper_names_offsets.c:149 ++#: ../gtk/paper_names_offsets.c:149 + msgctxt "paper size" + msgid "Invite Envelope" + msgstr "Clúdach Cuiridh" + +-#: gtk/paper_names_offsets.c:150 ++#: ../gtk/paper_names_offsets.c:150 + msgctxt "paper size" + msgid "Italian Envelope" + msgstr "Clúdach Iodálach" + +-#: gtk/paper_names_offsets.c:151 ++#: ../gtk/paper_names_offsets.c:151 + msgctxt "paper size" + msgid "juuro-ku-kai" + msgstr "juuro-ku-kai" + +-#: gtk/paper_names_offsets.c:152 ++#: ../gtk/paper_names_offsets.c:152 + msgctxt "paper size" + msgid "pa-kai" + msgstr "pa-kai" + +-#: gtk/paper_names_offsets.c:153 ++#: ../gtk/paper_names_offsets.c:153 + msgctxt "paper size" + msgid "Postfix Envelope" + msgstr "Clúdach Postfix" + +-#: gtk/paper_names_offsets.c:154 ++#: ../gtk/paper_names_offsets.c:154 + msgctxt "paper size" + msgid "Small Photo" + msgstr "Grianghraf Beag" + +-#: gtk/paper_names_offsets.c:155 ++#: ../gtk/paper_names_offsets.c:155 + msgctxt "paper size" + msgid "prc1 Envelope" + msgstr "Clúdach prc1" + +-#: gtk/paper_names_offsets.c:156 ++#: ../gtk/paper_names_offsets.c:156 + msgctxt "paper size" + msgid "prc10 Envelope" + msgstr "Clúdach prc10" + +-#: gtk/paper_names_offsets.c:157 ++#: ../gtk/paper_names_offsets.c:157 + msgctxt "paper size" + msgid "prc 16k" + msgstr "prc 16k" + +-#: gtk/paper_names_offsets.c:158 ++#: ../gtk/paper_names_offsets.c:158 + msgctxt "paper size" + msgid "prc2 Envelope" + msgstr "Clúdach prc2" + +-#: gtk/paper_names_offsets.c:159 ++#: ../gtk/paper_names_offsets.c:159 + msgctxt "paper size" + msgid "prc3 Envelope" + msgstr "Clúdach prc3" + +-#: gtk/paper_names_offsets.c:160 ++#: ../gtk/paper_names_offsets.c:160 + msgctxt "paper size" + msgid "prc 32k" + msgstr "prc 32k" + +-#: gtk/paper_names_offsets.c:161 ++#: ../gtk/paper_names_offsets.c:161 + msgctxt "paper size" + msgid "prc4 Envelope" + msgstr "Clúdach prc4" + +-#: gtk/paper_names_offsets.c:162 ++#: ../gtk/paper_names_offsets.c:162 + msgctxt "paper size" + msgid "prc5 Envelope" + msgstr "Clúdach prc5" + +-#: gtk/paper_names_offsets.c:163 ++#: ../gtk/paper_names_offsets.c:163 + msgctxt "paper size" + msgid "prc6 Envelope" + msgstr "Clúdach prc6" + +-#: gtk/paper_names_offsets.c:164 ++#: ../gtk/paper_names_offsets.c:164 + msgctxt "paper size" + msgid "prc7 Envelope" + msgstr "Clúdach prc7" + +-#: gtk/paper_names_offsets.c:165 ++#: ../gtk/paper_names_offsets.c:165 + msgctxt "paper size" + msgid "prc8 Envelope" + msgstr "Clúdach prc8" + +-#: gtk/paper_names_offsets.c:166 ++#: ../gtk/paper_names_offsets.c:166 + msgctxt "paper size" + msgid "prc9 Envelope" + msgstr "Clúdach prc9" + +-#: gtk/paper_names_offsets.c:167 ++#: ../gtk/paper_names_offsets.c:167 + msgctxt "paper size" + msgid "ROC 16k" + msgstr "ROC 16k" + +-#: gtk/paper_names_offsets.c:168 ++#: ../gtk/paper_names_offsets.c:168 + msgctxt "paper size" + msgid "ROC 8k" + msgstr "ROC 8k" + +-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552 +-#, c-format +-msgid "different idatas found for symlinked '%s' and '%s'\n" +-msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n" +- +-#: gtk/updateiconcache.c:1374 ++#: ../gtk/updateiconcache.c:1368 + #, c-format + msgid "Failed to write header\n" + msgstr "Theip ar scríobh ceanntáisc\n" + +-#: gtk/updateiconcache.c:1380 ++#: ../gtk/updateiconcache.c:1374 + #, c-format + msgid "Failed to write hash table\n" + msgstr "Theip ar scríobh hais-tábla\n" + +-#: gtk/updateiconcache.c:1386 ++#: ../gtk/updateiconcache.c:1380 + #, c-format + msgid "Failed to write folder index\n" + msgstr "Theip ar scríobh innéacs fillteáin\n" + +-#: gtk/updateiconcache.c:1394 ++#: ../gtk/updateiconcache.c:1388 + #, c-format + msgid "Failed to rewrite header\n" + msgstr "Theip ar athscríobh ceanntáisc\n" + +-#: gtk/updateiconcache.c:1463 ++#: ../gtk/updateiconcache.c:1482 + #, c-format + msgid "Failed to open file %s : %s\n" + msgstr "Theip ar oscailt comhaid %s : %s\n" + +-#: gtk/updateiconcache.c:1471 ++#: ../gtk/updateiconcache.c:1490 ../gtk/updateiconcache.c:1520 + #, c-format + msgid "Failed to write cache file: %s\n" + msgstr "Theip ar scríobh chomhad taisce: %s\n" + +-#: gtk/updateiconcache.c:1507 ++#: ../gtk/updateiconcache.c:1530 + #, c-format + msgid "The generated cache was invalid.\n" + msgstr "Bhí an taisce ghinte neamhbhailí.\n" + +-#: gtk/updateiconcache.c:1521 ++#: ../gtk/updateiconcache.c:1544 + #, c-format + msgid "Could not rename %s to %s: %s, removing %s then.\n" + msgstr "Níorbh fhéidir %s a athainmniú go %s: %s, mar sin %s á bhaint.\n" + +-#: gtk/updateiconcache.c:1535 ++#: ../gtk/updateiconcache.c:1558 + #, c-format + msgid "Could not rename %s to %s: %s\n" + msgstr "Níorbh fhéidir %s a athainmniú go %s: %s\n" + +-#: gtk/updateiconcache.c:1545 ++#: ../gtk/updateiconcache.c:1568 + #, c-format + msgid "Could not rename %s back to %s: %s.\n" + msgstr "Níorbh fhéidir %s a athainmniú ar ais go %s: %s\n" + +-#: gtk/updateiconcache.c:1572 ++#: ../gtk/updateiconcache.c:1595 + #, c-format + msgid "Cache file created successfully.\n" + msgstr "D'éirigh le cruthú an chomhaid taisce.\n" + +-#: gtk/updateiconcache.c:1611 ++#: ../gtk/updateiconcache.c:1634 + msgid "Overwrite an existing cache, even if up to date" + msgstr "" + +-#: gtk/updateiconcache.c:1612 ++#: ../gtk/updateiconcache.c:1635 + msgid "Don't check for the existence of index.theme" + msgstr "" + +-#: gtk/updateiconcache.c:1613 ++#: ../gtk/updateiconcache.c:1636 + msgid "Don't include image data in the cache" + msgstr "" + +-#: gtk/updateiconcache.c:1614 ++#: ../gtk/updateiconcache.c:1637 + msgid "Output a C header file" + msgstr "Cuir comhad ceanntáisc C amach" + +-#: gtk/updateiconcache.c:1615 ++#: ../gtk/updateiconcache.c:1638 + msgid "Turn off verbose output" + msgstr "Díchumasaigh aschur foclach" + +-#: gtk/updateiconcache.c:1616 ++#: ../gtk/updateiconcache.c:1639 + msgid "Validate existing icon cache" + msgstr "" + +-#: gtk/updateiconcache.c:1683 ++#: ../gtk/updateiconcache.c:1706 + #, c-format + msgid "File not found: %s\n" + msgstr "Comhad gan aimsiú: %s\n" + +-#: gtk/updateiconcache.c:1689 ++#: ../gtk/updateiconcache.c:1712 + #, c-format + msgid "Not a valid icon cache: %s\n" + msgstr "Ní taisce dheilbhíní bhailí é: %s\n" + +-#: gtk/updateiconcache.c:1702 ++#: ../gtk/updateiconcache.c:1725 + #, c-format + msgid "No theme index file.\n" + msgstr "Gan chomhad innéacs téama.\n" + +-#: gtk/updateiconcache.c:1706 ++#: ../gtk/updateiconcache.c:1729 + #, c-format + msgid "" + "No theme index file in '%s'.\n" +@@ -3716,376 +4312,375 @@ msgstr "" + "theme-index.\n" + + #. ID +-#: modules/input/imam-et.c:454 ++#: ../modules/input/imam-et.c:452 + msgid "Amharic (EZ+)" + msgstr "Amáiris (EZ+)" + + #. ID +-#: modules/input/imcedilla.c:92 ++#: ../modules/input/imcedilla.c:90 + msgid "Cedilla" + msgstr "Straithín" + + #. ID +-#: modules/input/imcyrillic-translit.c:217 ++#: ../modules/input/imcyrillic-translit.c:215 + msgid "Cyrillic (Transliterated)" + msgstr "Coireallach (Traslitrithe)" + + #. ID +-#: modules/input/iminuktitut.c:127 ++#: ../modules/input/iminuktitut.c:125 + msgid "Inuktitut (Transliterated)" + msgstr "Ionúitis (Traslitrithe)" + + #. ID +-#: modules/input/imipa.c:145 ++#: ../modules/input/imipa.c:143 + msgid "IPA" + msgstr "AFI" + + #. ID +-#: modules/input/immultipress.c:31 ++#: ../modules/input/immultipress.c:29 + msgid "Multipress" + msgstr "Il-bhrú" + + #. ID +-#: modules/input/imthai.c:35 ++#: ../modules/input/imthai.c:33 + msgid "Thai-Lao" + msgstr "Téalainnis-Láóis" + + #. ID +-#: modules/input/imti-er.c:453 ++#: ../modules/input/imti-er.c:451 + msgid "Tigrigna-Eritrean (EZ+)" + msgstr "Tigrínis-Eiritréach (EZ+)" + + #. ID +-#: modules/input/imti-et.c:453 ++#: ../modules/input/imti-et.c:451 + msgid "Tigrigna-Ethiopian (EZ+)" + msgstr "Tigrínis-Aetópach (EZ+)" + + #. ID +-#: modules/input/imviqr.c:244 ++#: ../modules/input/imviqr.c:242 + msgid "Vietnamese (VIQR)" + msgstr "Vítneaimis (VIQR)" + + #. ID +-#: modules/input/imxim.c:28 ++#: ../modules/input/imxim.c:26 + msgid "X Input Method" + msgstr "Modh Ionchurtha X" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:811 +-#: modules/printbackends/cups/gtkprintbackendcups.c:1020 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:858 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1073 + msgid "Username:" + msgstr "Ainm Úsáideora:" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:812 +-#: modules/printbackends/cups/gtkprintbackendcups.c:1029 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:859 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1082 + msgid "Password:" + msgstr "Focal Faire:" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:850 +-#, c-format +-msgid "Authentication is required to get a file from %s" +-msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s" +- +-#: modules/printbackends/cups/gtkprintbackendcups.c:854 +-#: modules/printbackends/cups/gtkprintbackendcups.c:1042 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:898 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1095 + #, c-format + msgid "Authentication is required to print document '%s' on printer %s" + msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil ar phrintéir %s" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:856 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:900 + #, c-format + msgid "Authentication is required to print a document on %s" + msgstr "Fíordheimhniú de dhíth chun cáipéis a phriontáil ar %s" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:860 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:904 + #, c-format + msgid "Authentication is required to get attributes of job '%s'" + msgstr "Fíordheimhniú de dhíth chun tréithe jab '%s' a fháil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:862 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:906 + msgid "Authentication is required to get attributes of a job" + msgstr "Fíordheimhniú de dhíth chun tréithe jab a fháil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:866 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:910 + #, c-format + msgid "Authentication is required to get attributes of printer %s" + msgstr "Fíordheimhniú de dhíth chun tréithe printéara %s a fháil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:868 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:912 + msgid "Authentication is required to get attributes of a printer" + msgstr "Fíordheimhniú de dhíth chun tréithe printéara a fháil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:871 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:915 + #, c-format + msgid "Authentication is required to get default printer of %s" + msgstr "Fíordheimhniú de dhíth chun an printéir réamhshocraithe %s a fháil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:874 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:918 + #, c-format + msgid "Authentication is required to get printers from %s" + msgstr "Fíordheimhniú de dhíth chun printéirí a fháil ó %s" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:877 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:923 ++#, c-format ++msgid "Authentication is required to get a file from %s" ++msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s" ++ ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:925 + #, c-format + msgid "Authentication is required on %s" + msgstr "Fíordheimhniú de dhíth ar %s" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1014 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067 + msgid "Domain:" + msgstr "Fearann:" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1044 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1097 + #, c-format + msgid "Authentication is required to print document '%s'" + msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1049 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1102 + #, c-format + msgid "Authentication is required to print this document on printer %s" + msgstr "" + "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil ar phrintéir %s" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1051 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1104 + msgid "Authentication is required to print this document" + msgstr "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1672 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1666 + #, c-format + msgid "Printer '%s' is low on toner." + msgstr "Tonóir gann i bprintéir '%s'." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1673 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1667 + #, c-format + msgid "Printer '%s' has no toner left." + msgstr "Níl aon tonóir fágtha i bprintéir '%s'." + + #. Translators: "Developer" like on photo development context +-#: modules/printbackends/cups/gtkprintbackendcups.c:1675 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1669 + #, c-format + msgid "Printer '%s' is low on developer." + msgstr "Réalóir gann i bprintéir '%s'." + + #. Translators: "Developer" like on photo development context +-#: modules/printbackends/cups/gtkprintbackendcups.c:1677 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1671 + #, c-format + msgid "Printer '%s' is out of developer." + msgstr "Níl aon réalóir fágtha i bprintéir '%s'." + + #. Translators: "marker" is one color bin of the printer +-#: modules/printbackends/cups/gtkprintbackendcups.c:1679 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673 + #, c-format + msgid "Printer '%s' is low on at least one marker supply." + msgstr "" + + #. Translators: "marker" is one color bin of the printer +-#: modules/printbackends/cups/gtkprintbackendcups.c:1681 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675 + #, c-format + msgid "Printer '%s' is out of at least one marker supply." + msgstr "" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1682 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676 + #, c-format + msgid "The cover is open on printer '%s'." + msgstr "Tá an clúdach ar phrintéir '%s' oscailte." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1683 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677 + #, c-format + msgid "The door is open on printer '%s'." + msgstr "Tá an doras ar phrintéir '%s' oscailte." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1684 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1678 + #, c-format + msgid "Printer '%s' is low on paper." + msgstr "Páipéar gann i bprintéir '%s'." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1685 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679 + #, c-format + msgid "Printer '%s' is out of paper." + msgstr "Níl aon pháipéar fágtha i bprintéir '%s'." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1686 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1680 + #, fuzzy, c-format + msgid "Printer '%s' is currently offline." + msgstr "Tá printéir '%s' as líne faoi láthair." + +-#: modules/printbackends/cups/gtkprintbackendcups.c:1687 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681 + #, c-format + msgid "There is a problem on printer '%s'." + msgstr "Tá fadhb ann le printéir '%s'." + + #. Translators: this is a printer status. +-#: modules/printbackends/cups/gtkprintbackendcups.c:1995 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2123 + msgid "Paused ; Rejecting Jobs" + msgstr "Ar Sos ; Jabanna á nDiúltú" + + #. Translators: this is a printer status. +-#: modules/printbackends/cups/gtkprintbackendcups.c:2001 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2129 + msgid "Rejecting Jobs" + msgstr "Jabanna á nDiúltú" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2777 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2909 + msgid "Two Sided" + msgstr "Déthaobhach" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2778 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2910 + msgid "Paper Type" + msgstr "Cineál an Pháipéir" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2779 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2911 + msgid "Paper Source" + msgstr "Foinse an Pháipéir" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2780 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2912 + msgid "Output Tray" + msgstr "Tráidire Aschurtha" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2781 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2913 + msgid "Resolution" + msgstr "Taifeach" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2782 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914 + msgid "GhostScript pre-filtering" + msgstr "Réamhscagadh GhostScript" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:2791 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2923 + msgid "One Sided" + msgstr "Aonthaobhach" + + #. Translators: this is an option of "Two Sided" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2793 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2925 + msgid "Long Edge (Standard)" + msgstr "Ciumhais Fhada (Caighdeánach)" + + #. Translators: this is an option of "Two Sided" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2795 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2927 + msgid "Short Edge (Flip)" + msgstr "Ciumhais Ghearr (Smeach)" + + #. Translators: this is an option of "Paper Source" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2797 +-#: modules/printbackends/cups/gtkprintbackendcups.c:2799 +-#: modules/printbackends/cups/gtkprintbackendcups.c:2807 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939 + msgid "Auto Select" + msgstr "Roghnaigh go hUathoibríoch" + + #. Translators: this is an option of "Paper Source" + #. Translators: this is an option of "Resolution" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2801 +-#: modules/printbackends/cups/gtkprintbackendcups.c:2803 +-#: modules/printbackends/cups/gtkprintbackendcups.c:2805 +-#: modules/printbackends/cups/gtkprintbackendcups.c:2809 +-#: modules/printbackends/cups/gtkprintbackendcups.c:3295 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3429 + msgid "Printer Default" + msgstr "Réamhshocrú Printéara" + + #. Translators: this is an option of "GhostScript" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2811 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943 + msgid "Embed GhostScript fonts only" + msgstr "Leabaigh clónna GhostScript amháin" + + #. Translators: this is an option of "GhostScript" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2813 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945 + msgid "Convert to PS level 1" + msgstr "Tiontaigh go PS leibhéal 1" + + #. Translators: this is an option of "GhostScript" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2815 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947 + msgid "Convert to PS level 2" + msgstr "Tiontaigh go PS leibhéal 2" + + #. Translators: this is an option of "GhostScript" +-#: modules/printbackends/cups/gtkprintbackendcups.c:2817 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949 + msgid "No pre-filtering" + msgstr "Gan réamhscagadh" + + #. Translators: "Miscellaneous" is the label for a button, that opens + #. up an extra panel of settings in a print dialog. +-#: modules/printbackends/cups/gtkprintbackendcups.c:2826 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2958 + msgid "Miscellaneous" + msgstr "Socruithe Éagsúla" + + #. Translators: These strings name the possible values of the + #. * job priority option in the print dialog + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3503 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 + msgid "Urgent" + msgstr "Práinneach" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3503 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 + msgid "High" + msgstr "Ard" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3503 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 + msgid "Medium" + msgstr "Measartha" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3503 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 + msgid "Low" + msgstr "Íseal" + +-#. Cups specific, non-ppd related settings +-#. Translators, this string is used to label the pages-per-sheet option +-#. * in the print dialog +-#. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3527 +-msgid "Pages per Sheet" +-msgstr "Leathanaigh sa Leathán" +- + #. Translators, this string is used to label the job priority option + #. * in the print dialog + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3564 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3711 + msgid "Job Priority" + msgstr "Tosaíocht an Jab" + + #. Translators, this string is used to label the billing info entry + #. * in the print dialog + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3575 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3722 + msgid "Billing Info" + msgstr "Eolas billeála" + + #. Translators, these strings are names for various 'standard' cover + #. * pages that the printing system may support. + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "None" + msgstr "Neamhní" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Classified" + msgstr "Rúnaicmithe" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Confidential" + msgstr "Faoi Rún" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Secret" + msgstr "Rúnda" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Standard" + msgstr "Caighdeánach" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Top Secret" + msgstr "An-Rúnda" + +-#: modules/printbackends/cups/gtkprintbackendcups.c:3590 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 + msgid "Unclassified" + msgstr "Neamhrúnaicmithe" + ++#. Translators, this string is used to label the pages-per-sheet option ++#. * in the print dialog ++#. ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3748 ++msgid "Pages per Sheet" ++msgstr "Leathanaigh sa Leathán" ++ + #. Translators, this is the label used for the option in the print + #. * dialog that controls the front cover page. + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3625 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3808 + msgid "Before" + msgstr "Roimh" + + #. Translators, this is the label used for the option in the print + #. * dialog that controls the back cover page. + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3640 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3823 + msgid "After" + msgstr "Tar Éis" + +@@ -4093,14 +4688,14 @@ msgstr "Tar Éis" + #. * a print job is printed. Possible values are 'now', a specified time, + #. * or 'on hold' + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3660 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3843 + msgid "Print at" + msgstr "Priontáil ag" + + #. Translators: this is the name of the option that allows the user + #. * to specify a time when a print job will be printed. + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3671 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3854 + msgid "Print at time" + msgstr "Priontáil ag am" + +@@ -4108,109 +4703,223 @@ msgstr "Priontáil ag am" + #. * size. The two placeholders are replaced with the width and height + #. * in points. E.g: "Custom 230.4x142.9" + #. +-#: modules/printbackends/cups/gtkprintbackendcups.c:3706 ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3889 + #, c-format + msgid "Custom %sx%s" + msgstr "%sx%s Saincheaptha" + +-#. default filename used for print-to-file +-#: modules/printbackends/file/gtkprintbackendfile.c:250 +-#, c-format +-msgid "output.%s" ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3970 ++#, fuzzy ++msgid "Printer Profile" ++msgstr "Printéir as líne" ++ ++#. TRANSLATORS: this is when color profile information is unavailable ++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3977 ++#, fuzzy ++msgid "Unavailable" ++msgstr "Níl ar fáil" ++ ++#. TRANSLATORS: when we're running an old CUPS, and ++#. * it hasn't registered the device with colord ++#: ../modules/printbackends/cups/gtkprintercups.c:221 ++msgid "Color management unavailable" ++msgstr "" ++ ++#. TRANSLATORS: when there is no color profile available ++#: ../modules/printbackends/cups/gtkprintercups.c:233 ++#, fuzzy ++msgid "No profile available" ++msgstr "Níl ar fáil" ++ ++#. TRANSLATORS: when the color profile has no title ++#: ../modules/printbackends/cups/gtkprintercups.c:244 ++#, fuzzy ++msgid "Unspecified profile" ++msgstr "Earráid gan sonrú" ++ ++#: ../modules/printbackends/file/gtkprintbackendfile.c:249 ++#, fuzzy ++msgid "output" + msgstr "aschur.%s" + +-#: modules/printbackends/file/gtkprintbackendfile.c:493 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:521 + msgid "Print to File" + msgstr "Priontáil go Comhad" + +-#: modules/printbackends/file/gtkprintbackendfile.c:570 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:647 + msgid "PDF" + msgstr "PDF" + +-#: modules/printbackends/file/gtkprintbackendfile.c:570 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:647 + msgid "Postscript" + msgstr "Postscript" + +-#: modules/printbackends/file/gtkprintbackendfile.c:570 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:647 + msgid "SVG" + msgstr "SVG" + +-#: modules/printbackends/file/gtkprintbackendfile.c:582 +-#: modules/printbackends/test/gtkprintbackendtest.c:503 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:660 ++#: ../modules/printbackends/test/gtkprintbackendtest.c:501 + msgid "Pages per _sheet:" + msgstr "_Leathanaigh sa leathán:" + +-#: modules/printbackends/file/gtkprintbackendfile.c:641 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:719 + msgid "File" + msgstr "Comhad" + +-#: modules/printbackends/file/gtkprintbackendfile.c:651 ++#: ../modules/printbackends/file/gtkprintbackendfile.c:729 + msgid "_Output format" + msgstr "_Formáid aschurtha" + +-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395 ++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:393 + msgid "Print to LPR" + msgstr "Priontáil go LPR" + +-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421 ++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:419 + msgid "Pages Per Sheet" + msgstr "Leathanaigh sa Leathán" + +-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428 ++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:426 + msgid "Command Line" + msgstr "Líne na n-Orduithe" + + #. SUN_BRANDING +-#: modules/printbackends/papi/gtkprintbackendpapi.c:811 ++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:809 + msgid "printer offline" + msgstr "printéir as líne" + + #. SUN_BRANDING +-#: modules/printbackends/papi/gtkprintbackendpapi.c:829 ++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:827 + msgid "ready to print" + msgstr "réidh do phriontáil" + + #. SUN_BRANDING +-#: modules/printbackends/papi/gtkprintbackendpapi.c:832 ++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:830 + msgid "processing job" + msgstr "jab á phróiseáil" + + #. SUN_BRANDING +-#: modules/printbackends/papi/gtkprintbackendpapi.c:836 ++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:834 + msgid "paused" + msgstr "curtha ar shos" + + #. SUN_BRANDING +-#: modules/printbackends/papi/gtkprintbackendpapi.c:839 ++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:837 + msgid "unknown" + msgstr "anaithnid" + + #. default filename used for print-to-test +-#: modules/printbackends/test/gtkprintbackendtest.c:234 ++#: ../modules/printbackends/test/gtkprintbackendtest.c:232 + #, c-format + msgid "test-output.%s" + msgstr "aschur-trialach.%s" + +-#: modules/printbackends/test/gtkprintbackendtest.c:467 ++#: ../modules/printbackends/test/gtkprintbackendtest.c:465 + msgid "Print to Test Printer" + msgstr "Priontáil go Printéir Tástála" + +-#: tests/testfilechooser.c:207 +-#, c-format +-msgid "Could not get information for file '%s': %s" +-msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s" ++#~ msgid "X screen to use" ++#~ msgstr "Scáileán X le húsáid" + +-#: tests/testfilechooser.c:222 +-#, c-format +-msgid "Failed to open file '%s': %s" +-msgstr "Theip ar oscail comhad '%s': %s" ++#~ msgid "SCREEN" ++#~ msgstr "SCÁILEÁN" + +-#: tests/testfilechooser.c:267 +-#, c-format +-msgid "" +-"Failed to load image '%s': reason not known, probably a corrupt image file" +-msgstr "" +-"Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá truaillithe" ++#~ msgid "Make X calls synchronous" ++#~ msgstr "Déan sioncronach glaonna X" ++ ++#~ msgid "Credits" ++#~ msgstr "Admhálacha" ++ ++#~ msgid "Written by" ++#~ msgstr "Scríofa ag" ++ ++#~ msgid "Received invalid color data\n" ++#~ msgstr "Fuair sonraí datha neamhbhailí\n" ++ ++#, fuzzy ++#~ msgid "Num Lock is on" ++#~ msgstr "Tá Caps Lock ann" ++ ++#~ msgid "_Add" ++#~ msgstr "Cuir _Leis" ++ ++#~ msgid "_Remove" ++#~ msgstr "_Bain" ++ ++#~ msgid "_Browse for other folders" ++#~ msgstr "_Brabhsáil ar fhillteáin eile" ++ ++#~ msgid "Invalid path" ++#~ msgstr "Conair neamhbhailí" ++ ++#~ msgid "No match" ++#~ msgstr "Gan rud comhoiriúnach" ++ ++#~ msgid "Sole completion" ++#~ msgstr "An comhlánú amháin" ++ ++#~ msgid "Complete, but not unique" ++#~ msgstr "Curtha i grích, ach nach uathúil" ++ ++#~ msgid "Completing..." ++#~ msgstr "Á chur i grích..." ++ ++#~ msgid "Only local files may be selected" ++#~ msgstr "Is féidir comhaid logánta amháin a roghnú" ++ ++#~ msgid "Incomplete hostname; end it with '/'" ++#~ msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh" ++ ++#~ msgid "Path does not exist" ++#~ msgstr "Níl an conair sin ann" ++ ++#~ msgid "Error creating folder '%s': %s" ++#~ msgstr "Earráid agus fillteán '%s' á chruthú: %s" ++ ++#~ msgid "" ++#~ "Could not find the icon '%s'. The '%s' theme\n" ++#~ "was not found either, perhaps you need to install it.\n" ++#~ "You can get a copy from:\n" ++#~ "\t%s" ++#~ msgstr "" ++#~ "Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n" ++#~ "aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n" ++#~ "gcaithfidh tú é a shuiteáil.\n" ++#~ "Is féidir leat cóip a fháil ó:\n" ++#~ "\t%s" ++ ++#~ msgid "Connect as u_ser:" ++#~ msgstr "Nasc mar ú_sáideoir:" ++ ++#~ msgid "_Save in folder:" ++#~ msgstr "_Sábháil i bhfillteán:" ++ ++#~ msgid "Unable to find include file: \"%s\"" ++#~ msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\"" ++ ++#~ msgid "Unable to locate image file in pixmap_path: \"%s\"" ++#~ msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\"" ++ ++#~ msgid "This function is not implemented for widgets of class '%s'" ++#~ msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'" ++ ++#~ msgid "Unable to locate theme engine in module_path: \"%s\"," ++#~ msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\"," ++ ++#~ msgid "different idatas found for symlinked '%s' and '%s'\n" ++#~ msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n" ++ ++#~ msgid "Could not get information for file '%s': %s" ++#~ msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s" ++ ++#~ msgid "Failed to open file '%s': %s" ++#~ msgstr "Theip ar oscail comhad '%s': %s" ++ ++#~ msgid "" ++#~ "Failed to load image '%s': reason not known, probably a corrupt image file" ++#~ msgstr "" ++#~ "Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá " ++#~ "truaillithe" + + #~ msgid "Gdk debugging flags to set" + #~ msgstr "Bratacha dífhabhtaithe Gdk le socrú" +diff --git a/po/zh_HK.po b/po/zh_HK.po +index 64057e3..2305461 100644 +--- a/po/zh_HK.po ++++ b/po/zh_HK.po +@@ -8,9 +8,9 @@ msgid "" + msgstr "" + "Project-Id-Version: gtk+ 3.3.11\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-09-05 20:10+0800\n" +-"PO-Revision-Date: 2012-09-05 20:10+0800\n" +-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n" ++"POT-Creation-Date: 2012-11-07 02:40+0800\n" ++"PO-Revision-Date: 2012-11-07 02:40+0800\n" ++"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" + "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n" + "Language: zh_TW\n" + "MIME-Version: 1.0\n" +@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標" + #. Placeholder in --gdk-no-debug=FLAGS in --help output + #. Placeholder in --gtk-debug=FLAGS in --help output + #. Placeholder in --gtk-no-debug=FLAGS in --help output +-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456 ++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 + msgid "FLAGS" + msgstr "旗標" + +@@ -698,7 +698,7 @@ msgstr "美工設計" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:156 ++#: ../gtk/gtkaccellabel.c:159 + msgctxt "keyboard label" + msgid "Shift" + msgstr "Shift" +@@ -708,7 +708,7 @@ msgstr "Shift" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:162 ++#: ../gtk/gtkaccellabel.c:165 + msgctxt "keyboard label" + msgid "Ctrl" + msgstr "Ctrl" +@@ -718,7 +718,7 @@ msgstr "Ctrl" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:168 ++#: ../gtk/gtkaccellabel.c:171 + msgctxt "keyboard label" + msgid "Alt" + msgstr "Alt" +@@ -728,7 +728,7 @@ msgstr "Alt" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:802 ++#: ../gtk/gtkaccellabel.c:805 + msgctxt "keyboard label" + msgid "Super" + msgstr "Super" +@@ -738,7 +738,7 @@ msgstr "Super" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:815 ++#: ../gtk/gtkaccellabel.c:818 + msgctxt "keyboard label" + msgid "Hyper" + msgstr "Hyper" +@@ -748,17 +748,17 @@ msgstr "Hyper" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:829 ++#: ../gtk/gtkaccellabel.c:832 + msgctxt "keyboard label" + msgid "Meta" + msgstr "Meta" + +-#: ../gtk/gtkaccellabel.c:845 ++#: ../gtk/gtkaccellabel.c:848 + msgctxt "keyboard label" + msgid "Space" + msgstr "Space" + +-#: ../gtk/gtkaccellabel.c:848 ++#: ../gtk/gtkaccellabel.c:851 + msgctxt "keyboard label" + msgid "Backslash" + msgstr "Backslash" +@@ -794,7 +794,7 @@ msgstr "找不到應用程式" + msgid "Select an application to open \"%s\"" + msgstr "請選擇要用來開啟「%s」的應用程式" + +-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654 ++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 + #, c-format + msgid "No applications available to open \"%s\"" + msgstr "沒有程式可開啟「%s」的應用程式" +@@ -824,23 +824,23 @@ msgstr "消除關聯" + msgid "Show other applications" + msgstr "顯示其他的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:603 ++#: ../gtk/gtkappchooserwidget.c:606 + msgid "Default Application" + msgstr "預設的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:741 ++#: ../gtk/gtkappchooserwidget.c:744 + msgid "Recommended Applications" + msgstr "建議的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:756 ++#: ../gtk/gtkappchooserwidget.c:759 + msgid "Related Applications" + msgstr "相關的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:770 ++#: ../gtk/gtkappchooserwidget.c:773 + msgid "Other Applications" + msgstr "其他的應用程式" + +-#: ../gtk/gtkapplication.c:1552 ++#: ../gtk/gtkapplication.c:1558 + #, c-format + msgid "" + "%s cannot quit at this time:\n" +@@ -851,20 +851,20 @@ msgstr "" + "\n" + "%s" + +-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475 ++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 + #: ../gtk/gtkprintoperation-win32.c:1445 + msgid "Application" + msgstr "應用程式" + +-#: ../gtk/gtkassistant.c:1004 ++#: ../gtk/gtkassistant.c:1008 + msgid "C_ontinue" + msgstr "繼續(_O)" + +-#: ../gtk/gtkassistant.c:1007 ++#: ../gtk/gtkassistant.c:1011 + msgid "Go _Back" + msgstr "後退(_B)" + +-#: ../gtk/gtkassistant.c:1011 ++#: ../gtk/gtkassistant.c:1015 + msgid "_Finish" + msgstr "完成(_F)" + +@@ -1003,7 +1003,7 @@ msgstr "無效" + #. * an accelerator when the cell is clicked to change the + #. * acelerator. + #. +-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745 ++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 + msgid "New accelerator..." + msgstr "新增捷徑鍵…" + +@@ -1403,7 +1403,7 @@ msgstr "Caps Lock 已開啟" + msgid "Select a File" + msgstr "選取檔案" + +-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817 ++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 + msgid "Desktop" + msgstr "桌面" + +@@ -1419,48 +1419,48 @@ msgstr "其他…" + msgid "Type name of new folder" + msgstr "請輸入新資料夾名稱" + +-#: ../gtk/gtkfilechooserdefault.c:968 ++#: ../gtk/gtkfilechooserdefault.c:970 + msgid "Could not retrieve information about the file" + msgstr "無法取得關於檔案的資訊" + +-#: ../gtk/gtkfilechooserdefault.c:979 ++#: ../gtk/gtkfilechooserdefault.c:981 + msgid "Could not add a bookmark" + msgstr "無法加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:990 ++#: ../gtk/gtkfilechooserdefault.c:992 + msgid "Could not remove bookmark" + msgstr "無法移除書籤" + +-#: ../gtk/gtkfilechooserdefault.c:1001 ++#: ../gtk/gtkfilechooserdefault.c:1003 + msgid "The folder could not be created" + msgstr "無法建立資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:1014 ++#: ../gtk/gtkfilechooserdefault.c:1016 + msgid "" + "The folder could not be created, as a file with the same name already " + "exists. Try using a different name for the folder, or rename the file first." + msgstr "此資料夾無法建立，因為已有相同名稱的檔案存在。嘗試使用不同的資料夾名稱，或者先重新命名該檔案。" + +-#: ../gtk/gtkfilechooserdefault.c:1028 ++#: ../gtk/gtkfilechooserdefault.c:1030 + msgid "You need to choose a valid filename." + msgstr "你需要選擇有效的檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:1031 ++#: ../gtk/gtkfilechooserdefault.c:1033 + #, c-format + msgid "Cannot create a file under %s as it is not a folder" + msgstr "不能在 %s 下建立檔案，因為它不是資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:1043 ++#: ../gtk/gtkfilechooserdefault.c:1045 + msgid "" + "You may only select folders. The item that you selected is not a folder; " + "try using a different item." + msgstr "你只能選擇資料夾。你所選取的項目不是資料夾；請嘗試使用不同的項目。" + +-#: ../gtk/gtkfilechooserdefault.c:1053 ++#: ../gtk/gtkfilechooserdefault.c:1055 + msgid "Invalid file name" + msgstr "無效的檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:1063 ++#: ../gtk/gtkfilechooserdefault.c:1065 + msgid "The folder contents could not be displayed" + msgstr "無法顯示資料夾內容" + +@@ -1468,218 +1468,218 @@ msgstr "無法顯示資料夾內容" + #. * is a hostname. Nautilus and the panel contain the same string + #. * to translate. + #. +-#: ../gtk/gtkfilechooserdefault.c:1589 ++#: ../gtk/gtkfilechooserdefault.c:1591 + #, c-format + msgid "%1$s on %2$s" + msgstr "%1$s 於 %2$s" + +-#: ../gtk/gtkfilechooserdefault.c:1738 ++#: ../gtk/gtkfilechooserdefault.c:1740 + msgid "Search" + msgstr "搜尋" + +-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988 ++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 + msgid "Recently Used" +-msgstr "最近使用的" ++msgstr "最近使用" + +-#: ../gtk/gtkfilechooserdefault.c:2361 ++#: ../gtk/gtkfilechooserdefault.c:2363 + msgid "Select which types of files are shown" + msgstr "選擇顯示哪種類型的檔案" + +-#: ../gtk/gtkfilechooserdefault.c:2720 ++#: ../gtk/gtkfilechooserdefault.c:2722 + #, c-format + msgid "Add the folder '%s' to the bookmarks" + msgstr "將資料夾「%s」加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2764 ++#: ../gtk/gtkfilechooserdefault.c:2766 + #, c-format + msgid "Add the current folder to the bookmarks" + msgstr "將目前的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2766 ++#: ../gtk/gtkfilechooserdefault.c:2768 + #, c-format + msgid "Add the selected folders to the bookmarks" + msgstr "將已選的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2804 ++#: ../gtk/gtkfilechooserdefault.c:2806 + #, c-format + msgid "Remove the bookmark '%s'" + msgstr "移除書籤「%s」" + +-#: ../gtk/gtkfilechooserdefault.c:2806 ++#: ../gtk/gtkfilechooserdefault.c:2808 + #, c-format + msgid "Bookmark '%s' cannot be removed" + msgstr "無法移除書籤「%s」" + +-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699 ++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 + msgid "Remove the selected bookmark" + msgstr "移除已選的書籤" + +-#: ../gtk/gtkfilechooserdefault.c:3377 ++#: ../gtk/gtkfilechooserdefault.c:3379 + msgid "Remove" + msgstr "移除" + +-#: ../gtk/gtkfilechooserdefault.c:3386 ++#: ../gtk/gtkfilechooserdefault.c:3388 + msgid "Rename..." + msgstr "重新命名…" + + #. Accessible object name for the file chooser's shortcuts pane +-#: ../gtk/gtkfilechooserdefault.c:3550 ++#: ../gtk/gtkfilechooserdefault.c:3552 + msgid "Places" + msgstr "位置" + + #. Column header for the file chooser's shortcuts pane +-#: ../gtk/gtkfilechooserdefault.c:3607 ++#: ../gtk/gtkfilechooserdefault.c:3609 + msgid "_Places" + msgstr "位置(_P)" + +-#: ../gtk/gtkfilechooserdefault.c:3687 ++#: ../gtk/gtkfilechooserdefault.c:3689 + msgid "Add the selected folder to the Bookmarks" + msgstr "將已選的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:3948 ++#: ../gtk/gtkfilechooserdefault.c:3950 + msgid "Could not select file" + msgstr "無法選取檔案" + +-#: ../gtk/gtkfilechooserdefault.c:4173 ++#: ../gtk/gtkfilechooserdefault.c:4175 + msgid "_Visit this file" + msgstr "查閱這個檔案(_V)" + +-#: ../gtk/gtkfilechooserdefault.c:4176 ++#: ../gtk/gtkfilechooserdefault.c:4178 + msgid "_Copy file's location" + msgstr "複製檔案的位置(_C)" + +-#: ../gtk/gtkfilechooserdefault.c:4179 ++#: ../gtk/gtkfilechooserdefault.c:4181 + msgid "_Add to Bookmarks" + msgstr "加入書籤(_A)" + +-#: ../gtk/gtkfilechooserdefault.c:4186 ++#: ../gtk/gtkfilechooserdefault.c:4188 + msgid "Show _Hidden Files" + msgstr "顯示隱藏檔(_H)" + +-#: ../gtk/gtkfilechooserdefault.c:4189 ++#: ../gtk/gtkfilechooserdefault.c:4191 + msgid "Show _Size Column" + msgstr "顯示大小欄位(_S)" + +-#: ../gtk/gtkfilechooserdefault.c:4414 ++#: ../gtk/gtkfilechooserdefault.c:4416 + msgid "Files" + msgstr "檔案" + +-#: ../gtk/gtkfilechooserdefault.c:4465 ++#: ../gtk/gtkfilechooserdefault.c:4467 + msgid "Name" + msgstr "名稱" + +-#: ../gtk/gtkfilechooserdefault.c:4488 ++#: ../gtk/gtkfilechooserdefault.c:4490 + msgid "Size" + msgstr "大小" + +-#: ../gtk/gtkfilechooserdefault.c:4502 ++#: ../gtk/gtkfilechooserdefault.c:4504 + msgid "Modified" + msgstr "已修改" + + #. Label +-#: ../gtk/gtkfilechooserdefault.c:4595 ++#: ../gtk/gtkfilechooserdefault.c:4597 + msgid "_Name:" + msgstr "名稱(_N):" + +-#: ../gtk/gtkfilechooserdefault.c:4826 ++#: ../gtk/gtkfilechooserdefault.c:4828 + msgid "Type a file name" + msgstr "輸入檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884 ++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 + msgid "Please select a folder below" + msgstr "請選擇下面的資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:4879 ++#: ../gtk/gtkfilechooserdefault.c:4881 + msgid "Please type a file name" + msgstr "請輸入檔案名稱" + + #. Create Folder +-#: ../gtk/gtkfilechooserdefault.c:4950 ++#: ../gtk/gtkfilechooserdefault.c:4952 + msgid "Create Fo_lder" + msgstr "建立資料夾(_L)" + +-#: ../gtk/gtkfilechooserdefault.c:4998 ++#: ../gtk/gtkfilechooserdefault.c:5000 + msgid "Search:" + msgstr "搜尋：" + +-#: ../gtk/gtkfilechooserdefault.c:5049 ++#: ../gtk/gtkfilechooserdefault.c:5051 + msgid "_Location:" + msgstr "位置(_L):" + +-#: ../gtk/gtkfilechooserdefault.c:5500 ++#: ../gtk/gtkfilechooserdefault.c:5502 + msgid "Save in _folder:" + msgstr "儲存於資料夾(_F):" + +-#: ../gtk/gtkfilechooserdefault.c:5502 ++#: ../gtk/gtkfilechooserdefault.c:5504 + msgid "Create in _folder:" + msgstr "新增於資料夾(_F)：" + +-#: ../gtk/gtkfilechooserdefault.c:6589 ++#: ../gtk/gtkfilechooserdefault.c:6591 + #, c-format + msgid "Could not read the contents of %s" + msgstr "無法讀取 %s 的內容" + +-#: ../gtk/gtkfilechooserdefault.c:6593 ++#: ../gtk/gtkfilechooserdefault.c:6595 + msgid "Could not read the contents of the folder" + msgstr "無法讀取資料夾的內容" + +-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754 +-#: ../gtk/gtkfilechooserdefault.c:6934 ++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 ++#: ../gtk/gtkfilechooserdefault.c:6936 + msgid "Unknown" + msgstr "不明" + +-#: ../gtk/gtkfilechooserdefault.c:6701 ++#: ../gtk/gtkfilechooserdefault.c:6703 + msgid "%H:%M" + msgstr "%H:%M" + +-#: ../gtk/gtkfilechooserdefault.c:6703 ++#: ../gtk/gtkfilechooserdefault.c:6705 + msgid "Yesterday at %H:%M" + msgstr "昨天 %H:%M" + +-#: ../gtk/gtkfilechooserdefault.c:7405 ++#: ../gtk/gtkfilechooserdefault.c:7407 + msgid "Cannot change to folder because it is not local" + msgstr "無法進入資料夾，因為它不是本地資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030 ++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 + #, c-format + msgid "Shortcut %s already exists" + msgstr "捷徑 %s 已經存在" + +-#: ../gtk/gtkfilechooserdefault.c:8120 ++#: ../gtk/gtkfilechooserdefault.c:8122 + #, c-format + msgid "Shortcut %s does not exist" + msgstr "捷徑 %s 不存在" + +-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548 ++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 + #, c-format + msgid "A file named \"%s\" already exists. Do you want to replace it?" + msgstr "名為「%s」的檔案已存在。是否要取代它？" + +-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552 ++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 + #, c-format + msgid "" + "The file already exists in \"%s\". Replacing it will overwrite its contents." + msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。" + +-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559 ++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 + msgid "_Replace" + msgstr "取代(_R)" + +-#: ../gtk/gtkfilechooserdefault.c:9181 ++#: ../gtk/gtkfilechooserdefault.c:9183 + msgid "Could not start the search process" + msgstr "無法開始搜尋程序" + +-#: ../gtk/gtkfilechooserdefault.c:9182 ++#: ../gtk/gtkfilechooserdefault.c:9184 + msgid "" + "The program was not able to create a connection to the indexer daemon. " + "Please make sure it is running." + msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。" + +-#: ../gtk/gtkfilechooserdefault.c:9196 ++#: ../gtk/gtkfilechooserdefault.c:9198 + msgid "Could not send the search request" + msgstr "無法傳送搜尋要求" + +-#: ../gtk/gtkfilechooserdefault.c:9806 ++#: ../gtk/gtkfilechooserdefault.c:9808 + #, c-format + msgid "Could not mount %s" + msgstr "無法掛載 %s" +@@ -1842,27 +1842,27 @@ msgstr "" + "請聯絡你的系統管理員" + + #. Description of --gtk-module=MODULES in --help output +-#: ../gtk/gtkmain.c:446 ++#: ../gtk/gtkmain.c:447 + msgid "Load additional GTK+ modules" + msgstr "載入額外的 GTK+ 模組" + + #. Placeholder in --gtk-module=MODULES in --help output +-#: ../gtk/gtkmain.c:447 ++#: ../gtk/gtkmain.c:448 + msgid "MODULES" + msgstr "模組" + + #. Description of --g-fatal-warnings in --help output +-#: ../gtk/gtkmain.c:449 ++#: ../gtk/gtkmain.c:450 + msgid "Make all warnings fatal" + msgstr "把所有的警告訊息都當成嚴重錯誤" + + #. Description of --gtk-debug=FLAGS in --help output +-#: ../gtk/gtkmain.c:452 ++#: ../gtk/gtkmain.c:453 + msgid "GTK+ debugging flags to set" + msgstr "準備設定的 GTK+ 偵錯旗標" + + #. Description of --gtk-no-debug=FLAGS in --help output +-#: ../gtk/gtkmain.c:455 ++#: ../gtk/gtkmain.c:456 + msgid "GTK+ debugging flags to unset" + msgstr "準備去除的 GTK+ 偵錯旗標" + +@@ -1871,73 +1871,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標" + #. * Do *not* translate it to "predefinito:LTR", if it + #. * it isn't default:LTR or default:RTL it will not work + #. +-#: ../gtk/gtkmain.c:706 ++#: ../gtk/gtkmain.c:704 + msgid "default:LTR" + msgstr "default:LTR" + +-#: ../gtk/gtkmain.c:774 ++#: ../gtk/gtkmain.c:772 + #, c-format + msgid "Cannot open display: %s" + msgstr "無法開啟畫面：%s" + +-#: ../gtk/gtkmain.c:840 ++#: ../gtk/gtkmain.c:838 + msgid "GTK+ Options" + msgstr "GTK+ 選項" + +-#: ../gtk/gtkmain.c:840 ++#: ../gtk/gtkmain.c:838 + msgid "Show GTK+ Options" + msgstr "顯示 GTK+ 選項" + +-#: ../gtk/gtkmountoperation.c:532 ++#: ../gtk/gtkmountoperation.c:535 + msgid "Co_nnect" + msgstr "連線(_N)" + +-#: ../gtk/gtkmountoperation.c:606 ++#: ../gtk/gtkmountoperation.c:609 + msgid "Connect As" + msgstr "連線身分" + +-#: ../gtk/gtkmountoperation.c:615 ++#: ../gtk/gtkmountoperation.c:618 + msgid "_Anonymous" + msgstr "匿名(_A)" + +-#: ../gtk/gtkmountoperation.c:624 ++#: ../gtk/gtkmountoperation.c:627 + msgid "Registered U_ser" + msgstr "已註冊使用者(_S)" + +-#: ../gtk/gtkmountoperation.c:635 ++#: ../gtk/gtkmountoperation.c:638 + msgid "_Username" + msgstr "使用者名稱(_U)" + +-#: ../gtk/gtkmountoperation.c:640 ++#: ../gtk/gtkmountoperation.c:643 + msgid "_Domain" + msgstr "網域(_D)" + +-#: ../gtk/gtkmountoperation.c:646 ++#: ../gtk/gtkmountoperation.c:649 + msgid "_Password" + msgstr "密碼(_P)" + +-#: ../gtk/gtkmountoperation.c:668 ++#: ../gtk/gtkmountoperation.c:671 + msgid "Forget password _immediately" + msgstr "立刻忘記密碼(_I)" + +-#: ../gtk/gtkmountoperation.c:678 ++#: ../gtk/gtkmountoperation.c:681 + msgid "Remember password until you _logout" + msgstr "記憶密碼到登出之前(_L)" + +-#: ../gtk/gtkmountoperation.c:688 ++#: ../gtk/gtkmountoperation.c:691 + msgid "Remember _forever" + msgstr "永遠記住密碼(_F)" + +-#: ../gtk/gtkmountoperation.c:1077 ++#: ../gtk/gtkmountoperation.c:1080 + #, c-format + msgid "Unknown Application (PID %d)" + msgstr "不明的應用程式（PID %d）" + +-#: ../gtk/gtkmountoperation.c:1260 ++#: ../gtk/gtkmountoperation.c:1263 + msgid "Unable to end process" + msgstr "無法終止程序" + +-#: ../gtk/gtkmountoperation.c:1297 ++#: ../gtk/gtkmountoperation.c:1300 + msgid "_End Process" + msgstr "終止程序(_E)" + +@@ -1980,14 +1980,14 @@ msgstr "第 %u 頁" + #. Translators: the format here is used to build the string that will be rendered + #. * in the number emblem. + #. +-#: ../gtk/gtknumerableicon.c:481 ++#: ../gtk/gtknumerableicon.c:482 + #, c-format + msgctxt "Number format" + msgid "%d" + msgstr "%d" + +-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846 +-#: ../gtk/gtkpapersize.c:886 ++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 ++#: ../gtk/gtkpapersize.c:888 + msgid "Not a valid page setup file" + msgstr "不是有效的頁面設定檔案" + +@@ -2046,7 +2046,7 @@ msgstr "向下路徑" + msgid "File System Root" + msgstr "檔案系統根" + +-#: ../gtk/gtkprintbackend.c:748 ++#: ../gtk/gtkprintbackend.c:750 + msgid "Authentication" + msgstr "驗證" + +@@ -2112,29 +2112,29 @@ msgctxt "print operation status" + msgid "Finished with error" + msgstr "已完成但發生錯誤" + +-#: ../gtk/gtkprintoperation.c:2352 ++#: ../gtk/gtkprintoperation.c:2349 + #, c-format + msgid "Preparing %d" + msgstr "正在準備 %d" + +-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984 ++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 + msgid "Preparing" + msgstr "正在準備" + +-#: ../gtk/gtkprintoperation.c:2357 ++#: ../gtk/gtkprintoperation.c:2354 + #, c-format + msgid "Printing %d" + msgstr "正在打印 %d" + +-#: ../gtk/gtkprintoperation.c:3014 ++#: ../gtk/gtkprintoperation.c:3013 + msgid "Error creating print preview" + msgstr "建立打印預覽時發生錯誤" + +-#: ../gtk/gtkprintoperation.c:3017 ++#: ../gtk/gtkprintoperation.c:3016 + msgid "The most probable reason is that a temporary file could not be created." + msgstr "最可能的原因是無法建立暫存檔案。" + +-#: ../gtk/gtkprintoperation-unix.c:302 ++#: ../gtk/gtkprintoperation-unix.c:307 + msgid "Error launching preview" + msgstr "執行預覽時發生錯誤" + +@@ -3301,7 +3301,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」" + msgid "Unexpected character data on line %d char %d" + msgstr "第 %d 行第 %d 字有非預設的字符資料" + +-#: ../gtk/gtkuimanager.c:2738 ++#: ../gtk/gtkuimanager.c:2694 + msgid "Empty" + msgstr "空的" + +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 785b127..979172e 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -8,9 +8,9 @@ msgid "" + msgstr "" + "Project-Id-Version: gtk+ 3.3.11\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-09-05 20:10+0800\n" +-"PO-Revision-Date: 2012-09-05 16:20+0800\n" +-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n" ++"POT-Creation-Date: 2012-11-07 02:40+0800\n" ++"PO-Revision-Date: 2012-11-01 22:07+0800\n" ++"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" + "Language-Team: <>\n" + "Language: zh_TW\n" + "MIME-Version: 1.0\n" +@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標" + #. Placeholder in --gdk-no-debug=FLAGS in --help output + #. Placeholder in --gtk-debug=FLAGS in --help output + #. Placeholder in --gtk-no-debug=FLAGS in --help output +-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456 ++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 + msgid "FLAGS" + msgstr "旗標" + +@@ -699,7 +699,7 @@ msgstr "美工設計" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:156 ++#: ../gtk/gtkaccellabel.c:159 + msgctxt "keyboard label" + msgid "Shift" + msgstr "Shift" +@@ -709,7 +709,7 @@ msgstr "Shift" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:162 ++#: ../gtk/gtkaccellabel.c:165 + msgctxt "keyboard label" + msgid "Ctrl" + msgstr "Ctrl" +@@ -719,7 +719,7 @@ msgstr "Ctrl" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:168 ++#: ../gtk/gtkaccellabel.c:171 + msgctxt "keyboard label" + msgid "Alt" + msgstr "Alt" +@@ -729,7 +729,7 @@ msgstr "Alt" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:802 ++#: ../gtk/gtkaccellabel.c:805 + msgctxt "keyboard label" + msgid "Super" + msgstr "Super" +@@ -739,7 +739,7 @@ msgstr "Super" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:815 ++#: ../gtk/gtkaccellabel.c:818 + msgctxt "keyboard label" + msgid "Hyper" + msgstr "Hyper" +@@ -749,17 +749,17 @@ msgstr "Hyper" + #. * translated on keyboards used for your language, don't translate + #. * this. + #. +-#: ../gtk/gtkaccellabel.c:829 ++#: ../gtk/gtkaccellabel.c:832 + msgctxt "keyboard label" + msgid "Meta" + msgstr "Meta" + +-#: ../gtk/gtkaccellabel.c:845 ++#: ../gtk/gtkaccellabel.c:848 + msgctxt "keyboard label" + msgid "Space" + msgstr "Space" + +-#: ../gtk/gtkaccellabel.c:848 ++#: ../gtk/gtkaccellabel.c:851 + msgctxt "keyboard label" + msgid "Backslash" + msgstr "Backslash" +@@ -795,7 +795,7 @@ msgstr "找不到應用程式" + msgid "Select an application to open \"%s\"" + msgstr "請選擇要用來開啟「%s」的應用程式" + +-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654 ++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 + #, c-format + msgid "No applications available to open \"%s\"" + msgstr "沒有程式可開啟「%s」的應用程式" +@@ -827,23 +827,23 @@ msgstr "消除關聯" + msgid "Show other applications" + msgstr "顯示其他的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:603 ++#: ../gtk/gtkappchooserwidget.c:606 + msgid "Default Application" + msgstr "預設的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:741 ++#: ../gtk/gtkappchooserwidget.c:744 + msgid "Recommended Applications" + msgstr "建議的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:756 ++#: ../gtk/gtkappchooserwidget.c:759 + msgid "Related Applications" + msgstr "相關的應用程式" + +-#: ../gtk/gtkappchooserwidget.c:770 ++#: ../gtk/gtkappchooserwidget.c:773 + msgid "Other Applications" + msgstr "其他的應用程式" + +-#: ../gtk/gtkapplication.c:1552 ++#: ../gtk/gtkapplication.c:1558 + #, c-format + msgid "" + "%s cannot quit at this time:\n" +@@ -854,20 +854,20 @@ msgstr "" + "\n" + "%s" + +-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475 ++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 + #: ../gtk/gtkprintoperation-win32.c:1445 + msgid "Application" + msgstr "應用程式" + +-#: ../gtk/gtkassistant.c:1004 ++#: ../gtk/gtkassistant.c:1008 + msgid "C_ontinue" + msgstr "繼續(_O)" + +-#: ../gtk/gtkassistant.c:1007 ++#: ../gtk/gtkassistant.c:1011 + msgid "Go _Back" + msgstr "後退(_B)" + +-#: ../gtk/gtkassistant.c:1011 ++#: ../gtk/gtkassistant.c:1015 + msgid "_Finish" + msgstr "完成(_F)" + +@@ -1006,7 +1006,7 @@ msgstr "無效" + #. * an accelerator when the cell is clicked to change the + #. * acelerator. + #. +-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745 ++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 + msgid "New accelerator..." + msgstr "新增捷徑鍵…" + +@@ -1406,7 +1406,7 @@ msgstr "Caps Lock 已開啟" + msgid "Select a File" + msgstr "選取檔案" + +-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817 ++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 + msgid "Desktop" + msgstr "桌面" + +@@ -1422,23 +1422,23 @@ msgstr "其他…" + msgid "Type name of new folder" + msgstr "請輸入新資料夾名稱" + +-#: ../gtk/gtkfilechooserdefault.c:968 ++#: ../gtk/gtkfilechooserdefault.c:970 + msgid "Could not retrieve information about the file" + msgstr "無法取得關於檔案的資訊" + +-#: ../gtk/gtkfilechooserdefault.c:979 ++#: ../gtk/gtkfilechooserdefault.c:981 + msgid "Could not add a bookmark" + msgstr "無法加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:990 ++#: ../gtk/gtkfilechooserdefault.c:992 + msgid "Could not remove bookmark" + msgstr "無法移除書籤" + +-#: ../gtk/gtkfilechooserdefault.c:1001 ++#: ../gtk/gtkfilechooserdefault.c:1003 + msgid "The folder could not be created" + msgstr "無法建立資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:1014 ++#: ../gtk/gtkfilechooserdefault.c:1016 + msgid "" + "The folder could not be created, as a file with the same name already " + "exists. Try using a different name for the folder, or rename the file first." +@@ -1446,26 +1446,26 @@ msgstr "" + "此資料夾無法建立，因為已有相同名稱的檔案存在。試著使用不同的資料夾名稱，或者" + "先重新命名該檔案。" + +-#: ../gtk/gtkfilechooserdefault.c:1028 ++#: ../gtk/gtkfilechooserdefault.c:1030 + msgid "You need to choose a valid filename." + msgstr "您需要選擇有效的檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:1031 ++#: ../gtk/gtkfilechooserdefault.c:1033 + #, c-format + msgid "Cannot create a file under %s as it is not a folder" + msgstr "不能在 %s 下建立檔案，因為它不是資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:1043 ++#: ../gtk/gtkfilechooserdefault.c:1045 + msgid "" + "You may only select folders. The item that you selected is not a folder; " + "try using a different item." + msgstr "您只能選擇資料夾。您所選取的項目不是資料夾；請試著使用不同的項目。" + +-#: ../gtk/gtkfilechooserdefault.c:1053 ++#: ../gtk/gtkfilechooserdefault.c:1055 + msgid "Invalid file name" + msgstr "無效的檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:1063 ++#: ../gtk/gtkfilechooserdefault.c:1065 + msgid "The folder contents could not be displayed" + msgstr "無法顯示資料夾內容" + +@@ -1473,218 +1473,218 @@ msgstr "無法顯示資料夾內容" + #. * is a hostname. Nautilus and the panel contain the same string + #. * to translate. + #. +-#: ../gtk/gtkfilechooserdefault.c:1589 ++#: ../gtk/gtkfilechooserdefault.c:1591 + #, c-format + msgid "%1$s on %2$s" + msgstr "%1$s 於 %2$s" + +-#: ../gtk/gtkfilechooserdefault.c:1738 ++#: ../gtk/gtkfilechooserdefault.c:1740 + msgid "Search" + msgstr "搜尋" + +-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988 ++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 + msgid "Recently Used" +-msgstr "最近使用的" ++msgstr "最近使用" + +-#: ../gtk/gtkfilechooserdefault.c:2361 ++#: ../gtk/gtkfilechooserdefault.c:2363 + msgid "Select which types of files are shown" + msgstr "選擇顯示哪種類型的檔案" + +-#: ../gtk/gtkfilechooserdefault.c:2720 ++#: ../gtk/gtkfilechooserdefault.c:2722 + #, c-format + msgid "Add the folder '%s' to the bookmarks" + msgstr "將資料夾「%s」加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2764 ++#: ../gtk/gtkfilechooserdefault.c:2766 + #, c-format + msgid "Add the current folder to the bookmarks" + msgstr "將目前的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2766 ++#: ../gtk/gtkfilechooserdefault.c:2768 + #, c-format + msgid "Add the selected folders to the bookmarks" + msgstr "將已選的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:2804 ++#: ../gtk/gtkfilechooserdefault.c:2806 + #, c-format + msgid "Remove the bookmark '%s'" + msgstr "移除書籤「%s」" + +-#: ../gtk/gtkfilechooserdefault.c:2806 ++#: ../gtk/gtkfilechooserdefault.c:2808 + #, c-format + msgid "Bookmark '%s' cannot be removed" + msgstr "無法移除書籤「%s」" + +-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699 ++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 + msgid "Remove the selected bookmark" + msgstr "移除已選的書籤" + +-#: ../gtk/gtkfilechooserdefault.c:3377 ++#: ../gtk/gtkfilechooserdefault.c:3379 + msgid "Remove" + msgstr "移除" + +-#: ../gtk/gtkfilechooserdefault.c:3386 ++#: ../gtk/gtkfilechooserdefault.c:3388 + msgid "Rename..." + msgstr "重新命名…" + + #. Accessible object name for the file chooser's shortcuts pane +-#: ../gtk/gtkfilechooserdefault.c:3550 ++#: ../gtk/gtkfilechooserdefault.c:3552 + msgid "Places" + msgstr "位置" + + #. Column header for the file chooser's shortcuts pane +-#: ../gtk/gtkfilechooserdefault.c:3607 ++#: ../gtk/gtkfilechooserdefault.c:3609 + msgid "_Places" + msgstr "位置(_P)" + +-#: ../gtk/gtkfilechooserdefault.c:3687 ++#: ../gtk/gtkfilechooserdefault.c:3689 + msgid "Add the selected folder to the Bookmarks" + msgstr "將已選的資料夾加入書籤" + +-#: ../gtk/gtkfilechooserdefault.c:3948 ++#: ../gtk/gtkfilechooserdefault.c:3950 + msgid "Could not select file" + msgstr "無法選取檔案" + +-#: ../gtk/gtkfilechooserdefault.c:4173 ++#: ../gtk/gtkfilechooserdefault.c:4175 + msgid "_Visit this file" + msgstr "查閱這個檔案(_V)" + +-#: ../gtk/gtkfilechooserdefault.c:4176 ++#: ../gtk/gtkfilechooserdefault.c:4178 + msgid "_Copy file's location" + msgstr "複製檔案的位置(_C)" + +-#: ../gtk/gtkfilechooserdefault.c:4179 ++#: ../gtk/gtkfilechooserdefault.c:4181 + msgid "_Add to Bookmarks" + msgstr "加入書籤(_A)" + +-#: ../gtk/gtkfilechooserdefault.c:4186 ++#: ../gtk/gtkfilechooserdefault.c:4188 + msgid "Show _Hidden Files" + msgstr "顯示隱藏檔(_H)" + +-#: ../gtk/gtkfilechooserdefault.c:4189 ++#: ../gtk/gtkfilechooserdefault.c:4191 + msgid "Show _Size Column" + msgstr "顯示大小欄位(_S)" + +-#: ../gtk/gtkfilechooserdefault.c:4414 ++#: ../gtk/gtkfilechooserdefault.c:4416 + msgid "Files" + msgstr "檔案" + +-#: ../gtk/gtkfilechooserdefault.c:4465 ++#: ../gtk/gtkfilechooserdefault.c:4467 + msgid "Name" + msgstr "名稱" + +-#: ../gtk/gtkfilechooserdefault.c:4488 ++#: ../gtk/gtkfilechooserdefault.c:4490 + msgid "Size" + msgstr "大小" + +-#: ../gtk/gtkfilechooserdefault.c:4502 ++#: ../gtk/gtkfilechooserdefault.c:4504 + msgid "Modified" + msgstr "已修改" + + #. Label +-#: ../gtk/gtkfilechooserdefault.c:4595 ++#: ../gtk/gtkfilechooserdefault.c:4597 + msgid "_Name:" + msgstr "名稱(_N):" + +-#: ../gtk/gtkfilechooserdefault.c:4826 ++#: ../gtk/gtkfilechooserdefault.c:4828 + msgid "Type a file name" + msgstr "輸入檔案名稱" + +-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884 ++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 + msgid "Please select a folder below" + msgstr "請選擇下面的資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:4879 ++#: ../gtk/gtkfilechooserdefault.c:4881 + msgid "Please type a file name" + msgstr "請輸入檔案名稱" + + #. Create Folder +-#: ../gtk/gtkfilechooserdefault.c:4950 ++#: ../gtk/gtkfilechooserdefault.c:4952 + msgid "Create Fo_lder" + msgstr "建立資料夾(_L)" + +-#: ../gtk/gtkfilechooserdefault.c:4998 ++#: ../gtk/gtkfilechooserdefault.c:5000 + msgid "Search:" + msgstr "搜尋：" + +-#: ../gtk/gtkfilechooserdefault.c:5049 ++#: ../gtk/gtkfilechooserdefault.c:5051 + msgid "_Location:" + msgstr "位置(_L):" + +-#: ../gtk/gtkfilechooserdefault.c:5500 ++#: ../gtk/gtkfilechooserdefault.c:5502 + msgid "Save in _folder:" + msgstr "儲存於資料夾(_F):" + +-#: ../gtk/gtkfilechooserdefault.c:5502 ++#: ../gtk/gtkfilechooserdefault.c:5504 + msgid "Create in _folder:" + msgstr "新增於資料夾(_F)：" + +-#: ../gtk/gtkfilechooserdefault.c:6589 ++#: ../gtk/gtkfilechooserdefault.c:6591 + #, c-format + msgid "Could not read the contents of %s" + msgstr "無法讀取 %s 的內容" + +-#: ../gtk/gtkfilechooserdefault.c:6593 ++#: ../gtk/gtkfilechooserdefault.c:6595 + msgid "Could not read the contents of the folder" + msgstr "無法讀取資料夾的內容" + +-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754 +-#: ../gtk/gtkfilechooserdefault.c:6934 ++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 ++#: ../gtk/gtkfilechooserdefault.c:6936 + msgid "Unknown" + msgstr "不明" + +-#: ../gtk/gtkfilechooserdefault.c:6701 ++#: ../gtk/gtkfilechooserdefault.c:6703 + msgid "%H:%M" + msgstr "%H:%M" + +-#: ../gtk/gtkfilechooserdefault.c:6703 ++#: ../gtk/gtkfilechooserdefault.c:6705 + msgid "Yesterday at %H:%M" + msgstr "昨天 %H:%M" + +-#: ../gtk/gtkfilechooserdefault.c:7405 ++#: ../gtk/gtkfilechooserdefault.c:7407 + msgid "Cannot change to folder because it is not local" + msgstr "無法進入資料夾，因為它不是本地資料夾" + +-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030 ++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 + #, c-format + msgid "Shortcut %s already exists" + msgstr "捷徑 %s 已經存在" + +-#: ../gtk/gtkfilechooserdefault.c:8120 ++#: ../gtk/gtkfilechooserdefault.c:8122 + #, c-format + msgid "Shortcut %s does not exist" + msgstr "捷徑 %s 不存在" + +-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548 ++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 + #, c-format + msgid "A file named \"%s\" already exists. Do you want to replace it?" + msgstr "名為「%s」的檔案已存在。是否要取代它？" + +-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552 ++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 + #, c-format + msgid "" + "The file already exists in \"%s\". Replacing it will overwrite its contents." + msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。" + +-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559 ++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 + msgid "_Replace" + msgstr "取代(_R)" + +-#: ../gtk/gtkfilechooserdefault.c:9181 ++#: ../gtk/gtkfilechooserdefault.c:9183 + msgid "Could not start the search process" + msgstr "無法開始搜尋程序" + +-#: ../gtk/gtkfilechooserdefault.c:9182 ++#: ../gtk/gtkfilechooserdefault.c:9184 + msgid "" + "The program was not able to create a connection to the indexer daemon. " + "Please make sure it is running." + msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。" + +-#: ../gtk/gtkfilechooserdefault.c:9196 ++#: ../gtk/gtkfilechooserdefault.c:9198 + msgid "Could not send the search request" + msgstr "無法傳送搜尋要求" + +-#: ../gtk/gtkfilechooserdefault.c:9806 ++#: ../gtk/gtkfilechooserdefault.c:9808 + #, c-format + msgid "Could not mount %s" + msgstr "無法掛載 %s" +@@ -1847,27 +1847,27 @@ msgstr "" + "請聯絡您的系統管理員" + + #. Description of --gtk-module=MODULES in --help output +-#: ../gtk/gtkmain.c:446 ++#: ../gtk/gtkmain.c:447 + msgid "Load additional GTK+ modules" + msgstr "載入額外的 GTK+ 模組" + + #. Placeholder in --gtk-module=MODULES in --help output +-#: ../gtk/gtkmain.c:447 ++#: ../gtk/gtkmain.c:448 + msgid "MODULES" + msgstr "模組" + + #. Description of --g-fatal-warnings in --help output +-#: ../gtk/gtkmain.c:449 ++#: ../gtk/gtkmain.c:450 + msgid "Make all warnings fatal" + msgstr "把所有的警告訊息都當成嚴重錯誤" + + #. Description of --gtk-debug=FLAGS in --help output +-#: ../gtk/gtkmain.c:452 ++#: ../gtk/gtkmain.c:453 + msgid "GTK+ debugging flags to set" + msgstr "準備設定的 GTK+ 偵錯旗標" + + #. Description of --gtk-no-debug=FLAGS in --help output +-#: ../gtk/gtkmain.c:455 ++#: ../gtk/gtkmain.c:456 + msgid "GTK+ debugging flags to unset" + msgstr "準備去除的 GTK+ 偵錯旗標" + +@@ -1876,73 +1876,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標" + #. * Do *not* translate it to "predefinito:LTR", if it + #. * it isn't default:LTR or default:RTL it will not work + #. +-#: ../gtk/gtkmain.c:706 ++#: ../gtk/gtkmain.c:704 + msgid "default:LTR" + msgstr "default:LTR" + +-#: ../gtk/gtkmain.c:774 ++#: ../gtk/gtkmain.c:772 + #, c-format + msgid "Cannot open display: %s" + msgstr "無法開啟畫面：%s" + +-#: ../gtk/gtkmain.c:840 ++#: ../gtk/gtkmain.c:838 + msgid "GTK+ Options" + msgstr "GTK+ 選項" + +-#: ../gtk/gtkmain.c:840 ++#: ../gtk/gtkmain.c:838 + msgid "Show GTK+ Options" + msgstr "顯示 GTK+ 選項" + +-#: ../gtk/gtkmountoperation.c:532 ++#: ../gtk/gtkmountoperation.c:535 + msgid "Co_nnect" + msgstr "連線(_N)" + +-#: ../gtk/gtkmountoperation.c:606 ++#: ../gtk/gtkmountoperation.c:609 + msgid "Connect As" + msgstr "連線身分" + +-#: ../gtk/gtkmountoperation.c:615 ++#: ../gtk/gtkmountoperation.c:618 + msgid "_Anonymous" + msgstr "匿名(_A)" + +-#: ../gtk/gtkmountoperation.c:624 ++#: ../gtk/gtkmountoperation.c:627 + msgid "Registered U_ser" + msgstr "已註冊使用者(_S)" + +-#: ../gtk/gtkmountoperation.c:635 ++#: ../gtk/gtkmountoperation.c:638 + msgid "_Username" + msgstr "使用者名稱(_U)" + +-#: ../gtk/gtkmountoperation.c:640 ++#: ../gtk/gtkmountoperation.c:643 + msgid "_Domain" + msgstr "網域(_D)" + +-#: ../gtk/gtkmountoperation.c:646 ++#: ../gtk/gtkmountoperation.c:649 + msgid "_Password" + msgstr "密碼(_P)" + +-#: ../gtk/gtkmountoperation.c:668 ++#: ../gtk/gtkmountoperation.c:671 + msgid "Forget password _immediately" + msgstr "立刻忘記密碼(_I)" + +-#: ../gtk/gtkmountoperation.c:678 ++#: ../gtk/gtkmountoperation.c:681 + msgid "Remember password until you _logout" + msgstr "記憶密碼到登出之前(_L)" + +-#: ../gtk/gtkmountoperation.c:688 ++#: ../gtk/gtkmountoperation.c:691 + msgid "Remember _forever" + msgstr "永遠記住密碼(_F)" + +-#: ../gtk/gtkmountoperation.c:1077 ++#: ../gtk/gtkmountoperation.c:1080 + #, c-format + msgid "Unknown Application (PID %d)" + msgstr "不明的應用程式（PID %d）" + +-#: ../gtk/gtkmountoperation.c:1260 ++#: ../gtk/gtkmountoperation.c:1263 + msgid "Unable to end process" + msgstr "無法終止程序" + +-#: ../gtk/gtkmountoperation.c:1297 ++#: ../gtk/gtkmountoperation.c:1300 + msgid "_End Process" + msgstr "終止程序(_E)" + +@@ -1985,14 +1985,14 @@ msgstr "第 %u 頁" + #. Translators: the format here is used to build the string that will be rendered + #. * in the number emblem. + #. +-#: ../gtk/gtknumerableicon.c:481 ++#: ../gtk/gtknumerableicon.c:482 + #, c-format + msgctxt "Number format" + msgid "%d" + msgstr "%d" + +-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846 +-#: ../gtk/gtkpapersize.c:886 ++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 ++#: ../gtk/gtkpapersize.c:888 + msgid "Not a valid page setup file" + msgstr "不是有效的頁面設定檔案" + +@@ -2051,7 +2051,7 @@ msgstr "向下路徑" + msgid "File System Root" + msgstr "檔案系統根" + +-#: ../gtk/gtkprintbackend.c:748 ++#: ../gtk/gtkprintbackend.c:750 + msgid "Authentication" + msgstr "驗證" + +@@ -2117,29 +2117,29 @@ msgctxt "print operation status" + msgid "Finished with error" + msgstr "已完成但發生錯誤" + +-#: ../gtk/gtkprintoperation.c:2352 ++#: ../gtk/gtkprintoperation.c:2349 + #, c-format + msgid "Preparing %d" + msgstr "正在準備 %d" + +-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984 ++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 + msgid "Preparing" + msgstr "正在準備" + +-#: ../gtk/gtkprintoperation.c:2357 ++#: ../gtk/gtkprintoperation.c:2354 + #, c-format + msgid "Printing %d" + msgstr "正在列印 %d" + +-#: ../gtk/gtkprintoperation.c:3014 ++#: ../gtk/gtkprintoperation.c:3013 + msgid "Error creating print preview" + msgstr "建立列印預覽時發生錯誤" + +-#: ../gtk/gtkprintoperation.c:3017 ++#: ../gtk/gtkprintoperation.c:3016 + msgid "The most probable reason is that a temporary file could not be created." + msgstr "最可能的原因是無法建立暫存檔案。" + +-#: ../gtk/gtkprintoperation-unix.c:302 ++#: ../gtk/gtkprintoperation-unix.c:307 + msgid "Error launching preview" + msgstr "執行預覽時發生錯誤" + +@@ -3306,7 +3306,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」" + msgid "Unexpected character data on line %d char %d" + msgstr "第 %d 行第 %d 字有非預設的字元資料" + +-#: ../gtk/gtkuimanager.c:2738 ++#: ../gtk/gtkuimanager.c:2694 + msgid "Empty" + msgstr "空的" + +diff --git a/tests/testappchooser.c b/tests/testappchooser.c +index 76af238..80e8fb7 100644 +--- a/tests/testappchooser.c ++++ b/tests/testappchooser.c +@@ -16,6 +16,8 @@ + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.h" ++ + #include <stdlib.h> + #include <gtk/gtk.h> + +diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c +index 92fbb1a..1ab768c 100644 +--- a/tests/testappchooserbutton.c ++++ b/tests/testappchooserbutton.c +@@ -16,8 +16,9 @@ + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +-#include <stdlib.h> ++#include "config.h" + ++#include <stdlib.h> + #include <gtk/gtk.h> + + #define CUSTOM_ITEM "custom-item" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 9b966cd4c..2f78c521a 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,19 +1,25 @@ -# $Id: PKGBUILD 170252 2012-11-06 11:45:54Z foutrelis $ +# $Id: PKGBUILD 170569 2012-11-08 21:40:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - do-not-emit-connected-added-signals-at-object-creation.patch) + do-not-emit-connected-added-signals-at-object-creation.patch + gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch + proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch + proxy-volume-monitor-Dont-force-close-the-session-bus.patch) sha256sums=('0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a' - '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0') + '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0' + '0d509e335f931aceff2b5ce613dd3dec5a7f8ebbca379d8b3e3e4cf0848a9a72' + '26225a7ebfa0144d0481b4af0e9c141920c91c022c67003e92b875f8ecc38069' + 'af7d7bcc5777f356169b13aa86308222fb59c8ba56744f6393a97db0f80c3ed6') build() { cd "$pkgbase-$pkgver" @@ -22,6 +28,11 @@ build() { # https://bugzilla.gnome.org/show_bug.cgi?id=684677 patch -Np1 -i "$srcdir/do-not-emit-connected-added-signals-at-object-creation.patch" + # Fixes from gnome-3-6 branch + patch -Np1 -i "$srcdir/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch" + patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch" + patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-force-close-the-session-bus.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ diff --git a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch new file mode 100644 index 000000000..2d3bcb6c4 --- /dev/null +++ b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch @@ -0,0 +1,24 @@ +From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Mon, 22 Oct 2012 13:07:04 +0000 +Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting + +https://bugzilla.gnome.org/show_bug.cgi?id=686637 +--- +diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c +index 53f22b5..ca77648 100644 +--- a/client/gdaemonmount.c ++++ b/client/gdaemonmount.c +@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount, + data = g_new0 (AsyncProxyCreate, 1); + data->mount = g_object_ref (mount); + data->mount_info = daemon_mount->mount_info; +- data->mount_operation = g_object_ref (mount_operation); + data->flags = flags; ++ if (mount_operation) ++ data->mount_operation = g_object_ref (mount_operation); + if (cancellable) + data->cancellable = g_object_ref (cancellable); + +-- +cgit v0.9.0.2 diff --git a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch new file mode 100644 index 000000000..e56a46ac6 --- /dev/null +++ b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch @@ -0,0 +1,25 @@ +From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Thu, 01 Nov 2012 13:37:37 +0000 +Subject: proxy volume monitor: Don't disable exit_on_close on session bus + +We're on shared session bus, let's exit when connection closes +(usually tied to running desktop session). + +https://bugzilla.gnome.org/show_bug.cgi?id=687074 +(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d) +--- +diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c +index 1af6c34..e0d17b7 100644 +--- a/monitor/proxy/gproxyvolumemonitor.c ++++ b/monitor/proxy/gproxyvolumemonitor.c +@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void) + g_error_free (error); + goto out; + } +- g_dbus_connection_set_exit_on_close (the_session_bus, FALSE); + + the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal); + +-- +cgit v0.9.0.2 diff --git a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch new file mode 100644 index 000000000..1a09ef7e6 --- /dev/null +++ b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch @@ -0,0 +1,23 @@ +From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Thu, 01 Nov 2012 13:46:10 +0000 +Subject: proxy volume monitor: Don't force-close the session bus + +Simple fix to prevent bus closing on GIO module unload. + +https://bugzilla.gnome.org/show_bug.cgi?id=687074 +--- +diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c +index e0d17b7..df99935 100644 +--- a/monitor/proxy/gproxyvolumemonitor.c ++++ b/monitor/proxy/gproxyvolumemonitor.c +@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void) + G_LOCK (proxy_vm); + if (the_session_bus != NULL) + { +- g_dbus_connection_close_sync (the_session_bus, NULL, NULL); + g_object_unref (the_session_bus); + the_session_bus = NULL; + +-- +cgit v0.9.0.2 diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD index df62dc0a4..7059a3e37 100644 --- a/extra/gweled/PKGBUILD +++ b/extra/gweled/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130072 2011-07-01 21:54:59Z eric $ +# $Id: PKGBUILD 170548 2012-11-08 15:28:32Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gweled pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A puzzle game similar to Bejeweled (aka Diamond Mine)" arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,6 @@ depends=('gtk2' 'librsvg' 'libmikmod' 'hicolor-icon-theme') makedepends=('intltool') install=gweled.install source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('746ac14523c968e78140c2f0501fd7cf') sha1sums=('ff4a59935c9e1eb4a202e723baabaab39f526714') build() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD new file mode 100644 index 000000000..51dfef170 --- /dev/null +++ b/extra/intel-tbb/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 170541 2012-11-08 12:12:44Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Denis Martinez <deuns.martinez AT gmail.com> + +pkgname=intel-tbb +pkgver=4.1_20120718 +pkgrel=2 +pkgdesc='High level abstract threading library' +arch=('i686' 'x86_64') +url='http://www.threadingbuildingblocks.org/' +license=('GPL') +depends=('gcc-libs') +source=("http://threadingbuildingblocks.org/uploads/77/188/4.1/tbb${pkgver/\./}oss_src.tgz") +sha1sums=('3fad942c867f032dc5ddeccd7ca19606eda7065d') + +build() { + cd "${srcdir}"/tbb${pkgver/\./}oss + + make +} + +package() { + cd "${srcdir}"/tbb${pkgver/\./}oss + + install -d "${pkgdir}"/usr/lib + install -m755 build/linux_*/*.so* "${pkgdir}"/usr/lib + + install -d "${pkgdir}"/usr/include + cp -a include/tbb "${pkgdir}"/usr/include +} diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 6fc2a9380..374c73669 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 167843 2012-10-03 14:46:17Z andrea $ +# $Id: PKGBUILD 170573 2012-11-09 00:21:48Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,21 +10,26 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'use-libotr3.patch') +sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' + '808fa0400dc419d446d4ff8a9b536b5fddcb4727') build() { - cd "${srcdir}" + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/use-libotr3.patch + cd ../ + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -66,7 +71,7 @@ package_kdenetwork-kget() { package_kdenetwork-kopete() { pkgdesc='Instant Messenger' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') url="http://kde.org/applications/internet/kopete/" install='kdenetwork-kopete.install' diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch new file mode 100644 index 000000000..c36d1a00c --- /dev/null +++ b/extra/kdenetwork/use-libotr3.patch @@ -0,0 +1,20 @@ +--- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~ 2012-11-06 10:51:56.566038215 +0000 ++++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake 2012-11-06 10:53:38.861993686 +0000 +@@ -13,13 +13,13 @@ + SET(LIBOTR_FIND_QUIETLY TRUE) + ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) + +-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) ++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) + +-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) ++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) + +-# Determine version information from libotr/version.h ++# Determine version information from libotr3/version.h + IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) +- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) ++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) + STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") + STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") + # Check if version is at least 3.2.0 diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index e71aa0d44..3cde12fec 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,43 +1,39 @@ -# $Id: PKGBUILD 149426 2012-02-07 16:55:08Z heftig $ +# $Id: PKGBUILD 170549 2012-11-08 15:28:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod -pkgver=3.1.12 -pkgrel=4 +pkgver=3.2.0 +pkgrel=1 pkgdesc="A portable sound library" license=('GPL' 'LGPL') -url="http://sourceforge.net/projects/mikmod/" +url="http://mikmod.shlomifish.org/" arch=('i686' 'x86_64') -depends=('glibc') +depends=('glibc' 'sh') +makedepends=('alsa-lib') options=('!libtool') install=$pkgname.install -source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz - libmikmod-3.1.12-64bit-fix.diff - libmikmod-3.1.12-exitcrash-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff - libmikmod-3.1.12-md_sngchn-fix.diff - libmikmod-CVE-2009-0179.patch) -md5sums=('9f3c740298260d5f88981fc0d51f6f16' - 'dc7ffd8d6d355e9d6ec671b7f2b2adc7' - '03a4f5bfcecddf5f515672d6d477b7f7' - 'a837fd876cbd2ac27419b802504489db' - '076d39de19de36b880ed90297f1ee0d1' - 'fa91f4bc17164be32bec0ea7a73f2aaa') +source=($url/files/$pkgname-$pkgver.tar.gz + libmikmod-3.2.0-64bit-fix.diff + libmikmod-3.1.12-loopingvolume-fix.diff) +md5sums=('96e9820d72a41fe27ff304071739696c' + '0bb09aac6e83e0a7fd6535961b3cff4c' + 'a837fd876cbd2ac27419b802504489db') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff + patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 - make DESTDIR=$pkgdir install + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff new file mode 100644 index 000000000..c965f9ab7 --- /dev/null +++ b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff @@ -0,0 +1,12 @@ +diff -u -r libmikmod-3.2.0-orig/include/mikmod.h libmikmod-3.2.0/include/mikmod.h +--- libmikmod-3.2.0-orig/include/mikmod.h 2012-06-01 15:15:42.000000000 +0200 ++++ libmikmod-3.2.0/include/mikmod.h 2012-10-03 20:03:48.173576199 +0200 +@@ -85,7 +85,7 @@ + + + +-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) ++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64) + /* 64 bit architectures */ + + typedef signed char SBYTE; /* 1 byte, signed */ diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index 3ac3a9866..7a86561e6 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165291 2012-08-14 23:10:37Z bisson $ +# $Id: PKGBUILD 170571 2012-11-09 00:21:42Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr -pkgver=3.2.1 +pkgver=4.0.0 pkgrel=1 pkgdesc='Off-the-Record Messaging Library and Toolkit' url='http://www.cypherpunks.ca/otr/' @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') depends=('libgcrypt') options=('!libtool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394') +sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libotr3/PKGBUILD b/extra/libotr3/PKGBUILD new file mode 100644 index 000000000..698c25615 --- /dev/null +++ b/extra/libotr3/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 170574 2012-11-09 00:22:47Z eric $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Bug <Bug2000@gmail.com> + +pkgname=libotr3 +pkgver=3.2.1 +pkgrel=1 +pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)' +url='http://www.cypherpunks.ca/otr/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +depends=('libgcrypt') +options=('!libtool') +source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch") +sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394' + '08c85f20fa1a0c5e8935d9a3f00b1d4e37f1b2d1') + +build() { + cd "${srcdir}/libotr-${pkgver}" + patch -p1 -i "${srcdir}/libotr3-soname.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static \ + --program-transform-name='s/otr/otr3/' + make +} + +package() { + cd "${srcdir}/libotr-${pkgver}" + make DESTDIR="${pkgdir}" install + + for i in parse sesskeys mackey readforge modify remac; do + rm "${pkgdir}"/usr/share/man/man1/otr_$i.1 + ln -sf otr3_toolkit.1 "${pkgdir}"/usr/share/man/man1/otr3_$i.1 + done +} diff --git a/extra/libotr3/libotr3-soname.patch b/extra/libotr3/libotr3-soname.patch new file mode 100644 index 000000000..aa9b58318 --- /dev/null +++ b/extra/libotr3/libotr3-soname.patch @@ -0,0 +1,695 @@ +diff -Naur libotr-3.2.1.orig/configure libotr-3.2.1/configure +--- libotr-3.2.1.orig/configure 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/configure 2012-11-02 04:53:47.533538908 -0400 +@@ -791,7 +791,7 @@ + LDFLAGS + CFLAGS + CC +-LIBOTR_LIBTOOL_VERSION ++LIBOTR3_LIBTOOL_VERSION + am__untar + am__tar + AMTAR +@@ -2674,7 +2674,7 @@ + + + # Define the identity of the package. +- PACKAGE=libotr ++ PACKAGE=libotr3 + VERSION=3.2.1 + + +@@ -2715,7 +2715,7 @@ + + + +-LIBOTR_LIBTOOL_VERSION="4:1:2" ++LIBOTR3_LIBTOOL_VERSION="4:1:2" + + + +@@ -10461,7 +10461,7 @@ + + + +-ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr.pc" ++ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr3.pc" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -11434,7 +11434,7 @@ + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "toolkit/Makefile") CONFIG_FILES="$CONFIG_FILES toolkit/Makefile" ;; +- "libotr.pc") CONFIG_FILES="$CONFIG_FILES libotr.pc" ;; ++ "libotr3.pc") CONFIG_FILES="$CONFIG_FILES libotr3.pc" ;; + + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +diff -Naur libotr-3.2.1.orig/libotr3.m4 libotr-3.2.1/libotr3.m4 +--- libotr-3.2.1.orig/libotr3.m4 1969-12-31 19:00:00.000000000 -0500 ++++ libotr-3.2.1/libotr3.m4 2012-11-02 04:53:59.983891029 -0400 +@@ -0,0 +1,134 @@ ++dnl ++dnl Off-the-Record Messaging library ++dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov ++dnl <otr@cypherpunks.ca> ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of version 2.1 of the GNU Lesser General ++dnl Public License as published by the Free Software Foundation. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++dnl ++ ++dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate. ++dnl enables arguments --with-libotr3-prefix= ++dnl --with-libotr3-inc-prefix= ++dnl ++dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT ++dnl ++dnl Adapted from alsa.m4, originally by ++dnl Richard Boulton <richard-alsa@tartarus.org> ++dnl Christopher Lansdown <lansdoct@cs.alfred.edu> ++dnl Jaroslav Kysela <perex@suse.cz> ++ ++AC_DEFUN([AM_PATH_LIBOTR3], ++[dnl Save the original CFLAGS, LDFLAGS, and LIBS ++libotr3_save_CFLAGS="$CFLAGS" ++libotr3_save_LDFLAGS="$LDFLAGS" ++libotr3_save_LIBS="$LIBS" ++libotr3_found=yes ++ ++dnl ++dnl Get the cflags and libraries for libotr3 ++dnl ++AC_ARG_WITH(libotr3-prefix, ++[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)], ++[libotr3_prefix="$withval"], [libotr3_prefix=""]) ++ ++AC_ARG_WITH(libotr3-inc-prefix, ++[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)], ++[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""]) ++ ++dnl Add any special include directories ++AC_MSG_CHECKING(for libotr3 CFLAGS) ++if test "$libotr3_inc_prefix" != "" ; then ++ LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix" ++ CFLAGS="$CFLAGS $LIBOTR3_CFLAGS" ++fi ++AC_MSG_RESULT($LIBOTR3_CFLAGS) ++ ++dnl add any special lib dirs ++AC_MSG_CHECKING(for libotr3 LIBS) ++if test "$libotr3_prefix" != "" ; then ++ LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix" ++ LDFLAGS="$LDFLAGS $LIBOTR3_LIBS" ++fi ++ ++dnl add the libotr3 library ++LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3" ++LIBS="$LIBOTR3_LIBS $LIBS" ++AC_MSG_RESULT($LIBOTR3_LIBS) ++ ++dnl Check for a working version of libotr3 that is of the right version. ++min_libotr3_version=ifelse([$1], ,3.0.0,$1) ++no_libotr3="" ++ libotr3_min_major_version=`echo $min_libotr3_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ libotr3_min_minor_version=`echo $min_libotr3_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ libotr3_min_sub_version=`echo $min_libotr3_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version) ++ ++AC_LANG_SAVE ++AC_LANG_C ++AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <libotr3/version.h> ++], [ ++# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version) ++# error not present ++# else ++ ++# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version) ++ exit(0); ++# else ++# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version) ++# error not present ++# endif ++ ++# if(OTRL_VERSION_SUB < $libotr3_min_sub_version) ++# error not present ++# endif ++# endif ++# endif ++exit(0); ++], ++ [AC_MSG_RESULT(found.)], ++ [AC_MSG_RESULT(not present.) ++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)]) ++ libotr3_found=no] ++) ++AC_LANG_RESTORE ++ ++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. ++AC_CHECK_LIB([otr], [otrl_message_receiving],, ++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)]) ++ libotr3_found=no], ++ $LIBGCRYPT_LIBS ++) ++ ++LDFLAGS="$libotr3_save_LDFLAGS" ++LIBS="$libotr3_save_LIBS" ++ ++if test "x$libotr3_found" = "xyes" ; then ++ ifelse([$2], , :, [$2]) ++else ++ LIBOTR3_CFLAGS="" ++ LIBOTR3_LIBS="" ++ ifelse([$3], , :, [$3]) ++fi ++ ++dnl That should be it. Now just export our symbols: ++AC_SUBST(LIBOTR3_CFLAGS) ++AC_SUBST(LIBOTR3_LIBS) ++]) ++ +diff -Naur libotr-3.2.1.orig/libotr3.pc.in libotr-3.2.1/libotr3.pc.in +--- libotr-3.2.1.orig/libotr3.pc.in 1969-12-31 19:00:00.000000000 -0500 ++++ libotr-3.2.1/libotr3.pc.in 2012-11-02 04:53:59.983891029 -0400 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libotr3 ++Description: Off-the-Record Messaging Library ++Version: 3.1.0 ++URL: http://otr.cypherpunks.ca/ ++Libs: -L${libdir} -lotr3 ++Cflags: -I${includedir} +diff -Naur libotr-3.2.1.orig/libotr.m4 libotr-3.2.1/libotr.m4 +--- libotr-3.2.1.orig/libotr.m4 2012-11-02 04:53:36.606563083 -0400 ++++ libotr-3.2.1/libotr.m4 1969-12-31 19:00:00.000000000 -0500 +@@ -1,134 +0,0 @@ +-dnl +-dnl Off-the-Record Messaging library +-dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov +-dnl <otr@cypherpunks.ca> +-dnl +-dnl This library is free software; you can redistribute it and/or +-dnl modify it under the terms of version 2.1 of the GNU Lesser General +-dnl Public License as published by the Free Software Foundation. +-dnl +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Lesser General Public License for more details. +-dnl +-dnl You should have received a copy of the GNU Lesser General Public +-dnl License along with this library; if not, write to the Free Software +-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-dnl +- +-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. +-dnl enables arguments --with-libotr-prefix= +-dnl --with-libotr-inc-prefix= +-dnl +-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT +-dnl +-dnl Adapted from alsa.m4, originally by +-dnl Richard Boulton <richard-alsa@tartarus.org> +-dnl Christopher Lansdown <lansdoct@cs.alfred.edu> +-dnl Jaroslav Kysela <perex@suse.cz> +- +-AC_DEFUN([AM_PATH_LIBOTR], +-[dnl Save the original CFLAGS, LDFLAGS, and LIBS +-libotr_save_CFLAGS="$CFLAGS" +-libotr_save_LDFLAGS="$LDFLAGS" +-libotr_save_LIBS="$LIBS" +-libotr_found=yes +- +-dnl +-dnl Get the cflags and libraries for libotr +-dnl +-AC_ARG_WITH(libotr-prefix, +-[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], +-[libotr_prefix="$withval"], [libotr_prefix=""]) +- +-AC_ARG_WITH(libotr-inc-prefix, +-[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], +-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) +- +-dnl Add any special include directories +-AC_MSG_CHECKING(for libotr CFLAGS) +-if test "$libotr_inc_prefix" != "" ; then +- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" +- CFLAGS="$CFLAGS $LIBOTR_CFLAGS" +-fi +-AC_MSG_RESULT($LIBOTR_CFLAGS) +- +-dnl add any special lib dirs +-AC_MSG_CHECKING(for libotr LIBS) +-if test "$libotr_prefix" != "" ; then +- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" +- LDFLAGS="$LDFLAGS $LIBOTR_LIBS" +-fi +- +-dnl add the libotr library +-LIBOTR_LIBS="$LIBOTR_LIBS -lotr" +-LIBS="$LIBOTR_LIBS $LIBS" +-AC_MSG_RESULT($LIBOTR_LIBS) +- +-dnl Check for a working version of libotr that is of the right version. +-min_libotr_version=ifelse([$1], ,3.0.0,$1) +-no_libotr="" +- libotr_min_major_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- libotr_min_minor_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- libotr_min_sub_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) +- +-AC_LANG_SAVE +-AC_LANG_C +-AC_TRY_COMPILE([ +-#include <stdlib.h> +-#include <libotr/version.h> +-], [ +-# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) +-# error not present +-# else +- +-# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) +- exit(0); +-# else +-# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) +-# error not present +-# endif +- +-# if(OTRL_VERSION_SUB < $libotr_min_sub_version) +-# error not present +-# endif +-# endif +-# endif +-exit(0); +-], +- [AC_MSG_RESULT(found.)], +- [AC_MSG_RESULT(not present.) +- ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) +- libotr_found=no] +-) +-AC_LANG_RESTORE +- +-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. +-AC_CHECK_LIB([otr], [otrl_message_receiving],, +- [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) +- libotr_found=no], +- $LIBGCRYPT_LIBS +-) +- +-LDFLAGS="$libotr_save_LDFLAGS" +-LIBS="$libotr_save_LIBS" +- +-if test "x$libotr_found" = "xyes" ; then +- ifelse([$2], , :, [$2]) +-else +- LIBOTR_CFLAGS="" +- LIBOTR_LIBS="" +- ifelse([$3], , :, [$3]) +-fi +- +-dnl That should be it. Now just export our symbols: +-AC_SUBST(LIBOTR_CFLAGS) +-AC_SUBST(LIBOTR_LIBS) +-]) +- +diff -Naur libotr-3.2.1.orig/libotr.m4.orig libotr-3.2.1/libotr.m4.orig +--- libotr-3.2.1.orig/libotr.m4.orig 1969-12-31 19:00:00.000000000 -0500 ++++ libotr-3.2.1/libotr.m4.orig 2012-08-14 08:15:56.000000000 -0400 +@@ -0,0 +1,134 @@ ++dnl ++dnl Off-the-Record Messaging library ++dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov ++dnl <otr@cypherpunks.ca> ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of version 2.1 of the GNU Lesser General ++dnl Public License as published by the Free Software Foundation. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++dnl ++ ++dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. ++dnl enables arguments --with-libotr-prefix= ++dnl --with-libotr-inc-prefix= ++dnl ++dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT ++dnl ++dnl Adapted from alsa.m4, originally by ++dnl Richard Boulton <richard-alsa@tartarus.org> ++dnl Christopher Lansdown <lansdoct@cs.alfred.edu> ++dnl Jaroslav Kysela <perex@suse.cz> ++ ++AC_DEFUN([AM_PATH_LIBOTR], ++[dnl Save the original CFLAGS, LDFLAGS, and LIBS ++libotr_save_CFLAGS="$CFLAGS" ++libotr_save_LDFLAGS="$LDFLAGS" ++libotr_save_LIBS="$LIBS" ++libotr_found=yes ++ ++dnl ++dnl Get the cflags and libraries for libotr ++dnl ++AC_ARG_WITH(libotr-prefix, ++[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], ++[libotr_prefix="$withval"], [libotr_prefix=""]) ++ ++AC_ARG_WITH(libotr-inc-prefix, ++[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], ++[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) ++ ++dnl Add any special include directories ++AC_MSG_CHECKING(for libotr CFLAGS) ++if test "$libotr_inc_prefix" != "" ; then ++ LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" ++ CFLAGS="$CFLAGS $LIBOTR_CFLAGS" ++fi ++AC_MSG_RESULT($LIBOTR_CFLAGS) ++ ++dnl add any special lib dirs ++AC_MSG_CHECKING(for libotr LIBS) ++if test "$libotr_prefix" != "" ; then ++ LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" ++ LDFLAGS="$LDFLAGS $LIBOTR_LIBS" ++fi ++ ++dnl add the libotr library ++LIBOTR_LIBS="$LIBOTR_LIBS -lotr" ++LIBS="$LIBOTR_LIBS $LIBS" ++AC_MSG_RESULT($LIBOTR_LIBS) ++ ++dnl Check for a working version of libotr that is of the right version. ++min_libotr_version=ifelse([$1], ,3.0.0,$1) ++no_libotr="" ++ libotr_min_major_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ libotr_min_minor_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ libotr_min_sub_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) ++ ++AC_LANG_SAVE ++AC_LANG_C ++AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <libotr/version.h> ++], [ ++# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) ++# error not present ++# else ++ ++# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) ++ exit(0); ++# else ++# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) ++# error not present ++# endif ++ ++# if(OTRL_VERSION_SUB < $libotr_min_sub_version) ++# error not present ++# endif ++# endif ++# endif ++exit(0); ++], ++ [AC_MSG_RESULT(found.)], ++ [AC_MSG_RESULT(not present.) ++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) ++ libotr_found=no] ++) ++AC_LANG_RESTORE ++ ++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. ++AC_CHECK_LIB([otr], [otrl_message_receiving],, ++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) ++ libotr_found=no], ++ $LIBGCRYPT_LIBS ++) ++ ++LDFLAGS="$libotr_save_LDFLAGS" ++LIBS="$libotr_save_LIBS" ++ ++if test "x$libotr_found" = "xyes" ; then ++ ifelse([$2], , :, [$2]) ++else ++ LIBOTR_CFLAGS="" ++ LIBOTR_LIBS="" ++ ifelse([$3], , :, [$3]) ++fi ++ ++dnl That should be it. Now just export our symbols: ++AC_SUBST(LIBOTR_CFLAGS) ++AC_SUBST(LIBOTR_LIBS) ++]) ++ +diff -Naur libotr-3.2.1.orig/libotr.pc.in libotr-3.2.1/libotr.pc.in +--- libotr-3.2.1.orig/libotr.pc.in 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/libotr.pc.in 1969-12-31 19:00:00.000000000 -0500 +@@ -1,11 +0,0 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +- +-Name: libotr +-Description: Off-the-Record Messaging Library +-Version: 3.1.0 +-URL: http://otr.cypherpunks.ca/ +-Libs: -L${libdir} -lotr +-Cflags: -I${includedir} +diff -Naur libotr-3.2.1.orig/Makefile.am libotr-3.2.1/Makefile.am +--- libotr-3.2.1.orig/Makefile.am 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/Makefile.am 2012-11-02 04:53:47.536872337 -0400 +@@ -1,9 +1,9 @@ + SUBDIRS = src toolkit + +-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in ++EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in + + aclocaldir = $(datadir)/aclocal +-aclocal_DATA = libotr.m4 ++aclocal_DATA = libotr3.m4 + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = libotr.pc ++pkgconfig_DATA = libotr3.pc +diff -Naur libotr-3.2.1.orig/Makefile.in libotr-3.2.1/Makefile.in +--- libotr-3.2.1.orig/Makefile.in 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/Makefile.in 2012-11-02 04:53:47.536872337 -0400 +@@ -37,7 +37,7 @@ + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +- $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \ ++ $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \ + COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \ + depcomp install-sh ltmain.sh missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -48,7 +48,7 @@ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = libotr.pc ++CONFIG_CLEAN_FILES = libotr3.pc + CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = +@@ -162,7 +162,7 @@ + LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ + LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ ++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ +@@ -243,11 +243,11 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = src toolkit +-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in ++EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in + aclocaldir = $(datadir)/aclocal +-aclocal_DATA = libotr.m4 ++aclocal_DATA = libotr3.m4 + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = libotr.pc ++pkgconfig_DATA = libotr3.pc + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -303,7 +303,7 @@ + + distclean-hdr: + -rm -f config.h stamp-h1 +-libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in ++libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: +diff -Naur libotr-3.2.1.orig/src/Makefile.am libotr-3.2.1/src/Makefile.am +--- libotr-3.2.1.orig/src/Makefile.am 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/src/Makefile.am 2012-11-02 04:53:47.536872337 -0400 +@@ -1,13 +1,13 @@ + INCLUDES = @LIBGCRYPT_CFLAGS@ + +-lib_LTLIBRARIES = libotr.la ++lib_LTLIBRARIES = libotr3.la + +-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ ++libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ + userstate.c tlv.c auth.c sm.c + +-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ ++libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ + +-otrincdir = $(includedir)/libotr ++otrincdir = $(includedir)/libotr3 + + otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ + version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h +diff -Naur libotr-3.2.1.orig/src/Makefile.in libotr-3.2.1/src/Makefile.in +--- libotr-3.2.1.orig/src/Makefile.in 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/src/Makefile.in 2012-11-02 04:53:47.536872337 -0400 +@@ -69,13 +69,13 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) +-libotr_la_LIBADD = +-am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ ++libotr3_la_LIBADD = ++am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ + mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo +-libotr_la_OBJECTS = $(am_libotr_la_OBJECTS) +-libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS) ++libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -89,8 +89,8 @@ + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(libotr_la_SOURCES) +-DIST_SOURCES = $(libotr_la_SOURCES) ++SOURCES = $(libotr3_la_SOURCES) ++DIST_SOURCES = $(libotr3_la_SOURCES) + HEADERS = $(otrinc_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -130,7 +130,7 @@ + LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ + LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ ++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ +@@ -211,12 +211,12 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = @LIBGCRYPT_CFLAGS@ +-lib_LTLIBRARIES = libotr.la +-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ ++lib_LTLIBRARIES = libotr3.la ++libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ + userstate.c tlv.c auth.c sm.c + +-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ +-otrincdir = $(includedir)/libotr ++libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ ++otrincdir = $(includedir)/libotr3 + otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ + version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h + +@@ -285,8 +285,8 @@ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES) +- $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS) ++libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES) ++ $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -Naur libotr-3.2.1.orig/toolkit/Makefile.am libotr-3.2.1/toolkit/Makefile.am +--- libotr-3.2.1.orig/toolkit/Makefile.am 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/toolkit/Makefile.am 2012-11-02 04:53:47.536872337 -0400 +@@ -6,7 +6,7 @@ + otr_modify otr_remac + + COMMON_S = parse.c sha1hmac.c +-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ ++COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ + + otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) + otr_parse_LDADD = $(COMMON_LD) +diff -Naur libotr-3.2.1.orig/toolkit/Makefile.in libotr-3.2.1/toolkit/Makefile.in +--- libotr-3.2.1.orig/toolkit/Makefile.in 2012-11-02 04:53:36.609896510 -0400 ++++ libotr-3.2.1/toolkit/Makefile.in 2012-11-02 04:53:47.536872337 -0400 +@@ -55,7 +55,7 @@ + am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \ + $(am__objects_1) + otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS) +-am__DEPENDENCIES_1 = ../src/libotr.la ++am__DEPENDENCIES_1 = ../src/libotr3.la + otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1) + am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \ + $(am__objects_1) +@@ -159,7 +159,7 @@ + LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ + LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ ++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ +@@ -242,7 +242,7 @@ + INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ + noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h + COMMON_S = parse.c sha1hmac.c +-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ ++COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ + otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) + otr_parse_LDADD = $(COMMON_LD) + otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S) diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 7723b97be..56083ae3e 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164993 2012-08-08 04:47:49Z eric $ +# $Id: PKGBUILD 170577 2012-11-09 03:34:54Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3 +pkgver=5.3.1 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64') @@ -14,13 +14,12 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -sha1sums=('16883898c0cc418ba44732e3f62a54cf043a1de8' +sha1sums=('5aa74a2eafd44a521c27c34f4b4264670f1bf571' 'a20808f6b250225704856f82a544681a962a299d') build() { cd "${srcdir}/${pkgname}-${pkgver}/src" [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC" - sed -i 's/struct siginfo/siginfo_t/' racket/gc2/sighand.c ./configure --prefix=/usr --enable-shared make } diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD index e33a1addd..ae9858fe5 100644 --- a/extra/sdl_sound/PKGBUILD +++ b/extra/sdl_sound/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137585 2011-09-09 23:22:23Z allan $ -# Maintainer: +# $Id: PKGBUILD 170550 2012-11-08 15:28:40Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_sound pkgver=1.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3" arch=('i686' 'x86_64') url="http://icculus.org/SDL_sound/" @@ -21,7 +21,7 @@ build() { CFLAGS="$CFLAGS -I/usr/include/smpeg" \ CXXFLAGS="$CXXFLAGS -I/usr/include/smpeg" \ - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 1273c6711..019b4c5d6 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169975 2012-10-30 22:59:43Z heftig $ +# $Id: PKGBUILD 170538 2012-11-08 11:31:05Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.6.2 +pkgver=3.6.3 pkgrel=1 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" @@ -17,7 +17,7 @@ makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz browser-plugins.ini) -sha256sums=('d23ceda705b67f3f039064da3bec0bb744490cc3c327538f756d99238e6c52e1' +sha256sums=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') build() { diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index 1a4e74b36..faaef3fa9 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 146759 2012-01-17 03:41:24Z eric $ +# $Id: PKGBUILD 170551 2012-11-08 15:28:46Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xmms pkgver=1.2.11 -pkgrel=4 +pkgrel=5 pkgdesc="The X MultiMedia System - a multimedia player" arch=('i686' 'x86_64') url="http://legacy.xmms2.org/" license=('GPL') -depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils') +depends=('gtk' 'libxxf86vm' 'libsm' 'zlib' 'desktop-file-utils') makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl') optdepends=('libmikmod: for the MikMod input plugin' \ 'libvorbis: for the Ogg Vorbis input plugin' \ |