diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-04-21 21:07:38 +0100 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-04-21 21:07:38 +0100 |
commit | 193cfea7bfc946d29d119fb9c92b1af7273c249c (patch) | |
tree | 2ff6c7022ae9d9f3e831955fc763a7fda6754d6f /sysui/desktop | |
parent | a80b4eddccb53112b8758f0c70bf1df51e7e457a (diff) | |
parent | 515792c312abc929b4616c757b8eaced67718d10 (diff) |
cmcfixes74: merge with DEV300 m75
Diffstat (limited to 'sysui/desktop')
-rwxr-xr-x[-rw-r--r--] | sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png | bin | 963 -> 4259 bytes | |||
-rwxr-xr-x[-rw-r--r--] | sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png | bin | 2534 -> 5595 bytes | |||
-rwxr-xr-x[-rw-r--r--] | sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png | bin | 4058 -> 7337 bytes | |||
-rw-r--r-- | sysui/desktop/icons/makefile.mk | 2 | ||||
-rwxr-xr-x | sysui/desktop/icons/ooo3_open.ico | bin | 0 -> 295606 bytes | |||
-rwxr-xr-x | sysui/desktop/icons/so9_open.ico | bin | 0 -> 295606 bytes | |||
-rw-r--r-- | sysui/desktop/share/launcher_comment.ulf | 2 | ||||
-rw-r--r-- | sysui/desktop/slackware/makefile.mk | 6 |
8 files changed, 4 insertions, 6 deletions
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png Binary files differindex 4e8eb0e49dd8..399076c9934d 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png Binary files differindex 2c7a0c03f8fd..b09999c7d083 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png Binary files differindex 41971c9652a2..a11cbe5ab107 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk index 1af3f4367fee..ac32cdbe453b 100644 --- a/sysui/desktop/icons/makefile.mk +++ b/sysui/desktop/icons/makefile.mk @@ -114,6 +114,7 @@ all: \ $(MISC)$/ooo3_math_doc.ico \ $(MISC)$/ooo3_writer_tem.ico \ $(MISC)$/ooo3_empty_tem.ico \ + $(MISC)$/ooo3_open.ico \ $(MISC)$/ooo11-base-doc.ico \ $(MISC)$/ooo11-calc-doc.ico \ $(MISC)$/ooo11-calc-tem.ico \ @@ -176,6 +177,7 @@ all: \ $(MISC)$/so9_chart_doc.ico \ $(MISC)$/so9_writer_app.ico \ $(MISC)$/so9_draw_app.ico \ + $(MISC)$/so9_open.ico \ $(MISC)$/so7-base-doc.ico \ $(MISC)$/so7-calc-doc.ico \ $(MISC)$/so7-calc-tem.ico \ diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico Binary files differnew file mode 100755 index 000000000000..98fcea3748a9 --- /dev/null +++ b/sysui/desktop/icons/ooo3_open.ico diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico Binary files differnew file mode 100755 index 000000000000..90f193d80dd9 --- /dev/null +++ b/sysui/desktop/icons/so9_open.ico diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf index e3abc7c7ead2..6aeab6d94c36 100644 --- a/sysui/desktop/share/launcher_comment.ulf +++ b/sysui/desktop/share/launcher_comment.ulf @@ -17,5 +17,5 @@ en-US = "Create and edit scientific formulas and equations by using Math." en-US = "Manage databases, create queries and reports to track and manage your information by using Base." [startcenter] -en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems." +en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle." diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index 7327aa469fa6..6fde1caf6528 100644 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -42,10 +42,6 @@ TARGET=slackware MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.3-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz -.IF "$(USE_SHELL)"=="bash" -ECHOPARAM=-e -.ENDIF - # --- Targets ------------------------------------------------------- .INCLUDE : target.mk @@ -74,7 +70,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//)) )" >> $@ @echo "( cd usr/bin ; rm -rf soffice )" >> $@ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/program/soffice soffice )" >> $@ - @echo $(ECHOPARAM) $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )") >> $@ + @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )") >> $@ @cat $< >> $@ %$/install$/slack-desc : slack-desc |