[Libreoffice-commits] .: 3 commits - reportbuilder/util sdext/source swext/mediawiki
Andras Timar
timar at kemper.freedesktop.org
Mon Oct 3 04:12:45 PDT 2011
reportbuilder/util/description.xml | 3 -
reportbuilder/util/makefile.mk | 2 -
sdext/source/pdfimport/config/component.txt | 1
sdext/source/pdfimport/config/description.xml | 4 +-
sdext/source/pdfimport/help/component.txt | 1
sdext/source/pdfimport/makefile.mk | 4 +-
swext/mediawiki/build.xml | 7 +--
swext/mediawiki/help/component.txt | 1
swext/mediawiki/help/makefile.mk | 8 ----
swext/mediawiki/help/wiki.xhp | 18 +++++-----
swext/mediawiki/help/wikiformats.xhp | 2 -
swext/mediawiki/help/wikisettings.xhp | 2 -
swext/mediawiki/src/component.txt | 1
swext/mediawiki/src/description.xml | 5 ++
swext/mediawiki/src/makefile.mk | 7 +++
swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu | 2 -
swext/mediawiki/src/uno-extension-manifest.xml | 2 -
17 files changed, 34 insertions(+), 36 deletions(-)
New commits:
commit 394ff69cc8a2f7aaac1aa7f406d297aff21bcc22
Author: Andras Timar <atimar at suse.com>
Date: Mon Oct 3 13:10:41 2011 +0200
enable l10n of PDF Import display name and description
diff --git a/sdext/source/pdfimport/config/component.txt b/sdext/source/pdfimport/config/component.txt
new file mode 100644
index 0000000..969581e
--- /dev/null
+++ b/sdext/source/pdfimport/config/component.txt
@@ -0,0 +1 @@
+The PDF Import Extension allows you to import and modify PDF documents. Best results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF file that contains an embedded ODF source file. Hybrid PDF/ODF files will be opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index c6c3b30..53f000b 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -27,7 +27,7 @@
</icon>
<extension-description>
- <src xlink:href="help/component.txt" lang="en-US" />
- </extension-description>
+ <src xlink:href="component.txt" lang="en-US" />
+ </extension-desciption>
</description>
diff --git a/sdext/source/pdfimport/help/component.txt b/sdext/source/pdfimport/help/component.txt
deleted file mode 100755
index 969581e..0000000
--- a/sdext/source/pdfimport/help/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The PDF Import Extension allows you to import and modify PDF documents. Best results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF file that contains an embedded ODF source file. Hybrid PDF/ODF files will be opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 64accda..02d2213 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -118,7 +118,7 @@ COMPONENT_DIALOGS= \
$(EXTENSIONDIR)$/xpdfimport_err.pdf
COMPONENT_HELP= \
- $(EXTENSIONDIR)$/help/component.txt
+ $(EXTENSIONDIR)$/component.txt
# native libraries
COMPONENT_LIBRARIES= \
@@ -143,7 +143,7 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(COMPONENT_HELP) : help$/$$(@:f)
+$(COMPONENT_HELP) : config$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
commit f19f37cc65c16ba9707f8e854447c5538da06d44
Author: Andras Timar <atimar at suse.com>
Date: Mon Oct 3 13:09:50 2011 +0200
enable l10n of Report Builder display name and description
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 2276b36..78ae108 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -4,7 +4,6 @@
xmlns:xlink="http://www.w3.org/1999/xlink">
<display-name>
<name lang="en-US">Report Builder</name>
- <!-- <name lang="en-US">Oracle(TM) Report Builder</name> -->
</display-name>
<version value="#VERSION#"/>
<identifier value="com.sun.reportdesigner"/>
@@ -18,7 +17,7 @@
<default xlink:href="images/extension_32.png" />
</icon>
<extension-description>
- <src xlink:href="help/component.txt" lang="en-US" />
+ <src xlink:href="component.txt" lang="en-US" />
</extension-description>
</description>
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 71ae1b3..8e838e7 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -82,7 +82,7 @@ COMPONENT_JARFILES = \
$(EXTENSIONDIR)$/sun-report-builder.jar
COMPONENT_HELP= \
- $(EXTENSIONDIR)$/help$/component.txt
+ $(EXTENSIONDIR)$/component.txt
# .jar files from solver
COMPONENT_EXTJARFILES = \
commit 0a58d73e75b6866f82b1225f4dd82f89214fc3ae
Author: Andras Timar <atimar at suse.com>
Date: Mon Oct 3 13:07:35 2011 +0200
enable l10n of Wiki Publisher display name and description
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index b121985..f941e39 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -116,9 +116,8 @@
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
-->
<fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}" includes="help/component.txt" casesensitive="yes"/>
+ <fileset dir="${out}/misc/${target}" includes="component.txt" casesensitive="yes"/>
<filterset>
- <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/>
<filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/>
<filter token="WIKIEXTENSIONFILENAME" value="${name}"/>
</filterset>
@@ -160,7 +159,7 @@
<zipfileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl" filemode="664" dirmode="775"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}" includes="component.txt" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor" filemode="664" dirmode="775"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/>
@@ -202,7 +201,7 @@
<classpath path="${build.classes.dir}"/>
<sourcepath path="${src.dir}"/>
</nbjpdastart>
- <!-- register component in temporaary user installation -->
+ <!-- register component in temporary user installation -->
<echo message="debugging UNO extension package ..."/>
<echo message="wait until preparation is finished."/>
<echo message=" deploying UNO extension package for debugging ..."/>
diff --git a/swext/mediawiki/help/component.txt b/swext/mediawiki/help/component.txt
deleted file mode 100755
index c5ac1de..0000000
--- a/swext/mediawiki/help/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 1804ec2..70ed4cd 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -71,15 +71,9 @@ HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/
.INCLUDE : tg_help.mk
.INCLUDE : extension_helplink.mk
-ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt
-
-$(OUT_MEDIAWIKI)/help/component.txt : component.txt
- @-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(COPY) component.txt $@
-
$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \
+ $(COMMAND_ECHO)cat $< | \
sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 22f9727..20a57b5 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -29,7 +29,7 @@
<helpdocument version="1.0">
<meta>
<topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</title>
+<title id="tit" xml-lang="en-US">Wiki Publisher</title>
<filename>/@WIKIEXTENSIONID@/wiki.xhp</filename>
</topic>
<history>
@@ -39,12 +39,12 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:aboutbox" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>Wiki;@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
-<bookmark_value>@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>Wiki;Wiki Publisher</bookmark_value>
+<bookmark_value>Wiki Publisher</bookmark_value>
<bookmark_value>extensions;MediaWiki</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" l10n="NEW">@WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using the @WIKIEXTENSIONPRODUCTNAME@ you can upload your current Writer text document to a MediaWiki server. After uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" l10n="NEW">Wiki Publisher</paragraph>
+<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using the Wiki Publisher you can upload your current Writer text document to a MediaWiki server. After uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:send" id="bm_id3159253" localize="false"/>
<paragraph role="paragraph" id="par_id6468703" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose <item type="menuitem">File - Send - To MediaWiki</item> to upload the current Writer document to a MediaWiki server.</ahelp></paragraph>
<paragraph role="heading" id="hd_id4554582" xml-lang="en-US" level="2" l10n="NEW">System Requirements</paragraph>
@@ -62,9 +62,9 @@
<paragraph role="paragraph" id="par_id7387615" xml-lang="en-US" l10n="NEW">A Wiki account on a supported <link href="http://www.mediawiki.org/wiki/MediaWiki">MediaWiki</link> server</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing @WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the @WIKIEXTENSIONPRODUCTNAME@, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Java</item>. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the @WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing Wiki Publisher</paragraph>
+<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Java</item>. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME.</paragraph>
+<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the Wiki Publisher</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1732230" xml-lang="en-US" l10n="NEW">In a Writer window, choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
@@ -82,7 +82,7 @@
<paragraph role="paragraph" id="par_id265511" xml-lang="en-US" l10n="NEW">Restart the software, open a text document, then choose <item type="menuitem">Tools - Options - Internet - MediaWiki</item> to enter your Wiki settings. See "To Connect To a Wiki" below.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the @WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the Wiki Publisher</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id2655110" xml-lang="en-US" l10n="NEW">In a Writer window, choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp
index fd9c98e..eb02a5f 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -40,7 +40,7 @@
<body>
<bookmark branch="hid/vnd.com.sun.star.wiki:formats" id="bm_id7021088" localize="false"/>
<paragraph role="heading" id="hd_id3743095" xml-lang="en-US" level="1" l10n="NEW">MediaWiki Formats</paragraph>
-<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list gives an overview of the text formats that the @WIKIEXTENSIONPRODUCTNAME@ can upload to the Wiki server.</paragraph>
+<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list gives an overview of the text formats that the Wiki Publisher can upload to the Wiki server.</paragraph>
<paragraph role="paragraph" id="par_id5630664" xml-lang="en-US" l10n="NEW">The OpenDocument format used by Writer and the WikiMedia format are quite different. Only a subset of all features can be transformed from one format to the other.</paragraph>
<paragraph role="heading" id="hd_id7178868" xml-lang="en-US" level="2" l10n="NEW">Headings</paragraph>
<paragraph role="paragraph" id="par_id508133" xml-lang="en-US" l10n="NEW">Apply a heading paragraph style to the headings in your Writer document. The Wiki will show the heading styles of the same outline level, formatted as defined by the Wiki engine.</paragraph>
diff --git a/swext/mediawiki/help/wikisettings.xhp b/swext/mediawiki/help/wikisettings.xhp
index 22611a2..ce15f11 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -40,7 +40,7 @@
<body>
<bookmark branch="hid/vnd.com.sun.star.wiki:settings" id="bm_id7021088" localize="false"/>
<paragraph role="heading" id="hd_id6425672" xml-lang="en-US" level="1" l10n="NEW">MediaWiki Options</paragraph>
-<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, select the @WIKIEXTENSIONPRODUCTNAME@, and click the Options button.</paragraph><comment>Listbox</comment>
+<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, select the Wiki Publisher, and click the Options button.</paragraph><comment>Listbox</comment>
<bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.WikiList" id="bm_id6402783" localize="false"/>
<paragraph role="paragraph" id="par_id300607" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click Add to add a new Wiki server.<br/>Select an entry and click Edit to edit the account settings.<br/>Select an entry and click Remove to remove the entry from the list.</ahelp></paragraph><comment>Add button</comment>
<bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.AddButton" id="bm_id6067384" localize="false"/>
diff --git a/swext/mediawiki/src/component.txt b/swext/mediawiki/src/component.txt
new file mode 100644
index 0000000..d993ce1
--- /dev/null
+++ b/swext/mediawiki/src/component.txt
@@ -0,0 +1 @@
+The Wiki Publisher enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 55d6148..11c790e 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -3,7 +3,7 @@
<version value="1.1.1"/>
<identifier value="@WIKIEXTENSIONID@"/>
<display-name>
- <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
+ <name lang="en-US">Wiki Publisher</name>
</display-name>
<dependencies>
<OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/>
@@ -11,4 +11,7 @@
<publisher>
<name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
</publisher>
+ <extension-description>
+ <src xlink:href="component.txt" lang="en-US"/>
+ </extension-description>
</description>
diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk
index 8d920ab..bd1f1bb 100644
--- a/swext/mediawiki/src/makefile.mk
+++ b/swext/mediawiki/src/makefile.mk
@@ -42,7 +42,7 @@ common_build_zip=
.INCLUDE : target.mk
-ALLTAR: $(DESCRIPTION)
+ALLTAR: $(DESCRIPTION) $(MISC)/$(TARGET)/component.txt
.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
@@ -52,3 +52,8 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml license/LICENSE_xxx $@
@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+
+$(MISC)/$(TARGET)/component.txt : component.txt
+ @-$(MKDIRHIER) $(@:d)
+ $(COMMAND_ECHO)$(COPY) $< $@
+
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index 8dbde90..6888448 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -144,7 +144,7 @@
<value xml:lang="en-US">~Save password</value>
</prop>
<prop oor:name="Dlg_MediaWiki_Extension_String">
- <value xml:lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</value>
+ <value xml:lang="en-US">Wiki Publisher</value>
</prop>
<prop oor:name="Dlg_WikiPageExists_Label1">
<value xml:lang="en-US">A wiki article with the title '$ARG1' already exists. Do you want to replace the current article with your article? </value>
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/uno-extension-manifest.xml
index f3d9a0e..1f9b839 100644
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ b/swext/mediawiki/src/uno-extension-manifest.xml
@@ -48,6 +48,4 @@
manifest:full-path="Paths.xcu"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
manifest:full-path="help"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
- manifest:full-path="help/component.txt"/>
</manifest:manifest>
More information about the Libreoffice-commits
mailing list