[Xfce4-commits] [xfce/libxfce4ui] 02/07: Merge branch 'master' of git://git.xfce.org/xfce/libxfce4ui
noreply at xfce.org
noreply at xfce.org
Sun Jun 5 12:24:21 CEST 2016
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository xfce/libxfce4ui.
commit 019fe8fe518c2021e3b53ba17de4396a7c3ed59b
Merge: 5db4146 c5db61c
Author: Landry Breuil <landry at rhaalovely.net>
Date: Sun Sep 21 22:20:35 2014 +0200
Merge branch 'master' of git://git.xfce.org/xfce/libxfce4ui
Conflicts:
libxfce4ui/abicheck.sh
Makefile.am | 5 -
NEWS | 45 +
configure.ac.in | 30 +-
docs/Makefile.am | 6 +-
docs/libxfce4ui-sections.txt | 4 +
glade/Makefile.am | 2 +-
glade/libxfce4ui-glade.c | 5 +
libxfce4kbd-private/Makefile.am | 76 +-
libxfce4kbd-private/libxfce4kbd-private-3.pc.in | 11 +
libxfce4kbd-private/xfce-shortcut-dialog.c | 171 ++-
libxfce4kbd-private/xfce-shortcuts-grabber.c | 185 +--
libxfce4kbd-private/xfce-shortcuts-provider.c | 56 +-
libxfce4kbd-private/xfce-shortcuts-xfwm4.c | 146 +++
libxfce4kbd-private/xfce-shortcuts-xfwm4.h | 23 +
libxfce4kbd-private/xfce-shortcuts.c | 92 +-
libxfce4kbd-private/xfce-shortcuts.h | 3 +-
libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 75 +-
libxfce4ui/Makefile.am | 66 +-
libxfce4ui/libxfce4ui-2.pc.in | 15 +
libxfce4ui/libxfce4ui.symbols | 3 +
libxfce4ui/xfce-dialogs.c | 67 +-
libxfce4ui/xfce-dialogs.h | 106 +-
libxfce4ui/xfce-gdk-extensions.c | 15 +-
libxfce4ui/xfce-heading.c | 250 +++-
libxfce4ui/xfce-sm-client.c | 34 +-
libxfce4ui/xfce-sm-client.h | 22 +
libxfce4ui/xfce-spawn.c | 70 +-
libxfce4ui/xfce-titled-dialog.c | 27 +-
po/POTFILES.in | 1 +
po/am.po | 822 +++++++++++++
po/ar.po | 621 +++++++---
po/ast.po | 1330 ++++++++++------------
po/bg.po | 759 ++++++++++++
po/bn.po | 753 ++++++++++--
po/ca.po | 653 +++++++----
po/cs.po | 622 +++++++---
po/da.po | 650 +++++++----
po/de.po | 664 +++++++----
po/el.po | 675 +++++++----
po/en_AU.po | 759 ++++++++++++
po/en_GB.po | 744 ++++++++++--
po/es.po | 612 +++++++---
po/eu.po | 645 +++++++----
po/fi.po | 623 +++++++---
po/fr.po | 661 +++++++----
po/gl.po | 620 +++++++---
po/he.po | 775 ++++++++++++-
po/hr.po | 614 +++++++---
po/hu.po | 658 +++++++----
po/id.po | 591 +++++++---
po/is.po | 602 +++++++---
po/it.po | 657 +++++++----
po/ja.po | 559 ++++++---
po/kk.po | 650 +++++++----
po/ko.po | 611 +++++++---
po/ku.po | 164 ---
po/lt.po | 631 +++++++---
po/lv.po | 814 +++++++++++--
po/ms.po | 759 ++++++++++++
po/nb.po | 761 +++++++++++--
po/nl.po | 630 +++++++---
po/nn.po | 617 +++++++---
po/oc.po | 759 ++++++++++++
po/pa.po | 796 +++++++++++--
po/pl.po | 655 +++++++----
po/pt.po | 588 ++++++++--
po/pt_BR.po | 648 +++++++----
po/ro.po | 760 +++++++++++--
po/ru.po | 636 ++++++++---
po/si.po | 749 +++++++++++-
po/sk.po | 668 +++++++----
po/sl.po | 760 +++++++++++++
po/sr.po | 760 +++++++++++++
po/sv.po | 758 ++++++++++--
po/te.po | 548 +++++++--
po/th.po | 759 ++++++++++++
po/tl.po | 418 -------
po/tl_PH.po | 163 ---
po/tr.po | 643 +++++++----
po/ug.po | 762 +++++++++++--
po/uk.po | 631 +++++++---
po/ur.po | 815 +++++++++++--
po/ur_PK.po | 815 +++++++++++--
po/vi.po | 624 ++++++++--
po/zh_CN.po | 586 +++++++---
po/zh_HK.po | 759 ++++++++++++
po/zh_TW.po | 597 ++++++++--
xfce4-about/Makefile.am | 16 +-
xfce4-about/contributors.h | 26 +-
xfce4-about/translators.h | 213 +++-
90 files changed, 32208 insertions(+), 8621 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list