ooo-build r11285 - in trunk: . desktop

[mrl svn gnome org]

Author: mrl
Date: Wed Jan 16 15:51:53 2008
New Revision: 11285
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11285&view=rev

Log:
* desktop/draw.desktop.in.in,
  desktop/calc.desktop.in.in,
  desktop/base.desktop.in.in,
  desktop/template.desktop.in.in,
  desktop/writer.desktop.in.in,
  desktop/web.desktop.in.in,
  desktop/impress.desktop.in.in,
  desktop/math.desktop.in.in: fix all errors and most warning by
desktop-file-validate: remove icon extensions, make sure Categories
and MimeTypes lists finishes with a trailing ';', dropped useless tag
Enconding as utf-8 is the default, fixed boolean naming (s/0/false/),
removed unrecognized tag MultipleArgs.


Modified:
   trunk/ChangeLog
   trunk/desktop/base.desktop.in.in
   trunk/desktop/calc.desktop.in.in
   trunk/desktop/draw.desktop.in.in
   trunk/desktop/impress.desktop.in.in
   trunk/desktop/math.desktop.in.in
   trunk/desktop/template.desktop.in.in
   trunk/desktop/web.desktop.in.in
   trunk/desktop/writer.desktop.in.in

Modified: trunk/desktop/base.desktop.in.in
==============================================================================
--- trunk/desktop/base.desktop.in.in	(original)
+++ trunk/desktop/base.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=oobase OOO_BINSUFFIX@
 Exec=oobase OOO_BINSUFFIX@ %U
-Icon=ooo-base OOO_BINSUFFIX@.png
+Icon=ooo-base OOO_BINSUFFIX@
 Type=Application
-Categories=Office;Database
+Categories=Office;Database;
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
+MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 _Name=OpenOffice.org Base
 _GenericName=Database
 _Comment=Manage databases, create queries and reports to track and manage your information by using Base.

Modified: trunk/desktop/calc.desktop.in.in
==============================================================================
--- trunk/desktop/calc.desktop.in.in	(original)
+++ trunk/desktop/calc.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=oocalc OOO_BINSUFFIX@
 Exec=oocalc OOO_BINSUFFIX@ %U
-Icon=ooo-calc OOO_BINSUFFIX@.png
+Icon=ooo-calc OOO_BINSUFFIX@
 Type=Application
 InitialPreference=6
-Categories=Office;Spreadsheet
+Categories=Office;Spreadsheet;
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls ADD_OPENXML_SPREADSHEET_MIME@
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls ADD_OPENXML_SPREADSHEET_MIME@;
 _Name=OpenOffice.org Calc
 _GenericName=Spreadsheet
 _Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.

Modified: trunk/desktop/draw.desktop.in.in
==============================================================================
--- trunk/desktop/draw.desktop.in.in	(original)
+++ trunk/desktop/draw.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=oodraw OOO_BINSUFFIX@
 Exec=oodraw OOO_BINSUFFIX@ %U
-Icon=ooo-draw OOO_BINSUFFIX@.png
+Icon=ooo-draw OOO_BINSUFFIX@
 Type=Application
-Categories=Graphics;VectorGraphics
+Categories=Graphics;VectorGraphics;
 StartupNotify=false
 InitialPreference=6
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
 _Name=OpenOffice.org Draw
 _GenericName=Drawing
 _Comment=Create and edit drawings, flow charts, and logos by using Draw.

Modified: trunk/desktop/impress.desktop.in.in
==============================================================================
--- trunk/desktop/impress.desktop.in.in	(original)
+++ trunk/desktop/impress.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=ooimpress OOO_BINSUFFIX@
 Exec=ooimpress OOO_BINSUFFIX@ %U
-Icon=ooo-impress OOO_BINSUFFIX@.png
+Icon=ooo-impress OOO_BINSUFFIX@
 Type=Application
-Categories=Office;Presentation
+Categories=Office;Presentation;
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd ms-powerpoint ADD_OPENXML_PRESENTATION_MIME@
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd ms-powerpoint ADD_OPENXML_PRESENTATION_MIME@;
 InitialPreference=5
 _Name=OpenOffice.org Impress
 _GenericName=Presentation

Modified: trunk/desktop/math.desktop.in.in
==============================================================================
--- trunk/desktop/math.desktop.in.in	(original)
+++ trunk/desktop/math.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 NoDisplay=true
 TryExec=oomath OOO_BINSUFFIX@
 Exec=oomath OOO_BINSUFFIX@ %U
-Icon=ooo-math OOO_BINSUFFIX@.png
+Icon=ooo-math OOO_BINSUFFIX@
 Type=Application
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
+MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
 _Name=OpenOffice.org Math
 _GenericName=Formula
 _Comment=Create and edit scientific formulas and equations by using Math.

Modified: trunk/desktop/template.desktop.in.in
==============================================================================
--- trunk/desktop/template.desktop.in.in	(original)
+++ trunk/desktop/template.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,11 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-MultipleArgs=false
-Terminal=0
+Terminal=false
 TryExec=oofromtemplate OOO_BINSUFFIX@
 Exec=oofromtemplate OOO_BINSUFFIX@
-Icon=ooo-gulls OOO_BINSUFFIX@.png
+Icon=ooo-gulls OOO_BINSUFFIX@
 Type=Application
 Categories=X-SuSE-Core-Office;Office;
 StartupNotify=false

Modified: trunk/desktop/web.desktop.in.in
==============================================================================
--- trunk/desktop/web.desktop.in.in	(original)
+++ trunk/desktop/web.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=ooweb OOO_BINSUFFIX@
 Exec=ooweb OOO_BINSUFFIX@ %U
-Icon=ooo-web OOO_BINSUFFIX@.png
+Icon=ooo-web OOO_BINSUFFIX@
 Type=Application
-Categories=Network;WebDevelopment
+Categories=Network;WebDevelopment;
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.text-web
+MimeType=application/vnd.oasis.opendocument.text-web;
 _Name=OpenOffice.org Writer/Web
 _GenericName=Web Page Creation
 _Comment=Create and edit Web pages by using Writer.

Modified: trunk/desktop/writer.desktop.in.in
==============================================================================
--- trunk/desktop/writer.desktop.in.in	(original)
+++ trunk/desktop/writer.desktop.in.in	Wed Jan 16 15:51:53 2008
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Terminal=0
+Terminal=false
 TryExec=oowriter OOO_BINSUFFIX@
 Exec=oowriter OOO_BINSUFFIX@ %U
-Icon=ooo-writer OOO_BINSUFFIX@.png
+Icon=ooo-writer OOO_BINSUFFIX@
 Type=Application
-Categories=Office;WordProcessor
+Categories=Office;WordProcessor;
 StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd ms-works ADD_OPENXML_WORD_MIME@
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd ms-works ADD_OPENXML_WORD_MIME@;
 InitialPreference=5
 _Name=OpenOffice.org Writer
 _GenericName=Word Processor