[Xfce4-commits] <xfce-utils:xfce-4.8> Merge branch 'master' into xfce-4.8

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to d8535c7219a77cf656662823658cf1a21eea3484 (commit)
       from d9d2f93ab7db80f1c59471f0a0a0f2fbf0bdd613 (commit)

commit d8535c7219a77cf656662823658cf1a21eea3484
Merge: d9d2f93 b630b5e
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 30 17:37:50 2011 +0100

    Merge branch 'master' into xfce-4.8

commit b630b5e2c1d6ba4f7d3205605152b8421d678281
Author: Transifex <noreplay at xfce.org>
Date:   Sun Jan 30 00:00:05 2011 +0100

    Update translators, week 04.

commit ea60e6609de81bd0f8b8700dfb70437bac253001
Author: Transifex <noreplay at xfce.org>
Date:   Sun Jan 23 00:00:07 2011 +0100

    Update translators, week 03.

commit 10f3b44e89c81d40b6cf37824b7fa42caea178ac
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Jan 20 11:22:03 2011 +0100

    Make sure XDG_CONFIG_DIRS contains the installed xdg dir.

 scripts/startxfce4.in     |   12 ++++++++++++
 xfce4-about/translators.h |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
index 2268dbe..7a871d2 100644
--- a/scripts/startxfce4.in
+++ b/scripts/startxfce4.in
@@ -38,6 +38,18 @@ else
 fi
 export XDG_DATA_DIRS
 
+if test "x$XDG_CONFIG_DIRS" = "x"
+then
+  if test "x at _sysconfdir_@" = "x/etc"; then
+    XDG_CONFIG_DIRS="/etc/xdg"
+  else
+    XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
+  fi
+else
+  XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
+fi
+export XDG_CONFIG_DIRS
+
 if test "x$DISPLAY" = "x"
 then
   echo "$0: Starting X server"
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 6641db1..bbade5a 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 
-#define TRANSLATORS_H_STAMP "2011-01-16 00:00:06"
+#define TRANSLATORS_H_STAMP "2011-01-30 00:00:04"
 #define ATSIGN "@"
 #define DOTSIGN "."
 
@@ -249,6 +249,13 @@ static const TranslatorInfo xfce_translators_kk[] =
   { NULL, NULL }
 };
 
+static const TranslatorInfo xfce_translators_kn[] =
+{
+  { "shankar", "prasad" DOTSIGN "mvs" ATSIGN "gmail" DOTSIGN "com", TRUE },
+  { "Vasudev Kamath", "kamathvasudev" ATSIGN "gmail" DOTSIGN "com", TRUE },
+  { NULL, NULL }
+};
+
 static const TranslatorInfo xfce_translators_lt[] =
 {
   { "Ričardas Vasiulis", "ricardas" DOTSIGN "v" ATSIGN "inbox" DOTSIGN "lt", TRUE },
@@ -488,6 +495,7 @@ static const TranslatorTeam xfce_translators[] =
   { "Italian", "it", xfce_translators_it },
   { "Japanese", "ja", xfce_translators_ja },
   { "Kazakh", "kk", xfce_translators_kk },
+  { "Kannada", "kn", xfce_translators_kn },
   { "Lithuanian", "lt", xfce_translators_lt },
   { "Latvian", "lv", xfce_translators_lv },
   { "Norwegian Bokmal", "nb", xfce_translators_nb },