[Libreoffice-commits] .: desktop/zipintro sysui/desktop
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 26 04:42:45 PDT 2011
desktop/zipintro/makefile.mk | 12 ------------
sysui/desktop/menus/base.desktop | 1 -
sysui/desktop/menus/calc.desktop | 1 -
sysui/desktop/menus/draw.desktop | 1 -
sysui/desktop/menus/impress.desktop | 1 -
sysui/desktop/menus/javafilter.desktop | 1 -
sysui/desktop/menus/math.desktop | 1 -
sysui/desktop/menus/printeradmin.desktop | 1 -
sysui/desktop/menus/qstart.desktop | 1 -
sysui/desktop/menus/startcenter.desktop | 1 -
sysui/desktop/menus/writer.desktop | 1 -
sysui/desktop/productversion.mk | 9 ---------
sysui/desktop/share/brand.pl | 8 --------
sysui/desktop/share/makefile.mk | 8 ++++----
sysui/desktop/share/translate.pl | 6 ------
15 files changed, 4 insertions(+), 49 deletions(-)
New commits:
commit 61309e9387bb942f9bbf2a6d411f6d9d827bd513
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 26 13:52:54 2011 +0300
Kill BrOffice, fdo#36262
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 83a91ad..c0f1406 100755
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -45,18 +45,6 @@ ZIP3LIST= \
$(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \
$(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png
-.IF "$(ENABLE_BROFFICE)"=="TRUE"
-ZIP1LIST+= \
- $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
- $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
-ZIP2LIST+= \
- $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
- $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
-ZIP3LIST+= \
- $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left-pt_BR.png \
- $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right-pt_BR.png
-.ENDIF # ENABLE_BROFFICE
-
ZIP1TARGET=brand
ZIP1DEPS=$(ZIP1LIST)
ZIP2TARGET=brand_dev
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 40f7e79..dbbff82 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplicat
Exec=${UNIXBASISROOTNAME} --base %U
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base
-Name[pt_BR]=%PRODUCTNAME_BR Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
InitialPreference=5
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 80cc09d..6528478 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Sprea
Exec=${UNIXBASISROOTNAME} --calc %U
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;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;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
Name=%PRODUCTNAME Calc
-Name[pt_BR]=%PRODUCTNAME_BR Calc
GenericName=Spreadsheet
Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
InitialPreference=5
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 57f7ade..96234c6 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawi
Exec=${UNIXBASISROOTNAME} --draw %U
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
Name=%PRODUCTNAME Draw
-Name[pt_BR]=%PRODUCTNAME_BR Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 025524e..92060e3 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Prese
Exec=${UNIXBASISROOTNAME} --impress %U
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;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;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
-Name[pt_BR]=%PRODUCTNAME_BR Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
InitialPreference=5
diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop
index 8b9c30a..61e4ea7 100755
--- a/sysui/desktop/menus/javafilter.desktop
+++ b/sysui/desktop/menus/javafilter.desktop
@@ -5,6 +5,5 @@ Type=Application
Exec=${UNIXBASISROOTNAME} --writer %U
MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
Name=%PRODUCTNAME Small Device Format Importer
-Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer
GenericName=Small Device Format Importer
NoDisplay=true
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 55fcc29..7b2e980 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other
Exec=${UNIXBASISROOTNAME} --math %U
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
Name=%PRODUCTNAME Math
-Name[pt_BR]=%PRODUCTNAME_BR Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop
index 3da4d82..2d47476 100755
--- a/sysui/desktop/menus/printeradmin.desktop
+++ b/sysui/desktop/menus/printeradmin.desktop
@@ -6,5 +6,4 @@ Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
Exec=${UNIXBASISROOTNAME}-printeradmin
Name=%PRODUCTNAME Printer Administration
-Name[pt_BR]=%PRODUCTNAME_BR Printer Administration
diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
index 52ac185..fc39c22 100755
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
@@ -6,5 +6,4 @@ Categories=Office;
Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault
NoDisplay=true
Name=%PRODUCTNAME Quickstarter
-Name[pt_BR]=%PRODUCTNAME_BR Quickstarter
Comment=Hook for quickstarter startup
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 390dd93..0c6d0a1 100755
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -7,6 +7,5 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other
Exec=${UNIXBASISROOTNAME} %U
MimeType=application/vnd.openofficeorg.extension;
Name=%PRODUCTNAME
-Name[pt_BR]=%PRODUCTNAME_BR
GenericName=Office
Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 8ba463b..e9c05a5 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordp
Exec=${UNIXBASISROOTNAME} --writer %U
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;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;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
-Name[pt_BR]=%PRODUCTNAME_BR Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
InitialPreference=5
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 6f41333..3187131 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -64,12 +64,3 @@ PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT)
PKGVERSION.libreoffice = $(PKGVERSION)
UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)
ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
-
-PRODUCTNAME.broffice = BrOffice
-PRODUCTVERSION.broffice = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT)
-PKGVERSION.broffice = $(PKGVERSION)
-UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l)
-ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g)
-
-
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 38c0632..cebb714 100755
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -39,7 +39,6 @@ $destdir = pop @ARGV;
mkdir $destdir,0777;
$productname = "LibreOffice";
-$productname_br = "BrOffice";
$productfilename = "libreoffice";
$prefix = "";
$iconprefix = "";
@@ -51,10 +50,6 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
- if (/^-b/) {
- $productname_br = $ARGV[0];
- shift;
- }
if (/^-u/) {
$productfilename = $ARGV[0];
shift;
@@ -121,9 +116,6 @@ while (<>) {
}
}
- # replace %PRODUCTNAME_BR placeholders
- s/%PRODUCTNAME_BR/$productname_br/g;
-
# replace %PRODUCTNAME placeholders
s/%PRODUCTNAME/$productname/g;
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 45a1b11..72ba78b 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
.ENDIF
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index cb209e4..8c6cca0 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -37,7 +37,6 @@ eval 'exec perl -wS $0 ${1+"$@"}'
my ($prefix, $ext, $key);
$productname = "LibreOffice";
-$productname_br = "BrOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
@@ -47,10 +46,6 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
- if (/^-b/) {
- $productname_br = $ARGV[0];
- shift;
- }
if (/^-d/) {
$workdir = $ARGV[0];
shift;
@@ -127,7 +122,6 @@ KEY: while (<TEMPLATE>) {
$value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
# replace resource placeholder
- $value=~s/%PRODUCTNAME_BR/$productname_br/g;
$value=~s/%PRODUCTNAME/$productname/g;
$locale=~s/-/_/;
More information about the Libreoffice-commits
mailing list