[debian-edu-commits] debian-edu/ 161/183: Added japanese translation by Hideki Yamane

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit d1507400fa16bcca92ab3033f6be169c5a986316
Author: Bart Cornelis <cobaco at linux.be>
Date:   Sun Jan 11 02:09:01 2009 +0000

    Added japanese translation by Hideki Yamane
---
 20desktop-profiles_activateDesktopProfiles |  9 ++++--
 debian/changelog                           |  6 ++++
 debian/copyright                           |  4 +++
 debian/po/ja.po                            | 49 ++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index 70a8879..f4e952c 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -367,18 +367,21 @@ if (test $INSTALLED = true); then
                         /etc/default/desktop-profiles \
                         "$CACHE_FILE" 2> /dev/null | \
 	       head -1) = "$CACHE_FILE"); then
+      # if the cache holds sets any profiles -> 
       # export the variable settings in the cache file after replacing 
       # the placeholders for the current variable values with said values 
       # (the location of placeholders is based on the active personalitytype)
-      export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
+      if( grep = "$CACHE_FILE" > /dev/null 2>&1 ); then
+        export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
                             -e "s|\\\$XDG_CONFIG_DIRS|$XDG_CONFIG_DIRS|" \
                             -e "s|\\\$XDG_DATA_DIRS|$XDG_DATA_DIRS|" \
                             -e "s|\\\$CHOICESPATH|$CHOICESPATH|" \
                             -e "s|\\\$GNUSTEP_PATHLIST|$GNUSTEP_PATHLIST|" \
 			    -e "s|\\\$UDEdir|$UDEdir|" );
     
-      # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
-      export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
+        # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
+        export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
+      fi;	
     # else if we have any profile kinds we're interested in, then go 
     # calculate the profile assignments
     elif (test "$ACTIVE_PROFILE_KINDS"x != "x"); then
diff --git a/debian/changelog b/debian/changelog
index 8e7c2f3..5ffb112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+desktop-profiles (1.4.16) unstable; urgency=low
+
+  *  Added Japanese translation by "Hideki Yamane (Closes: #510725) 
+
+ -- Bart Cornelis (cobaco) <cobaco at linux.be>  Sun, 11 Jan 2009 03:02:09 +0100
+
 desktop-profiles (1.4.15) unstable; urgency=low
 
   [ Guillem Jover ]
diff --git a/debian/copyright b/debian/copyright
index 7ebbb04..ebff69d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,6 +36,10 @@ Files: po/it.po
 Copyright: (c) Marco Presi <zufus at debian.org>, 2005
 License: GPL-2+
 
+Files: debian/po/ja.po
+Copyright: (c) Hideki Yamane (Debian-JP) <henrich at debian.org>
+License: GPL-2+
+
 Files: po/pt_BR.po, debian/po/pt_BR.po
 Copyright: (c) Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs.org>, 2006
 License: GPL-2+
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..c5db2c3
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,49 @@
+# Copyright (C) 2008 Bart Cornelis (cobaco) <cobaco at linux.be>
+# This file is distributed under the same license as the desktop-profiles package.
+# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop-profiles 1.4.15\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2007-02-05 12:40+0100\n"
+"PO-Revision-Date: 2008-12-28 22:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "Global gconf path file needs to be changed!"
+msgstr "システム全体での gconf のパスファイルを変更する必要があります!"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"The include directives used by desktop-profiles have changed (in response to "
+"bug 309978, see the bug report and corresponding entry in the changelog of "
+"version 1.4.6 of this package for details)."
+msgstr ""
+"desktop-profiles で使われている include ディレクティブが変更されました (bug "
+"309978 への対応のため。詳細については、このパッケージのバージョン 1.4.6 での"
+"対応する changelog エントリを参照してください)。"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
+msgstr ""
+"gconf プロファイルを再度有効にするには /etc/gconf/2/path を以下の様に変更する"
+"必要があります:\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory."
+"path' を 'include \\$(ENV_MANDATORY_PATH)' に変更、そして\\n - 'include /var/"
+"cache/desktop-profiles/\\$(USER)_defaults.path' は 'include "
+"\\$(ENV_DEFAULTS_PATH)' に変更"
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git