[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/generate-bash-completion bin/package-ooo desktop/base.desktop.in.in desktop/calc.desktop.in.in desktop/draw.desktop.in.in desktop/impress.desktop.in.in desktop/math.desktop.in.in desktop/openoffice.applications.in desktop/openoffice-extra.keys.in desktop/openoffice.keys.in desktop/startcenter.desktop.in.in desktop/template.desktop.in.in desktop/web.desktop.in.in desktop/writer.desktop.in.in man/openoffice.1.in man/unopkg.1.in

Thu Jan 6 05:23:20 PST 2011

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(-)

New commits:
commit 03c601230a3f3124dfc373385a94b8e6db3ab286
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jan 5 19:49:43 2011 +0100

    use libreoffice and lo* wrappers; udpate man pages accordingly
    
    still install oo* wrappers and man pages for compat reasons

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 at debian.org>, Public Domain
-# updated for ooo-build by Petr Mladek <pmladek at suse.cz>, Public Domain
+# updated for libreoffice-build by Petr Mladek <pmladek at 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 at OOO_BINSUFFIX@
+TryExec=lobase at OOO_BINSUFFIX@
 Exec=oobase at OOO_BINSUFFIX@ %U
 Icon=ooo-base at 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 at OOO_BINSUFFIX@
+TryExec=localc at OOO_BINSUFFIX@
 Exec=oocalc at OOO_BINSUFFIX@ %U
 Icon=ooo-calc at 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 at OOO_BINSUFFIX@
+TryExec=lodraw at OOO_BINSUFFIX@
 Exec=oodraw at OOO_BINSUFFIX@ %U
 Icon=ooo-draw at 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 at OOO_BINSUFFIX@
+TryExec=loimpress at OOO_BINSUFFIX@
 Exec=ooimpress at OOO_BINSUFFIX@ %U
 Icon=ooo-impress at 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 at OOO_BINSUFFIX@
+TryExec=lomath at OOO_BINSUFFIX@
 Exec=oomath at OOO_BINSUFFIX@ %U
 Icon=ooo-math at 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 at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
-	short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@
-	short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice,gimp
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice,gimp
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice,gimp
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,gimp
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice,gimp
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
-	short_list_application_ids_for_advanced_user_level=abiword,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_novice_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_intermediate_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@,staroffice
+	short_list_application_ids_for_advanced_user_level=abiword,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
-	short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@
-	short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_novice_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_intermediate_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_advanced_user_level=gnumeric,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
-	short_list_application_ids_for_intermediate_user_level=gnumeric,kspread,openoffice,openoffice at OOO_BINSUFFIX@
-	short_list_application_ids_for_advanced_user_level=gnumeric,kspread,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_novice_user_level=gnumeric,kspread,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_intermediate_user_level=gnumeric,kspread,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at OOO_BINSUFFIX@
+	short_list_application_ids_for_advanced_user_level=gnumeric,kspread,libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
+	default_application_id=libreoffice,libreoffice at OOO_BINSUFFIX@,openoffice,openoffice at 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 at OOO_BINSUFFIX@
-	command=ooffice at OOO_BINSUFFIX@
+	command=loffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_novice_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at OOO_BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=libreoffice at OOO_BINSUFFIX@,openoffice at 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 at OOO_BINSUFFIX@
-Exec=ooffice at OOO_BINSUFFIX@ %U
+TryExec=libreoffice at OOO_BINSUFFIX@
+Exec=libreoffice at OOO_BINSUFFIX@ %U
 Icon=ooo-gulls at 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 at OOO_BINSUFFIX@
+TryExec=lofromtemplate at OOO_BINSUFFIX@
 Exec=oofromtemplate at OOO_BINSUFFIX@
 Icon=ooo-gulls at 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 at OOO_BINSUFFIX@
-Exec=ooweb at OOO_BINSUFFIX@ %U
+Exec=loweb at OOO_BINSUFFIX@ %U
 Icon=ooo-web at 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 at OOO_BINSUFFIX@
-Exec=oowriter at OOO_BINSUFFIX@ %U
+Exec=lowriter at OOO_BINSUFFIX@ %U
 Icon=ooo-writer at 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 at BINSUFFIX@ \- OpenOffice.org office suite
+libreoffice at BINSUFFIX@ \- LibreOffice office suite
 .SH SYNOPSIS
-.B ooffice at BINSUFFIX@
+.B libreoffice at 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 at 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 at BINSUFFIX@
+.B lobase at BINSUFFIX@
 .br
-.B oocalc at BINSUFFIX@
+.B localc at BINSUFFIX@
 .br
-.B oodraw at BINSUFFIX@
+.B lodraw at BINSUFFIX@
 .br
-.B oofromtemplate at BINSUFFIX@
+.B lofromtemplate at BINSUFFIX@
 .br
-.B ooimpress at BINSUFFIX@
+.B loimpress at BINSUFFIX@
 .br
-.B oomath at BINSUFFIX@
+.B lomath at BINSUFFIX@
 .br
-.B ooweb at BINSUFFIX@
+.B loweb at BINSUFFIX@
 .br
-.B oowriter at BINSUFFIX@
+.B lowriter at 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 at 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 at novell.com>.
+one. It was later updated by Petr Mladek <petr.mladek at 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 at BINSUFFIX@ \- OpenOffice.org Extension Manager
+unopkg at BINSUFFIX@ \- LibreOffice Extension Manager
 .SH SYNOPSIS
 .B unopkg at BINSUFFIX@
 [\fBadd\fR] <\fIoptions\fR> \fIextension-path...\fR
@@ -21,11 +21,11 @@ unopkg at 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 at 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 at suse.cz>.
