[Xfce4-commits] <xfce4-sensors-plugin:master> apply Nick's patch for automatically adding po files for translations

Fabian Nowak noreply at xfce.org
Thu May 27 00:02:01 CEST 2010


Updating branch refs/heads/master
         to a4fbc3421e6eb9b76e399ef13810ea7b325d6f13 (commit)
       from 214a82f70841deab874017ac5f6ec1f5673ba727 (commit)

commit a4fbc3421e6eb9b76e399ef13810ea7b325d6f13
Author: Fabian Nowak <timystery at arcor.de>
Date:   Thu May 27 00:00:08 2010 +0200

    apply Nick's patch for automatically adding po files for translations

 autogen.sh      |   65 ++++++--
 configure.in.in |   14 ++-
 po/ChangeLog    |  476 -------------------------------------------------------
 po/LINGUAS      |    2 -
 4 files changed, 59 insertions(+), 498 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c20321a..ba1a279 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,6 @@
 #!/bin/sh
 #
-# $Id$
-#
-# Copyright (c) 2002-2006
-#         The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
+# Copyright (c) 2002-2010 Xfce Development Team
 #
 
 (type xdt-autogen) >/dev/null 2>&1 || {
@@ -18,22 +13,58 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
+# portability for awk
+awk_tests="gawk mawk nawk awk"
+if test -z "$AWK"; then
+  for a in $awk_tests; do
+    if type $a >/dev/null 2>&1; then
+      AWK=$a
+      break
+    fi
+  done
+else
+  if ! type $AWK >/dev/null 2>/dev/null; then
+    unset AWK
+  fi
+fi
+if test -z "$AWK"; then
+  echo "autogen.sh: The 'awk' program (one of $awk_tests) is" >&2
+  echo "            required, but cannot be found." >&2
   exit 1
-}
+fi
+
+# substitute revision
+if test -d .git/svn; then
+    revision=`git svn find-rev trunk 2>/dev/null ||
+              git svn find-rev origin/trunk 2>/dev/null ||
+              git svn find-rev HEAD 2>/dev/null ||
+              git svn find-rev master 2>/dev/null`
+elif test -d .git; then
+    revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+    revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n", $2}'`
+fi
+if test "x$revision" = "x"; then
+    revision="UNKNOWN"
+fi
+
+# substitute the linguas
+linguas=`cd "po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
+if test "x$linguas" = "x"; then
+    echo "autogen.sh: No po files were found, aborting." >&2
+    exit 1
+fi
 
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
 
-xdt-autogen $@
+exec xdt-autogen $@
+
+# xdt-autogen clean does not remove all generated files
+(test x"clean" = x"$1") && {
+  rm -f configure.in
+  rm -f INSTALL
+} || true
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index 3d20689..00e14a5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,13 +8,21 @@ dnl 2007 Benedikt Meurer <benny at xfce.org>, Fabian Nowak <timystery at arcor.de>
 dnl
 
 m4_define([libxfce4sensors_verinfo], [1:0:0])
-m4_define([plugin_version],[1.0.1])
 
-AC_INIT([xfce4-sensors-plugin], [plugin_version], [timystery at arcor.de])
+m4_define([sensors_version_major], [4])
+m4_define([sensors_version_minor], [6])
+m4_define([sensors_version_micro], [2])
+m4_define([sensors_version_nano], [])
+m4_define([sensors_version_build], [@REVISION@])
+m4_define([sensors_version_tag], [git])
+m4_define([sensors_version], [sensors_version_major().sensors_version_minor().sensors_version_micro()ifelse(sensors_version_nano(), [], [], [.sensors_version_nano()])ifelse(sensors_version_tag(), [git], [sensors_version_tag()-sensors_version_build()], [sensors_version_tag()])])
+
+
+AC_INIT([xfce4-sensors-plugin], [sensors_version], [timystery at arcor.de])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 
-PLUGIN_VERSION=plugin_version()
+PLUGIN_VERSION=sensors_version()
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME], [AC_PACKAGE_VERSION])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 79c01d3..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,476 +0,0 @@
-2009-08-08  Mike Massonnet <mmassonnet at xfce.org>
-
-	* ast.po: Asturian translation added (Marcos Alvarez Costales)
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-07-24  Gabor Kelemen  <kelemeng at gnome.hu>
-
-	* hu.po: Translation reworked.
-
-2009-07-22  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2009-06-09  Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Czech translation updated
-
-2009-05-29  Mike Massonnet <mmassonnet at xfce.org>
-
-	* ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
-	* ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-05-11  Mike Massonnet <mmassonnet at xfce.org>
-
-	* zh_CN.po: Simplified Chinese translation update (Hunt Xu)
-	* tr.po: Turkish translation update (Samed Beyribey)
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-20  Mike Massonnet <mmassonnet at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-16  Mike Massonnet <mmassonnet at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-	* ca.po: Catalan translation update (Carles Muñoz Gorriz)
-
-2009-04-13  Mike Massonnet <mmassonnet at xfce.org>
-
-	* id.po: Indonesian translation upadte (Andhika Padmawan)
-
-2009-04-08  Piotr Sokół <piotr.sokol at 10g.pl>
-
-	* pl.po: Polish translation update
-
-2009-03-30  Piotr Sokół <piotr.sokol at 10g.pl>
-
-	* pl.po: Polish translation update
-
-2009-03-29  Maximilian Schleiss <maximilian at xfce.org>
-
-	* it.po: Italian translation update (Cristian Marchi)
-	* pt.po: Portuguese translation update (Nuno Miguel)
-
-2009-03-20 Per Kongstad <pko at xfce.org>
-
-	* da.po: Danish translation update (Per Kongstad)
-
-2009-03-19  Masato Hashimoto <cabezon.hashimoto at gmail.com>
-
-	* ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-03-14  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-	* it.po, LINGUAS: Italian translation added (Cristian Marchi)
-
-2009-03-05  Mike Massonnet <mmassonnet at xfce.org>
-
-	* pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-02-22  Mike Massonnet <mmassonnet at xfce.org>
-
-	* es.po: Add Spanish translation (Abel Martín)
-
-2009-02-20  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-02-09  Alexander Toresson <eulex at xfce.org>
-
-	* sv.po: Swedish translation update (Daniel Nylander)
-
-2009-01-18  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ja.po: Japanese translation update (Nobuhiro Iwamatsu)
-
-2009-01-13  Alexander Toresson <eulex at xfce.org>
-
-	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-12-25  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-12-21 Lars Nielsen <lars at mit-web.dk>
-
-	* da.po: Updated danish translation
-
-2008-12-17  Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
-	* fi.po: Add Finnish translation by Elias Julkunen with
-        some modifications.
-
-2008-11-30  Maximilian Schleiss <maximilian at xfce.org>
-
-	* pt_PT.po: European Portuguese translation update (Nuno Miguel)
-
-2008-11-28 Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2008-11-24  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-23  Maximilian Schleiss <maximilian at xfce.org>
-
-	* sq.po: Albanian translation update (Besnik Bleta)
-	* uk.po: Ukrainian translation udpate (Dmitry Nikitin)
-
-2008-11-23  Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Czech translation updated
-
-2008-11-21  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-17  Eren Türkay <erenturkay at xfce.org>
-
-        * tr.po: Turkish translation update (Turkish translation team: Gökmen Görgen, Samed Beyribey, Özgür Kuru, Utku Aydın)
-
-2008-11-16  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ca.po: Catalan translation update (Carles Muñoz Gorriz)
-
-2008-11-12  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-09  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-	* ja.po: Japanese translation update (Masato Hashimoto)
-	* pt_PT.po: European Portuguese translation update (Nuno Miguel)
-
-2008-11-07 Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Updated Czech translation
-
-2008-11-06 Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-
-2008-11-04  Piarres Beobide e <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-03  Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Czech translation updated
-
-2008-11-01  Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Czech translation updated
-
-2008-10-28  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-	* ja.po: Japanese translation update (Nobuhiro Iwamatsu)
-
-2008-10-24 Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-
-2008-10-12 Lars Nielsen <lars at mit-web.dk>
-
-	* da.po: Danish translation update
-
-2008-10-10  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ja.po: Japanese translation update (Nobuhiro Iwamatsu)
-
-2008-09-11  Piarres Beobide <pi at beobide.net>
-
-	* eu.po: Basque translation update
-
-2008-08-10  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-07-15 Mohamed Magdy <alnokta at xfce.org>
-
-        * ar.po: Add Arabic translation
-
-2008-07-14  Maximilian Schleiss <maximilian at xfce.org>
-
-	* pt_PT.po: European Protuguese translation update (Nuno Miguel)
-
-2008-06-26  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
-
-2008-06-25  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po, LINGUAS: Indonesian translation added (Andhika Padmawan)
-
-2008-06-16  Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-
-2008-05-27  Mike Massonnet <mmassonnet at xfce.org>
-
-	* da.po, LINGUAS: Add Danish translation (Jens Hyllegaard)
-
-2008-05-14	Mike Massonnet <mmassonnet at xfce.org>
-
-	* ja.po: Update Japanese translation (Nobuhiro Iwamatsu)
-
-2008-05-13	Mike Massonnet <mmassonnet at xfce.org>
-
-	* en_GB.po: Update translation (Jeff Bailes)
-
-2008-05-02  Piarres Beobide <pi at beobide.net>
-
-	* eu.po: Basque translation update
-
-2008-03-18	Mike Massonnet <mmassonnet at xfce.org>
-
-	* pt_PT.po: Update Portuguese translation by Nuno Miguel
-
-2008-02-27  Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Fábio Nogueira <deb-user-ba at ubuntu.com>
-
-2008-01-21  Og Maciel <ogmaciel at gnome.org>
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Fábio Nogueira <deb-user-ba at ubuntu.com>
-
-2007-11-18	Maximilian Schleiss <maximilian at xfce.org>
-
-	* lv.po: Latvian translation added
-	by Rihards Priedītis <rprieditis at inbox.lv>
-
-2007-11-15	Mike Massonnet <mmassonnet at xfce.org>
-
-	* ur.po: Update translation by Muhammad Ali Makki <makki.ma at gmail.com>
-	* pk.po, ur.po: Rename pk.po to ur.po.
-
-2007-11-04  Og Maciel <ogmaciel at gnome.org>
-	* pt_BR.po: Updated Brazilian Protuguese translation
-	by Og Maciel <ogmaciel at gnome.org>
-
-2007-11-04  Og Maciel <ogmaciel at gnome.org>
-	* pt_BR.po: Updated Brazilian Protuguese translation
-	and added it to LINGUAS by Og Maciel <ogmaciel at gnome.org>
-	* pt_PT.po: Updated the pt_PT.po file and added it to the
-	LINGUAS file by Og Maciel <ogmaciel at gnome.org>
-
-2007-10-28	Mike Massonnet <mmassonnet at xfce.org>
-
-	* pk.po: Add new translation by محمد علي المكي <makki.ma at gmail.com>
-
-2007-10-24  Mike Massonnet <mmassonnet at xfce.org>
-
-	* fr.po: Update translation
-
-2007-09-23  Mike Massonnet <mmassonnet at xfce.org>
-
-	* pt_PT.po: Update translation by Nuno Miguel <nunis at netcabo.pt>
-
-2007-08-25  Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Brazilian Protuguese translation added
-	by Bruno Jesus <myxfce at gmail.com> and revised by
-	Og Maciel <ogmaciel at gnome.org>
-
-2007-08-25  Mike Massonnet <mmassonnet at xfce.org>
-
-	* pt_PT.po: European Portuguese update
-	by Nuno Miguel <nunis at netcabo.pt>
-
-2007-07-08	Maximilian Schleiss <maximilian at xfce.org>
-
-	* pt_PT.po: European Protuguese translation added
-	by Nuno Miguel <nunis at netcabo.pt>
-
-2007-03-31  Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* gb.po: British translation by Jeff Bailes <thepizzaking at gmail.com>
-
-2007-02-20  Maximilian Schleiss <maximilian at xfce.org>
-
-	* sq.po: Modified the headers for the Albanian translation by
-	Besnik Bleta <besnik at programeshqip.org>
-
-2007-02-02  Maximilian Schleiss <maximilian at xfce.org>
-
-	* fr.po: Added the Albanian translation by
-	Besnik Bleta <besnik at programeshqip.org>
-
-2006-12-11  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ko.po: Updated the Korean translation by
-	ByungHyun Choi <byunghyun.choi at debianusers.org>
-
-2006-11-27  Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* ko.po: Update Korean Translations by
-	ByungHyun Choi <byunghyun.choi at debianusers.org>
-
-2006-10-16  Maximilian Schleiss <maximilian at xfce.org>
-
-	* fr.po: Updated French translation.
-
-2006-10-14  Stavros Giannouris <stavrosg at serverhive.com>
-
-	* el.po: Updated Greek translations
-
-2006-10-14  Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* pl.po: Update Polish translation by Piotr Maliński
-	<admin at rk.edu.pl>
-
-2006-10-13  Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* pl.po: Update Polish translation by Piotr Maliński
-	<admin at rk.edu.pl>
-
-2006-10-05  Piarres Beobide <pi at beobide.net>
-
-	* eu.po: Basque translation update
-
-2006-10-03  Jean-François Wauthy <pollux at xfce.org>
-
-	* pl.po: Updated Polish translations by piotr maliński
-	<riklaunim at gmail.com>
-
-2006-04-09  Daichi Kawahata <daichi at xfce.org>
-
-	* eu.po, hu.po, vi.po: Updated.
-	* ru.po: Added Russian translations by Andrey Fedoseev
-	  <andrey.fedoseev at gmail.com>.
-
-2006-04-08  Daichi Kawahata <daichi at xfce.org>
-
-	* pl.po: Added Polish translations by Piotr Malinski
-	  <admin at rk.edu.pl>.
-
-2005-11-02  ByungHyun Choi <byunghyun.choi at gmail.com>
-
-	* ko.po: added Korean translations
-
-2005-10-14  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po: updated translations for
-	  hddtemp
-
-2005-10-09  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po, xfce4-sensors-plugin.pot:
-	  updated german translation, but other translations were also
-	  affected by being updated to contain newest strings for
-	  translation.
-
-2005-10-08  Fabian Nowak <timystery at arcor.de>
-
-	* de.po: updated german translation
-
-2005-10-08  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po: neues icon zeug, desktop file
-	  eingetragen
-
-2005-10-03  Fabian Nowak <timystery at arcor.de>
-
-	* de.gmo: delete unnecessary gmo file from repository
-
-2005-10-03  Fabian Nowak <timystery at arcor.de>
-
-	* POTFILES.in, de.po, el.po, fr.po, ko.po, lt.po: .desktop and
-	  translation stuff
-
-2005-10-03  Fabian Nowak <timystery at arcor.de>
-
-	* Makefile.in.in, POTFILES.in, de.po, el.po, fr.po, ko.po, lt.po:
-	  Version 0.8.0 for new panel 4.3.22 and higher. Pretty bug free
-	  (TM)
-
-2005-09-14  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po, xfce4-sensors-plugin.pot:
-	  new user interface for options dialog
-
-2005-08-02  Stefan Ott <stefan at desire.ch>
-
-	* de.po, el.po, fr.po, ko.po, lt.po: Added new language lines
-
-2005-08-01  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po, xfce4-sensors-plugin.pot:
-	  some more improvements concerning i18n
-
-2005-08-01  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po, xfce4-sensors-plugin.pot:
-	  found more translatable strings ;)
-
-2005-07-31  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, el.po, fr.po, ko.po, lt.po, xfce4-sensors-plugin.pot:
-	  remove ja.po from targets, added sensors.h to targets
-
-2005-07-31  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, fr.po, ko.po, xfce4-sensors-plugin.pot: svn-commit.5.tmp
-
-2005-07-29  Stefan Ott <stefan at desire.ch>
-
-	* de.po: Added new lines
-
-2005-07-28  Jean-Francois Wauthy <pollux at xfce.org>
-
-	* el.po, fr.po, ja.po: add EL, FR and JA translations
-
-2005-06-15  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, ko.po, xfce4-sensors-plugin.pot: Improved data
-	  visualization
-
-2005-06-15  Fabian Nowak <timystery at arcor.de>
-
-	* de.po, ko.po, xfce4-sensors-plugin.pot: some more textual
-	  changes, sorry translators
-
-2005-02-13  Jean-Francois Wauthy <pollux at xfce.org>
-
-	* lt.po: add LT translations
-
-2005-01-25  Jean-Francois Wauthy <pollux at xfce.org>
-
-	* de.gmo, ko.po: add KO translations
-
-2005-01-17  Benedikt Meurer <benny at xfce.org>
-
-	* ChangeLog: Translators changelog.
-
-2004-12-31  Fabian Nowak <timystery at arcor.de>
-
-	* de.po: removed gettext macros, included xfce-i18n header
-
-2004-12-31  Fabian Nowak <timystery at arcor.de>
-
-	* de.gmo, de.po, xfce4-sensors-plugin.pot: further gettext macros
-
-2004-12-31  Fabian Nowak <timystery at arcor.de>
-
-	* de.gmo, de.po, xfce4-sensors-plugin.pot: added i18n macros to
-	  some strings
-
-2004-12-29  Fabian Nowak <timystery at arcor.de>
-
-	* de.gmo: newly created file for german translation
-
-2004-12-29  Fabian Nowak <timystery at arcor.de>
-
-	* de.po: tranlated en -> de
-
-2004-12-28  Benedikt Meurer <benny at xfce.org>
-
-	* Makefile.in.in, POTFILES.in, de.gmo, de.po,
-	  xfce4-sensors-plugin.pot: Added i18n support. Added dist-bz2 and
-	  distcheck-bz2 targets. Updated spec file.
-
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index c70e5b6..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de el en_GB es eu fi fr gl hu id it ja ko lt lv pl pt pt_BR ru sq sv tr uk ur ur_PK vi zh_CN zh_TW 



More information about the Xfce4-commits mailing list