[fusion-commits] A simple settings manager for CompizConfig: Changes to 'master' (fb2e1c7ac461ae175df5552297f190a957c5c3cc)

[marex at server.opencompositing.org]

New commits:
commit fb2e1c7ac461ae175df5552297f190a957c5c3cc
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 10 20:10:34 2008 +0200

    Fixed translation for desktop file


 MANIFEST.in            |    2 +-
 po/POTFILES.in         |    1 +
 po/simple-ccsm.pot     |   38 ++++++++++++++++++++++----------------
 setup.py               |    4 ++++
 simple-ccsm.desktop    |    9 ---------
 simple-ccsm.desktop.in |    9 +++++++++
 6 files changed, 37 insertions(+), 26 deletions(-)
 delete mode 100644 simple-ccsm.desktop
 create mode 100644 simple-ccsm.desktop.in


Modified: fusion/compizconfig/simple-ccsm/MANIFEST.in
===================================================================
--- fusion/compizconfig/simple-ccsm/MANIFEST.in
+++ fusion/compizconfig/simple-ccsm/MANIFEST.in
@@ -2,7 +2,7 @@ include po/*
 include TODO README INSTALL AUTHORS COPYING LICENSE NEWS VERSION ChangeLog
 include simple-ccsm.in
 include simple-ccsm.glade
-include simple-ccsm.desktop
+include simple-ccsm.desktop.in
 include Makefile MANIFEST.in
 recursive-include profiles *
 recursive-include images *

Modified: fusion/compizconfig/simple-ccsm/po/POTFILES.in
===================================================================
--- fusion/compizconfig/simple-ccsm/po/POTFILES.in
+++ fusion/compizconfig/simple-ccsm/po/POTFILES.in
@@ -1,2 +1,3 @@
 simple-ccsm.in
 simple-ccsm.glade
+simple-ccsm.desktop.in

Modified: fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
===================================================================
--- fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
+++ fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.opencompositing.org\n"
-"POT-Creation-Date: 2008-03-31 12:27+0530\n"
+"POT-Creation-Date: 2008-05-10 20:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -22,6 +22,12 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
+msgid "Zoom"
+msgstr ""
+
+msgid "Colorfilter"
+msgstr ""
+
 #, c-format
 msgid "%s (Cover)"
 msgstr ""
@@ -36,21 +42,6 @@ msgstr ""
 msgid "Flip"
 msgstr ""
 
-msgid "Profile"
-msgstr ""
-
-msgid "Animations"
-msgstr ""
-
-msgid "Desktop"
-msgstr ""
-
-msgid "Effects"
-msgstr ""
-
-msgid "Zoom"
-msgstr ""
-
 msgid "Default"
 msgstr ""
 
@@ -111,12 +102,21 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
+msgid "Animations"
+msgstr ""
+
 msgid "Area zoom"
 msgstr ""
 
+msgid "Desktop"
+msgstr ""
+
 msgid "Edges"
 msgstr ""
 
+msgid "Effects"
+msgstr ""
+
 msgid "Enable Blur"
 msgstr ""
 
@@ -149,3 +149,9 @@ msgstr ""
 
 msgid "gtk-help"
 msgstr ""
+
+msgid "Configure Compiz with CompizConfig"
+msgstr ""
+
+msgid "Simple CompizConfig Settings Manager"
+msgstr ""

Modified: fusion/compizconfig/simple-ccsm/setup.py
===================================================================
--- fusion/compizconfig/simple-ccsm/setup.py
+++ fusion/compizconfig/simple-ccsm/setup.py
@@ -115,6 +115,10 @@ f = open (os.path.join ("simple-ccsm"), "wt")
 f.write (data)
 f.close ()
 
+cmd = "intltool-merge -d -u po/ simple-ccsm.desktop.in simple-ccsm.desktop".split(" ")
+proc = subprocess.Popen(cmd)
+proc.wait()
+
 profile_files = os.listdir("profiles/")
 profiles = []
 for profile in profile_files: 

Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.desktop
deleted file mode 100644
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Simple CompizConfig Settings Manager
-Comment=Configure Compiz with CompizConfig
-Icon=simple-ccsm
-Exec=simple-ccsm
-Terminal=false
-Type=Application
-Categories=Compiz;Settings;DesktopSettings;

Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.desktop.in
new file mode 100644
===================================================================
--- /dev/null
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Simple CompizConfig Settings Manager
+_Comment=Configure Compiz with CompizConfig
+Icon=simple-ccsm
+Exec=simple-ccsm
+Terminal=false
+Type=Application
+Categories=Compiz;Settings;DesktopSettings;