Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,

Linux distribution install more wrappers into /usr/bin. The attached
patch helps packagers to install libreoffice and lo* wrappers in
parallel with the old oo* wrappers. Also it updates the man pages and
other config files accordingly.

Rene, could you please review it for libreoffice-3-3 branch?

It does not affect the plain LibreOffice build. It affects just other
distributions that create packages using "make install" in
libreoffice/build.


Best Regards,
Petr
From 5aca9c28a8a4bbacb2eefe812225e5fb951f47f1 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Wed, 5 Jan 2011 19:49:43 +0100
Subject: [PATCH] use libreoffice and lo* wrappers; udpate man pages accordingly

still install oo* wrappers and man pages for compat reasons
---
 bin/generate-bash-completion       |   30 +++---
 bin/package-ooo                    |   12 ++-
 desktop/base.desktop.in.in         |    2 +-
 desktop/calc.desktop.in.in         |    2 +-
 desktop/draw.desktop.in.in         |    2 +-
 desktop/impress.desktop.in.in      |    2 +-
 desktop/math.desktop.in.in         |    2 +-
 desktop/openoffice-extra.keys.in   |  222 ++++++++++++++++++------------------
 desktop/openoffice.applications.in |    2 +-
 desktop/openoffice.keys.in         |   72 ++++++------
 desktop/startcenter.desktop.in.in  |    4 +-
 desktop/template.desktop.in.in     |    2 +-
 desktop/web.desktop.in.in          |    2 +-
 desktop/writer.desktop.in.in       |    2 +-
 man/openoffice.1.in                |   48 ++++----
 man/unopkg.1.in                    |   22 ++--
 16 files changed, 214 insertions(+), 214 deletions(-)

diff --git a/bin/generate-bash-completion b/bin/generate-bash-completion
index 41fd85c..3eb5aea 100755
--- a/bin/generate-bash-completion
+++ b/bin/generate-bash-completion
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
-# script to generate OOo bash_completion file for the main applications
+# script to generate LibreOffice bash_completion file for the main applications
 # written by Rene Engelhard <rene@debian.org>, Public Domain
-# updated for ooo-build by Petr Mladek <pmladek@suse.cz>, Public Domain
+# updated for libreoffice-build by Petr Mladek <pmladek@suse.cz>, Public Domain
 # yes, this script probably is not real good code :) but still easier
 # to maintain than adding those entries statically many times in
 # a file...
@@ -39,25 +39,25 @@ my @CALCDOCS=("sxc", "stc", "dif", "dbf", "xls", "xlw", "xlt", "rtf", "sdc", "vo
 
 my @EXTENSIONS=("oxt");
 
-# default names of oowrappers
+# default names of lowrappers
 # use "" if you want to disable any wrapper
 my %APPS = (
-       office          => "ooffice",
+       office          => "libreoffice",
        master          => "",
-       base            => "oobase",
-       calc            => "oocalc",
-       draw            => "oodraw",
-       impress         => "ooimpress",
-       math            => "oomath",
-       template        => "oofromtemplate",
+       base            => "lobase",
+       calc            => "localc",
+       draw            => "lodraw",
+       impress         => "loimpress",
+       math            => "lomath",
+       template        => "lofromtemplate",
        unopkg          => "unopkg",
-       web             => "ooweb",
-       writer          => "oowriter",
+       web             => "loweb",
+       writer          => "lowriter",
 );
 
 sub usage()
 {
-    print "Script to Generate bash completion for OOo wrappers\n\n";
+    print "Script to Generate bash completion for LO wrappers\n\n";
 
     print "Usage: $0 --help\n";
     print "       $0 [--binsuffix=suffix]\n";
@@ -174,7 +174,7 @@ sub print_suffixes_checks {
        if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
        if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
        if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
-       # ooffice should contain all...
+       # libreoffice should contain all...
        if ($app eq "office") { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, 
@MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
        # unopkg is a standalone tool
        if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
@@ -191,7 +191,7 @@ sub print_apps {
        $app_to_print = $APPS{$app};
     }
     # the last app will be printed without the final backslash
-    ($app_to_print) || die "Error: No OOo wrapper was selected\n";
+    ($app_to_print) || die "Error: No LO wrapper was selected\n";
     print BCOUTFILE "\t\t\t\t\t$app_to_print\n";
 }
 
diff --git a/bin/package-ooo b/bin/package-ooo
index 90799fe..89bff1d 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -81,16 +81,20 @@ mkdir -p $MANDIR/man1
 
 # startup wrappers
 for app in calc draw impress math web writer base; do
+    create_qstart_wrapper "$PREFIX/bin/lo${app}${BINSUFFIX}" "-${app}" || exit 1;
     create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" || exit 1;
 done
+create_qstart_wrapper "$PREFIX/bin/lofromtemplate${BINSUFFIX}" ".uno:NewDoc" || exit 1;
 create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" ".uno:NewDoc" || exit 1;
+create_qstart_wrapper "$PREFIX/bin/libreoffice${BINSUFFIX}" "" || exit 1;
 create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
 create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
 if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
     -o "z$VENDORNAME" = "zDebian" \
     -o "z$VENDORNAME" = "zMandriva"; then
-    for app in calc draw impress math web writer base fromtemplate ffice ; do
-        echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
+    for app in calc draw impress math web writer base fromtemplate ; do
+        echo ".so man1/libreoffice$BINSUFFIX.1" >| $MANDIR/man1/lo${app}$BINSUFFIX.1;
+        echo ".so man1/libreoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
     done
 fi
 
@@ -116,7 +120,7 @@ fi
 
 # create bash completion
 mkdir -p $OODESTDIR/etc/bash_completion.d
-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in 
$OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in 
$OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
 
 if test "z$VENDORNAME" != "zRedHat"; then
        mkdir -p $MANDIR/man1
@@ -128,7 +132,7 @@ if test "z$VENDORNAME" != "zRedHat"; then
            man_page_in=$TOOLSDIR/man/openoffice.1_${DISTRO%%-*}.in
        fi
        sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $man_page_in \
-               >| "$MANDIR/man1/openoffice$BINSUFFIX.1" || exit 1;
+               >| "$MANDIR/man1/libreoffice$BINSUFFIX.1" || exit 1;
        # unopkg
        sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $TOOLSDIR/man/unopkg.1.in \
                >| "$MANDIR/man1/unopkg$BINSUFFIX.1" || exit 1;
diff --git a/desktop/base.desktop.in.in b/desktop/base.desktop.in.in
index edeccf6..3423ac9 100644
--- a/desktop/base.desktop.in.in
+++ b/desktop/base.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-TryExec=oobase@OOO_BINSUFFIX@
+TryExec=lobase@OOO_BINSUFFIX@
 Exec=oobase@OOO_BINSUFFIX@ %U
 Icon=ooo-base@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/calc.desktop.in.in b/desktop/calc.desktop.in.in
index d3b84c6..25543bd 100644
--- a/desktop/calc.desktop.in.in
+++ b/desktop/calc.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-TryExec=oocalc@OOO_BINSUFFIX@
+TryExec=localc@OOO_BINSUFFIX@
 Exec=oocalc@OOO_BINSUFFIX@ %U
 Icon=ooo-calc@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/draw.desktop.in.in b/desktop/draw.desktop.in.in
index f8184c6..db5d250 100644
--- a/desktop/draw.desktop.in.in
+++ b/desktop/draw.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-TryExec=oodraw@OOO_BINSUFFIX@
+TryExec=lodraw@OOO_BINSUFFIX@
 Exec=oodraw@OOO_BINSUFFIX@ %U
 Icon=ooo-draw@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/impress.desktop.in.in b/desktop/impress.desktop.in.in
index fff8f46..18655e3 100644
--- a/desktop/impress.desktop.in.in
+++ b/desktop/impress.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-TryExec=ooimpress@OOO_BINSUFFIX@
+TryExec=loimpress@OOO_BINSUFFIX@
 Exec=ooimpress@OOO_BINSUFFIX@ %U
 Icon=ooo-impress@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/math.desktop.in.in b/desktop/math.desktop.in.in
index 436cb5f..abb0b7f 100644
--- a/desktop/math.desktop.in.in
+++ b/desktop/math.desktop.in.in
@@ -2,7 +2,7 @@
 Version=1.0
 Terminal=false
 NoDisplay=true
-TryExec=oomath@OOO_BINSUFFIX@
+TryExec=lomath@OOO_BINSUFFIX@
 Exec=oomath@OOO_BINSUFFIX@ %U
 Icon=ooo-math@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/openoffice-extra.keys.in b/desktop/openoffice-extra.keys.in
index 748aeaf..267e80e 100644
--- a/desktop/openoffice-extra.keys.in
+++ b/desktop/openoffice-extra.keys.in
@@ -57,9 +57,9 @@ application/msword
        [zh_CN]description=Microsoft Word 文档
        [zh_TW]description=Microsoft Word 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -115,7 +115,7 @@ application/msword
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 application/rtf
        description=Rich text document
@@ -166,9 +166,9 @@ application/rtf
        [zh_CN]description=RTF 文档
        [zh_TW]description=RTF 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -224,7 +224,7 @@ application/rtf
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 text/rtf
        description=Rich text document
@@ -275,9 +275,9 @@ text/rtf
        [zh_CN]description=RTF 文档
        [zh_TW]description=RTF 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -333,7 +333,7 @@ text/rtf
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 text/richtext
        description=Rich text document
@@ -383,9 +383,9 @@ text/richtext
        [wa]description=Documint e tecse eritchî
        [zh_CN]description=RTF 文档
        [zh_TW]description=RTF 文件
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -441,7 +441,7 @@ text/richtext
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 application/vnd.lotus-1-2-3
        description=Lotus 1-2-3 spreadsheet
@@ -502,9 +502,9 @@ application/vnd.lotus-1-2-3
        [zh_TW]description=Lotus 1-2-3 試算表
        icon_filename=i-spreadsheet
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -561,7 +561,7 @@ application/vnd.lotus-1-2-3
        [zh_CN]category=文档/电子表格
        [zh_TW]category=文件/試算表
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 application/vnd.ms-excel
        description=Microsoft Excel spreadsheet
@@ -622,9 +622,9 @@ application/vnd.ms-excel
        [zh_TW]description=微軟 Excel 試算表
        icon_filename=i-spreadsheet
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
-       
short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
+       
short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,applix
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -681,7 +681,7 @@ application/vnd.ms-excel
        [zh_CN]category=文档/电子表格
        [zh_TW]category=文件/試算表
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 application/vnd.ms-powerpoint
        description=Microsoft PowerPoint document
@@ -742,9 +742,9 @@ application/vnd.ms-powerpoint
        [zh_CN]description=Microsoft PowerPoint 文档
        [zh_TW]description=微軟 PowerPoint 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Presentation
        [am]category=ሰነዶች/Presentation
        [ar]category=مستندات/تقديم
@@ -800,7 +800,7 @@ application/vnd.ms-powerpoint
        [zh_CN]category=文档/演示文稿
        [zh_TW]category=文件/簡報檔
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 application/vnd.stardivision.calc
        description=StarCalc spreadsheet
@@ -859,9 +859,9 @@ application/vnd.stardivision.calc
        [zh_CN]description=StarCalc 电子表格
        [zh_TW]description=StarCalc 試算表
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -973,9 +973,9 @@ application/vnd.stardivision.chart
        [zh_CN]description=StarChart 图表
        [zh_TW]description=StarChart 圖表
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -1088,9 +1088,9 @@ application/vnd.stardivision.draw
        [zh_CN]description=StarDraw 绘图
        [zh_TW]description=StarDraw 繪圖
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -1205,9 +1205,9 @@ application/vnd.stardivision.impress
        [zh_CN]description=StarImpress 演示文稿
        [zh_TW]description=StarImpress 簡報檔
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Presentation
        [am]category=ሰነዶች/Presentation
        [ar]category=مستندات/تقديم
@@ -1321,9 +1321,9 @@ application/vnd.stardivision.mail
        [zh_CN]description=StarMail 文件
        [zh_TW]description=StarMail 檔案
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -1439,9 +1439,9 @@ application/vnd.stardivision.math
        [zh_CN]description=StarMath 文档
        [zh_TW]description=StarMath 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Numeric
        [am]category=ሰነዶች/Numeric
        [ar]category=مستندات/عددي
@@ -1555,9 +1555,9 @@ application/vnd.stardivision.writer
        [zh_CN]description=StarWriter 文档
        [zh_TW]description=StarWriter 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -1670,9 +1670,9 @@ application/vnd.sun.xml.calc
        [zh_CN]description=OpenOffice.org 电子表格
        [zh_TW]description=OpenOffice.org 試算表
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -1785,9 +1785,9 @@ application/vnd.sun.xml.calc.template
        [zh_CN]description=OpenOffice.org 电子表格模板
        [zh_TW]description=OpenOffice.org 試算表範本
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -1900,9 +1900,9 @@ application/vnd.sun.xml.draw
        [zh_CN]description=OpenOffice.org drawing
        [zh_TW]description=OpenOffice.org 繪圖
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -2015,9 +2015,9 @@ application/vnd.sun.xml.draw.template
        [zh_CN]description=OpenOffice.org drawing 模板
        [zh_TW]description=OpenOffice.org 繪圖範本
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -2132,9 +2132,9 @@ application/vnd.sun.xml.impress
        [zh_CN]description=OpenOffice.org Impress 演示稿
        [zh_TW]description=OpenOffice.org Impress 簡報檔
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Presentation
        [am]category=ሰነዶች/Presentation
        [ar]category=مستندات/تقديم
@@ -2246,9 +2246,9 @@ application/vnd.sun.xml.impress.template
        [zh_CN]description=OpenOffice.org Impress 演示稿模板
        [zh_TW]description=OpenOffice.org Impress 簡報範本
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Presentation
        [am]category=ሰነዶች/Presentation
        [ar]category=مستندات/تقديم
@@ -2361,9 +2361,9 @@ application/vnd.sun.xml.math
        [zh_CN]description=OpenOffice.org Math 文档
        [zh_TW]description=OpenOffice.org 算式文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents
        [am]category=ሰነዶች
        [ar]category=مستندات
@@ -2478,9 +2478,9 @@ application/vnd.sun.xml.writer
        [zh_CN]description=OpenOffice.org Writer 文档
        [zh_TW]description=OpenOffice.org Writer 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -2591,9 +2591,9 @@ application/vnd.sun.xml.writer.global
        [zh_CN]description=OpenOffice.org Writer 全局文档
        [zh_TW]description=OpenOffice.org Writer 主控文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -2705,9 +2705,9 @@ application/vnd.sun.xml.writer.template
        [zh_CN]description=OpenOffice.org Writer 模板
        [zh_TW]description=OpenOffice.org Writer 文件範本
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -2876,9 +2876,9 @@ application/wordperfect
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
 
 application/x-abiword
        description=AbiWord document
@@ -2939,9 +2939,9 @@ application/x-abiword
        [zh_CN]description=AbiWord 文档
        [zh_TW]description=AbiWord 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -3110,9 +3110,9 @@ application/x-wordperfect
        [zh_CN]category=文档/字处理器
        [zh_TW]category=文件/文書處理器
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
 
 image/x-emf
        description=StarOffice extended metafile image
@@ -3221,9 +3221,9 @@ image/x-emf
        [wa]category=Imådjes
        [zh_CN]category=图像
        [zh_TW]category=圖像
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
 
 image/x-pcx
        description=PC Paintbrush image
@@ -3336,9 +3336,9 @@ image/x-pcx
        [wa]category=Imådjes
        [zh_CN]category=图像
        [zh_TW]category=圖像
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice,gimp
 
 image/x-photo-cd
        description=Photo CD image
@@ -3451,9 +3451,9 @@ image/x-photo-cd
        [wa]category=Imådjes
        [zh_CN]category=图像
        [zh_TW]category=圖像
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
 
 image/x-pict
        description=PICT image
@@ -3567,9 +3567,9 @@ image/x-pict
        [wa]category=Imådjes
        [zh_CN]category=图像
        [zh_TW]category=圖像
-       
short_list_application_ids_for_novice_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
 
 text/abiword
        description=AbiWord document
@@ -3630,9 +3630,9 @@ text/abiword
        [zh_CN]description=AbiWord 文档
        [zh_TW]description=AbiWord 文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
-       
short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
+       
short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@,staroffice
        category=Documents/Word Processor
        [am]category=ሰነዶች/Word Processor
        [ar]category=مستندات/معالج كلمات
@@ -3738,9 +3738,9 @@ text/tab-separated-values
        [zh_CN]description=用跳格分隔的文本文档
        [zh_TW]description=Tab 字元分隔文件
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -3797,7 +3797,7 @@ text/tab-separated-values
        [zh_CN]category=文档/电子表格
        [zh_TW]category=文件/試算表
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
 
 text/x-comma-separated-values
        description=Comma-separated text document
@@ -3849,9 +3849,9 @@ text/x-comma-separated-values
        [zh_TW]description=逗號字元分隔文件
        icon_filename=i-spreadsheet
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=gnumeric,kspread,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_intermediate_user_level=gnumeric,kspread,openoffice,openoffice@OOO_BINSUFFIX@
-       
short_list_application_ids_for_advanced_user_level=gnumeric,kspread,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_novice_user_level=gnumeric,kspread,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_intermediate_user_level=gnumeric,kspread,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
+       
short_list_application_ids_for_advanced_user_level=gnumeric,kspread,libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
        category=Documents/Spreadsheet
        [am]category=ሰነዶች/Spreadsheet
        [ar]category=مستندات/برنامج جدولة
@@ -3908,4 +3908,4 @@ text/x-comma-separated-values
        [zh_CN]category=文档/电子表格
        [zh_TW]category=文件/試算表
        use_category_default=yes
-       default_application_id=openoffice,openoffice@OOO_BINSUFFIX@
+       
default_application_id=libreoffice,libreoffice@OOO_BINSUFFIX@,openoffice,openoffice@OOO_BINSUFFIX@
diff --git a/desktop/openoffice.applications.in b/desktop/openoffice.applications.in
index 356b855..39cb3d7 100644
--- a/desktop/openoffice.applications.in
+++ b/desktop/openoffice.applications.in
@@ -1,5 +1,5 @@
 openoffice@OOO_BINSUFFIX@
-       command=ooffice@OOO_BINSUFFIX@
+       command=loffice@OOO_BINSUFFIX@
        name=LibreOffice
        can_open_multiple_files=true
        expects_uris=true
diff --git a/desktop/openoffice.keys.in b/desktop/openoffice.keys.in
index 0ae68b3..ce37710 100644
--- a/desktop/openoffice.keys.in
+++ b/desktop/openoffice.keys.in
@@ -1,9 +1,9 @@
 application/vnd.oasis.opendocument.database
        description=OpenDocument Database
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents
        use_category_default=no
        icon_filename=oasis-database
@@ -11,9 +11,9 @@ application/vnd.oasis.opendocument.database
 application/vnd.oasis.opendocument.graphics
        description=OpenDocument Drawing
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents
        use_category_default=no
        icon_filename=oasis-drawing
@@ -21,9 +21,9 @@ application/vnd.oasis.opendocument.graphics
 application/vnd.oasis.opendocument.graphics-template
        description=OpenDocument Drawing Template
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents
        use_category_default=no
        icon_filename=oasis-drawing-template
@@ -31,9 +31,9 @@ application/vnd.oasis.opendocument.graphics-template
 application/vnd.oasis.opendocument.formula
        description=OpenDocument Formula
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents
        use_category_default=no
        icon_filename=oasis-formula
@@ -41,9 +41,9 @@ application/vnd.oasis.opendocument.formula
 application/vnd.oasis.opendocument.text-master
        description=OpenDocument Master Document
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Word Processor
        use_category_default=yes
        icon_filename=oasis-master-document
@@ -51,9 +51,9 @@ application/vnd.oasis.opendocument.text-master
 application/vnd.oasis.opendocument.presentation
        description=OpenDocument Presentation
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Presentation
        use_category_default=yes
        icon_filename=oasis-presentation
@@ -61,9 +61,9 @@ application/vnd.oasis.opendocument.presentation
 application/vnd.oasis.opendocument.presentation-template
        description=OpenDocument Presentation Template
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Presentation
        use_category_default=yes
        icon_filename=oasis-presentation-template
@@ -71,9 +71,9 @@ application/vnd.oasis.opendocument.presentation-template
 application/vnd.oasis.opendocument.spreadsheet
        description=OpenDocument Spreadsheet
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Spreadsheet
        use_category_default=yes
        icon_filename=oasis-spreadsheet
@@ -81,9 +81,9 @@ application/vnd.oasis.opendocument.spreadsheet
 application/vnd.oasis.opendocument.spreadsheet-template
        description=OpenDocument Spreadsheet Template
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Spreadsheet
        use_category_default=yes
        icon_filename=oasis-spreadsheet-template
@@ -91,9 +91,9 @@ application/vnd.oasis.opendocument.spreadsheet-template
 application/vnd.oasis.opendocument.text
        description=OpenDocument Text
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Word Processor
        use_category_default=yes
        icon_filename=oasis-text
@@ -101,9 +101,9 @@ application/vnd.oasis.opendocument.text
 application/vnd.oasis.opendocument.text-template
        description=OpenDocument Text Template
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Word Processor
        use_category_default=yes
        icon_filename=oasis-text-template
@@ -111,9 +111,9 @@ application/vnd.oasis.opendocument.text-template
 application/vnd.oasis.opendocument.text-web
        description=HTML Document Template
        default_action_type=application
-       
short_list_application_ids_for_novice_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_intermediate_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
-       
short_list_application_ids_for_advanced_user_level=openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_novice_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_intermediate_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
+       
short_list_application_ids_for_advanced_user_level=libreoffice@OOO_BINSUFFIX@,openoffice@OOO_BINSUFFIX@,staroffice,starsuite
        category=Documents/Word Processor
        use_category_default=yes
        icon_filename=oasis-web-template
diff --git a/desktop/startcenter.desktop.in.in b/desktop/startcenter.desktop.in.in
index a20b195..3d3d186 100644
--- a/desktop/startcenter.desktop.in.in
+++ b/desktop/startcenter.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-TryExec=ooffice@OOO_BINSUFFIX@
-Exec=ooffice@OOO_BINSUFFIX@ %U
+TryExec=libreoffice@OOO_BINSUFFIX@
+Exec=libreoffice@OOO_BINSUFFIX@ %U
 Icon=ooo-gulls@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;X-SuSE-Core-Office;
diff --git a/desktop/template.desktop.in.in b/desktop/template.desktop.in.in
index 66d3ac7..dbdd307 100644
--- a/desktop/template.desktop.in.in
+++ b/desktop/template.desktop.in.in
@@ -2,7 +2,7 @@
 Version=1.0
 Terminal=false
 NoDisplay=true
-TryExec=oofromtemplate@OOO_BINSUFFIX@
+TryExec=lofromtemplate@OOO_BINSUFFIX@
 Exec=oofromtemplate@OOO_BINSUFFIX@
 Icon=ooo-gulls@OOO_BINSUFFIX@
 Type=Application
diff --git a/desktop/web.desktop.in.in b/desktop/web.desktop.in.in
index e9fcc10..a1c8f94 100644
--- a/desktop/web.desktop.in.in
+++ b/desktop/web.desktop.in.in
@@ -2,7 +2,7 @@
 Version=1.0
 Terminal=false
 TryExec=ooweb@OOO_BINSUFFIX@
-Exec=ooweb@OOO_BINSUFFIX@ %U
+Exec=loweb@OOO_BINSUFFIX@ %U
 Icon=ooo-web@OOO_BINSUFFIX@
 Type=Application
 Categories=Network;WebDevelopment;
diff --git a/desktop/writer.desktop.in.in b/desktop/writer.desktop.in.in
index cc5330a..1265207 100644
--- a/desktop/writer.desktop.in.in
+++ b/desktop/writer.desktop.in.in
@@ -2,7 +2,7 @@
 Version=1.0
 Terminal=false
 TryExec=oowriter@OOO_BINSUFFIX@
-Exec=oowriter@OOO_BINSUFFIX@ %U
+Exec=lowriter@OOO_BINSUFFIX@ %U
 Icon=ooo-writer@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;WordProcessor;
diff --git a/man/openoffice.1.in b/man/openoffice.1.in
index d0af4d0..02344a1 100644
--- a/man/openoffice.1.in
+++ b/man/openoffice.1.in
@@ -1,8 +1,8 @@
-.TH ooffice "1" "2008-11-19" "OpenOffice.org" "User Commands"
+.TH libreoffice "1" "2008-11-19" "LibreOffice" "User Commands"
 .SH "Name"
-ooffice@BINSUFFIX@ \- OpenOffice.org office suite
+libreoffice@BINSUFFIX@ \- LibreOffice office suite
 .SH SYNOPSIS
-.B ooffice@BINSUFFIX@
+.B libreoffice@BINSUFFIX@
 [\fB\-accept\=\fIaccept\-string\fR] [\fB\-base\fR] [\fB\-calc\fR]
 [\fB\-display \fIdisplay\fR] [\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR]
 [\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR]
@@ -14,31 +14,31 @@ ooffice@BINSUFFIX@ \- OpenOffice.org office suite
 [\fB\-terminate_after_init\fR] [\fB\-view \fIfilename\fR] [\fB\-web\fR]
 [\fB\-writer\fR]  [\fIfilename\fR...]
 .br
-.B oobase@BINSUFFIX@
+.B lobase@BINSUFFIX@
 .br
-.B oocalc@BINSUFFIX@
+.B localc@BINSUFFIX@
 .br
-.B oodraw@BINSUFFIX@
+.B lodraw@BINSUFFIX@
 .br
-.B oofromtemplate@BINSUFFIX@
+.B lofromtemplate@BINSUFFIX@
 .br
-.B ooimpress@BINSUFFIX@
+.B loimpress@BINSUFFIX@
 .br
-.B oomath@BINSUFFIX@
+.B lomath@BINSUFFIX@
 .br
-.B ooweb@BINSUFFIX@
+.B loweb@BINSUFFIX@
 .br
-.B oowriter@BINSUFFIX@
+.B lowriter@BINSUFFIX@
 .br
 
 .SH DESCRIPTION
-OpenOffice.org is a fully featured office suite for the daily use with all
+LibreOffice is a fully featured office suite for the daily use with all
 features you would normally expect in a office suite.
 
-This script runs OpenOffice with the arguments <args> given on the command line.
+This script runs LibreOffice with the arguments <args> given on the command line.
 
 There are also some wrapper scripts in /usr/bin which run the wanted
-OpenOffice.org module.
+LibreOffice module.
 
 .SH OPTIONS
 \fIfilename\fR...
@@ -46,7 +46,7 @@ Files to operate on. Opening them is the default behavior, which can be
 influenced by command line arguments. \fB\-p\fR will print the files instead.
 .TP
 \fB\-accept=\fIaccept\-string\fR
-Notifies the OpenOffice.org software that upon the creation of "UNO Acceptor
+Notifies the LibreOffice software that upon the creation of "UNO Acceptor
 Threads", a "UNO Accept String" will be used.
 .TP
 \fB\-base\fR
@@ -72,7 +72,7 @@ This special mode can be used when the application is controlled by external
 clients via the API.
 .TP
 \fB\-help\fR|\fB\-h\fR|\fB\-?\fR
-Lists the available OOo\-native command line parameters to the console.
+Lists the available command line parameters to the console.
 .TP
 \fB\-impress\fR
 Starts with an empty Impress document.
@@ -81,10 +81,10 @@ Starts with an empty Impress document.
 Starts in invisible mode.
 
 Neither the start\-up logo nor the initial program window will be visible.
-However, the OpenOffice.org software can be controlled and documents and
+However, the LibreOffice software can be controlled and documents and
 dialogs opened via the API.
 
-When the OpenOffice.org software has been started with this parameter, it can
+When the LibreOffice software has been started with this parameter, it can
 only be ended using the taskmanager (Windows) or the kill command
 (UNIX based systems).
 
@@ -114,9 +114,9 @@ Disables the check for remote instances using the installation.
 Disables the splash screen at program start.
 .TP
 \fB\-norestore\fR
-Disables restart and file recovery after a system crash. It is possible OOo
+Disables restart and file recovery after a system crash. It is possible LibreOffice
 will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR
-is the only way to start OOo.
+is the only way to start LibreOffice.
 .TP
 \fB\-o \fIfilename\fR
 Opens \fIfilename\fR for editing, even if it is a template.
@@ -156,11 +156,11 @@ Starts with an empty HTML document.
 Starts with an empty Writer document.
 
 .SH TROUBLESHOOTING PROBLEMS
-See \fBhttp://en.opensuse.org/Bugs:OOo\fR for more details about how to report
-bugs in OpenOffice.org.
+See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details about how to report
+bugs in LibreOffice.
 .SH SEE ALSO
-.BR http://go\-oo.org/
+.BR http://www.documentfoundation.org/
 .SH AUTHOR
 This manual page was created by Rene Engelhard <rene@debian.org> for
 the Debian GNU/Linux Distribution, because the original package does not have
-one. It was updated for Novell by Petr Mladek <petr.mladek@novell.com>.
+one. It was later updated by Petr Mladek <petr.mladek@novell.com>.
diff --git a/man/unopkg.1.in b/man/unopkg.1.in
index 2bc66cb..3c40ce7 100644
--- a/man/unopkg.1.in
+++ b/man/unopkg.1.in
@@ -1,6 +1,6 @@
-.TH unopkg "1" "2008-03-18" "OpenOffice.org Extension Manager" "User Command"
+.TH unopkg "1" "2008-03-18" "LibreOffice Extension Manager" "User Command"
 .SH "Name"
-unopkg@BINSUFFIX@ \- OpenOffice.org Extension Manager
+unopkg@BINSUFFIX@ \- LibreOffice Extension Manager
 .SH SYNOPSIS
 .B unopkg@BINSUFFIX@
 [\fBadd\fR] <\fIoptions\fR> \fIextension-path...\fR
@@ -21,11 +21,11 @@ unopkg@BINSUFFIX@ \- OpenOffice.org Extension Manager
 [\fB--help\fR|\fB-h\fR]
 
 .SH DESCRIPTION
-OpenOffice.org is a fully featured office suite for the daily use with all
+LibreOffice is a fully featured office suite for the daily use with all
 features you would normally expect in an office suite.
 
-There exists many OpenOffice.org extensions all over the word. For example, see
-\fBhttp://extensions.go-oo.org/\fR
+There exists many LibreOffice extensions all over the word. For example, see
+\fBhttp://extensions.services.openoffice.org/\fR
 
 This tool allows to manage the extensions from the command line.
 
@@ -72,13 +72,9 @@ operate on explicit deployment context (only for experts)
 
 
 .SH TROUBLESHOOTING PROBLEMS
-See \fBhttp://en.opensuse.org/Bugs:OOo\fR for more details about how to report
-bugs in OpenOffice.org.
+See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details about how to report
+bugs in LibreOffice.
 .SH SEE ALSO
-.BR http://go\-oo.org/
-.br
-.BR http://extensions.go\-oo.org/
+.BR http://www.documentfoundation.org/
 .SH AUTHOR
-This manual page was created by Petr Mladek <pmladek@suse.cz> for
-the go-oo version of OpenOffice.org, because the original package
-does not have one.
+This manual page was created by Petr Mladek <pmladek@suse.cz>.
-- 
1.7.3.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.