Author: jani
Date: Sat Sep 28 07:57:27 2013
New Revision: 1527164
URL: http://svn.apache.org/r1527164
Log:
extract from 4.0.1, corrected false makefiles and added changed en-US strings
Modified:
openoffice/branches/l10n40/main/cppu/util/makefile.mk
openoffice/branches/l10n40/main/i18npool/source/breakiterator/makefile.mk
openoffice/branches/l10n40/main/languages/source/templates/dbaccess.pot
openoffice/branches/l10n40/main/languages/source/templates/desktop.pot
openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot
openoffice/branches/l10n40/main/languages/source/templates/instsetoo_native.pot
openoffice/branches/l10n40/main/openssl/makefile.mk
openoffice/branches/l10n40/main/solenv/inc/target.mk
Modified: openoffice/branches/l10n40/main/cppu/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cppu/util/makefile.mk?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cppu/util/makefile.mk (original)
+++ openoffice/branches/l10n40/main/cppu/util/makefile.mk Sat Sep 28 07:57:27
2013
@@ -65,7 +65,7 @@ SHL1RPATH=URELIB
DEF1NAME=$(SHL1TARGET)
-
+.IF "$(MAKETARGETS)"!="genPO"
SHL2TARGET := $(NAMEpurpenv_helper)
DEF2NAME := $(SHL2TARGET)
.IF "$(GUI)$(COM)"=="WNTGCC"
@@ -94,8 +94,10 @@ ALLTAR: $(SHL2TARGETN)
$(MAKE) $(MAKECMDGOALS) -f extra.mk
+.ENDIF
.INCLUDE : target.mk
-
+.IF "$(MAKETARGETS)"!="genPO"
$(SHL2TARGETN): $(SHL1TARGETN)
+.ENDIF
Modified:
openoffice/branches/l10n40/main/i18npool/source/breakiterator/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/i18npool/source/breakiterator/makefile.mk?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/i18npool/source/breakiterator/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/i18npool/source/breakiterator/makefile.mk
Sat Sep 28 07:57:27 2013
@@ -29,6 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
+.IF "$(MAKETARGETS)"!="genPO"
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
@@ -101,6 +102,6 @@ $(MISC)$/OpenOffice_%.c : $(MY_BRK_BRKFI
echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
echo $(USQ)#endif$(USQ) >> $@
$(TYPE) $(@:s/_dat/_tmp/) >> $@
-
+.ENDIF
.INCLUDE : target.mk
Modified:
openoffice/branches/l10n40/main/languages/source/templates/dbaccess.pot
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/dbaccess.pot?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/dbaccess.pot
(original)
+++ openoffice/branches/l10n40/main/languages/source/templates/dbaccess.pot Sat
Sep 28 07:57:27 2013
@@ -408,7 +408,7 @@ msgid "The backup file entered does not
msgstr ""
#: ext/adabas/AdabasNewDb.src#INFO_STR_MAX_FILE_LENGTH.INFOBOX.MESSAGE
-msgid "The fully qualified file cannot be longer than \\'#\\' characters."
+msgid "The fully qualified file cannot be longer than \'#\' characters."
msgstr ""
#: ext/adabas/AdabasNewDb.src#STR_NO_SAME_USER.STRING.TEXT
Modified: openoffice/branches/l10n40/main/languages/source/templates/desktop.pot
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/desktop.pot?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/desktop.pot
(original)
+++ openoffice/branches/l10n40/main/languages/source/templates/desktop.pot Sat
Sep 28 07:57:27 2013
@@ -488,27 +488,27 @@ msgid "Synchronizing repository for %NA
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_WARNINGBOX_VERSION_LESS.WARNINGBOX.MESSAGE
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThe newer version $DEPLOYED is already installed.\nClick \\'OK\\'
to replace the installed extension.\nClick \\'Cancel\\' to stop the
installation."
+msgid "You are about to install version $NEW of the extension \'$NAME\'.\nThe
newer version $DEPLOYED is already installed.\nClick \'OK\' to replace the
installed extension.\nClick \'Cancel\' to stop the installation."
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES.STRING.TEXT
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThe newer version $DEPLOYED, named \\'$OLDNAME\\', is already
installed.\nClick \\'OK\\' to replace the installed extension.\nClick
\\'Cancel\\' to stop the installation."
+msgid "You are about to install version $NEW of the extension \'$NAME\'.\nThe
newer version $DEPLOYED, named \'$OLDNAME\', is already installed.\nClick
\'OK\' to replace the installed extension.\nClick \'Cancel\' to stop the
installation."
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_WARNINGBOX_VERSION_EQUAL.WARNINGBOX.MESSAGE
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThat version is already installed.\nClick \\'OK\\' to replace the
installed extension.\nClick \\'Cancel\\' to stop the installation."
+msgid "You are about to install version $NEW of the extension
\'$NAME\'.\nThat version is already installed.\nClick \'OK\' to replace the
installed extension.\nClick \'Cancel\' to stop the installation."
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES.STRING.TEXT
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThat version, named \\'$OLDNAME\\', is already installed.\nClick
\\'OK\\' to replace the installed extension.\nClick \\'Cancel\\' to stop the
installation."
+msgid "You are about to install version $NEW of the extension
\'$NAME\'.\nThat version, named \'$OLDNAME\', is already installed.\nClick
\'OK\' to replace the installed extension.\nClick \'Cancel\' to stop the
installation."
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_WARNINGBOX_VERSION_GREATER.WARNINGBOX.MESSAGE
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThe older version $DEPLOYED is already installed.\nClick \\'OK\\'
to replace the installed extension.\nClick \\'Cancel\\' to stop the
installation."
+msgid "You are about to install version $NEW of the extension \'$NAME\'.\nThe
older version $DEPLOYED is already installed.\nClick \'OK\' to replace the
installed extension.\nClick \'Cancel\' to stop the installation."
msgstr ""
#:
deployment/gui/dp_gui_versionboxes.src#RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES.STRING.TEXT
-msgid "You are about to install version $NEW of the extension
\\'$NAME\\'.\nThe older version $DEPLOYED, named \\'$OLDNAME\\', is already
installed.\nClick \\'OK\\' to replace the installed extension.\nClick
\\'Cancel\\' to stop the installation."
+msgid "You are about to install version $NEW of the extension \'$NAME\'.\nThe
older version $DEPLOYED, named \'$OLDNAME\', is already installed.\nClick
\'OK\' to replace the installed extension.\nClick \'Cancel\' to stop the
installation."
msgstr ""
#:
deployment/gui/dp_gui_dependencydialog.src#RID_DLG_DEPENDENCIES.MODALDIALOG.TEXT
@@ -612,7 +612,7 @@ msgid "1."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_DLG_LICENSE.FT_LICENSE_BODY_1_TXT.FIXEDTEXT.TEXT
-msgid "Read the complete License Agreement. Use the scroll bar or the
\\'Scroll Down\\' button in this dialog to view the entire license text."
+msgid "Read the complete License Agreement. Use the scroll bar or the
\'Scroll Down\' button in this dialog to view the entire license text."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_DLG_LICENSE.FT_LICENSE_BODY_2.FIXEDTEXT.TEXT
@@ -620,7 +620,7 @@ msgid "2."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_DLG_LICENSE.FT_LICENSE_BODY_2_TXT.FIXEDTEXT.TEXT
-msgid "Accept the License Agreement for the extension by pressing the
\\'Accept\\' button."
+msgid "Accept the License Agreement for the extension by pressing the
\'Accept\' button."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_DLG_LICENSE.PB_LICENSE_DOWN.PUSHBUTTON.TEXT
@@ -644,27 +644,27 @@ msgid "Close"
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_WARNINGBOX_INSTALL_EXTENSION.WARNINGBOX.MESSAGE
-msgid "You are about to install the extension \\'%NAME\\'.\nClick \\'OK\\' to
proceed with the installation.\nClick \\'Cancel\\' to stop the installation."
+msgid "You are about to install the extension \'%NAME\'.\nClick \'OK\' to
proceed with the installation.\nClick \'Cancel\' to stop the installation."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_WARNINGBOX_REMOVE_EXTENSION.WARNINGBOX.MESSAGE
-msgid "You are about to remove the extension \\'%NAME\\'.\nClick \\'OK\\' to
remove the extension.\nClick \\'Cancel\\' to stop removing the extension."
+msgid "You are about to remove the extension \'%NAME\'.\nClick \'OK\' to
remove the extension.\nClick \'Cancel\' to stop removing the extension."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_WARNINGBOX_REMOVE_SHARED_EXTENSION.WARNINGBOX.MESSAGE
-msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \\'OK\\' to remove the extension.\nClick \\'Cancel\\' to
stop removing the extension."
+msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \'OK\' to remove the extension.\nClick \'Cancel\' to stop
removing the extension."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_WARNINGBOX_ENABLE_SHARED_EXTENSION.WARNINGBOX.MESSAGE
-msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \\'OK\\' to enable the extension.\nClick \\'Cancel\\' to
stop enabling the extension."
+msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \'OK\' to enable the extension.\nClick \'Cancel\' to stop
enabling the extension."
msgstr ""
#:
deployment/gui/dp_gui_dialog.src#RID_WARNINGBOX_DISABLE_SHARED_EXTENSION.WARNINGBOX.MESSAGE
-msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \\'OK\\' to disable the extension.\nClick \\'Cancel\\' to
stop disabling the extension."
+msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \'OK\' to disable the extension.\nClick \'Cancel\' to stop
disabling the extension."
msgstr ""
#: deployment/gui/dp_gui_dialog.src#RID_STR_UNSUPPORTED_PLATFORM.STRING.TEXT
-msgid "The extension \\'%Name\\' does not work on this computer."
+msgid "The extension \'%Name\' does not work on this computer."
msgstr ""
#:
deployment/gui/dp_gui_updateinstalldialog.src#RID_DLG_UPDATEINSTALL.MODALDIALOG.TEXT
@@ -820,7 +820,7 @@ msgid "This update will be ignored.\n"
msgstr ""
#:
deployment/gui/dp_gui_updatedialog.src#RID_WARNINGBOX_UPDATE_SHARED_EXTENSION.WARNINGBOX.MESSAGE
-msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \\'OK\\' to update the extensions.\nClick \\'Cancel\\' to
stop updating the extensions."
+msgid "Make sure that no further users are working with the same
%PRODUCTNAME, when changing shared extensions in a multi user
environment.\nClick \'OK\' to update the extensions.\nClick \'Cancel\' to stop
updating the extensions."
msgstr ""
#:
deployment/gui/dp_gui_dialog2.src#RID_DLG_EXTENSION_MANAGER.MODELESSDIALOG.TEXT
Modified:
openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot
(original)
+++ openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot
Sat Sep 28 07:57:27 2013
@@ -65059,22 +65059,6 @@ msgstr ""
msgid "<ahelp hid=\"sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF\">Specifies whether
the graphics of your text document are printed.</ahelp>"
msgstr ""
-#: optionen/01040400.xhp#HD_ID3150771.7
-msgid "Tables"
-msgstr ""
-
-#: optionen/01040400.xhp#PAR_ID3148943.8
-msgid "<ahelp hid=\"sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB\">Specifies whether
the tables of the text document are printed.</ahelp>"
-msgstr ""
-
-#: optionen/01040400.xhp#HD_ID3149294.9
-msgid "Drawings (not for HTML documents)"
-msgstr ""
-
-#: optionen/01040400.xhp#PAR_ID3149457.10
-msgid "<ahelp hid=\"sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW\">Specifies whether
graphics created with $[officename] drawing functions are printed.</ahelp>"
-msgstr ""
-
#: optionen/01040400.xhp#HD_ID3153525.11
msgid "Form controls"
msgstr ""
Modified:
openoffice/branches/l10n40/main/languages/source/templates/instsetoo_native.pot
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/instsetoo_native.pot?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/languages/source/templates/instsetoo_native.pot
(original)
+++
openoffice/branches/l10n40/main/languages/source/templates/instsetoo_native.pot
Sat Sep 28 07:57:27 2013
@@ -1376,7 +1376,7 @@ msgid "Thank you for downloading %PRODU
msgstr ""
#: Nsis.ulf#MUI_TEXT_WELCOME_INFO_TEXT
-msgid "The installation files must be unpacked and copied to your hard disk
in preparation for the installation. After that, the %PRODUCTNAME installation
will start automatically.\\r\n\\r\nClick \\'Next\\' to continue."
+msgid "The installation files must be unpacked and copied to your hard disk
in preparation for the installation. After that, the %PRODUCTNAME installation
will start automatically.\r\n\r\nClick \'Next\' to continue."
msgstr ""
#: Nsis.ulf#MUI_TEXT_DIRECTORY_TITLE
@@ -1392,7 +1392,7 @@ msgid "&Unpack"
msgstr ""
#: Nsis.ulf#DIRTEXT
-msgid "The %PRODUCTNAME %PRODUCTVERSION installation files will be unpacked
and saved in the folder shown below. If you would like to save %PRODUCTNAME to
a different folder, click \\'Browse\\' to select another folder."
+msgid "The %PRODUCTNAME %PRODUCTVERSION installation files will be unpacked
and saved in the folder shown below. If you would like to save %PRODUCTNAME to
a different folder, click \'Browse\' to select another folder."
msgstr ""
#: Nsis.ulf#DIRSUBTEXT
Modified: openoffice/branches/l10n40/main/openssl/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/openssl/makefile.mk?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/openssl/makefile.mk (original)
+++ openoffice/branches/l10n40/main/openssl/makefile.mk Sat Sep 28 07:57:27 2013
@@ -58,7 +58,9 @@ OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
+.IF "$(MAKETARGETS)"!="genPO"
UNAME=$(shell uname)
+.ENDIF
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1527164&r1=1527163&r2=1527164&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/target.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/target.mk Sat Sep 28 07:57:27
2013
@@ -2092,7 +2092,7 @@ some_unique_variable_name:=1
.IF "$(LANGUAGE_FILELIST)" != ""
$(SRC_ROOT)/languages/source/templates/$(PRJNAME).pot: $(LANGUAGE_FILELIST)
- -$(SOLARBINDIR)/genLang extract $(PRJNAME) $(SRC_ROOT)/languages/source
"" -d -v -f $(LANGUAGE_FILELIST)
+ -$(SOLARBINDIR)/genLang extract $(PRJNAME) $(SRC_ROOT)/languages/source
"" -v -f $(LANGUAGE_FILELIST)
genPO: $(SRC_ROOT)/languages/source/templates/$(PRJNAME).pot
.ELSE
