Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 131ED100A6 for ; Fri, 23 Aug 2013 13:53:37 +0000 (UTC) Received: (qmail 9054 invoked by uid 500); 23 Aug 2013 13:53:36 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 8982 invoked by uid 500); 23 Aug 2013 13:53:35 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 8964 invoked by uid 99); 23 Aug 2013 13:53:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Aug 2013 13:53:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Aug 2013 13:53:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 681D223889D5; Fri, 23 Aug 2013 13:53:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516849 [1/3] - in /openoffice/branches/l10n40/main: accessibility/source/ avmedia/source/ basctl/source/ basic/source/ chart2/source/ crashrep/source/ cui/source/ dbaccess/source/ editeng/source/ extensions/source/ filter/source/ forms/so... Date: Fri, 23 Aug 2013 13:53:05 -0000 To: commits@openoffice.apache.org From: jani@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130823135308.681D223889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jani Date: Fri Aug 23 13:53:04 2013 New Revision: 1516849 URL: http://svn.apache.org/r1516849 Log: update LANGUAGE_FILELIST no "" update officecfg makefile.mk with missing files updare target.mk with correct genLang call Basline = build --all --genPO runs without errors. next step, check extractsd number of msgid == running system Modified: openoffice/branches/l10n40/main/accessibility/source/makefile.mk openoffice/branches/l10n40/main/avmedia/source/makefile.mk openoffice/branches/l10n40/main/basctl/source/makefile.mk openoffice/branches/l10n40/main/basic/source/makefile.mk openoffice/branches/l10n40/main/chart2/source/makefile.mk openoffice/branches/l10n40/main/crashrep/source/makefile.mk openoffice/branches/l10n40/main/cui/source/makefile.mk openoffice/branches/l10n40/main/dbaccess/source/makefile.mk openoffice/branches/l10n40/main/editeng/source/makefile.mk openoffice/branches/l10n40/main/extensions/source/makefile.mk openoffice/branches/l10n40/main/filter/source/makefile.mk openoffice/branches/l10n40/main/forms/source/makefile.mk openoffice/branches/l10n40/main/formula/source/makefile.mk openoffice/branches/l10n40/main/fpicker/source/makefile.mk openoffice/branches/l10n40/main/framework/source/makefile.mk openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk openoffice/branches/l10n40/main/javainstaller2/source/makefile.mk openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx openoffice/branches/l10n40/main/languages/source/makefile.mk openoffice/branches/l10n40/main/languages/source/templates/officecfg.pot openoffice/branches/l10n40/main/mysqlc/source/makefile.mk openoffice/branches/l10n40/main/officecfg/source/makefile.mk openoffice/branches/l10n40/main/padmin/source/makefile.mk openoffice/branches/l10n40/main/reportbuilder/source/makefile.mk openoffice/branches/l10n40/main/reportdesign/source/makefile.mk openoffice/branches/l10n40/main/sc/source/makefile.mk openoffice/branches/l10n40/main/scaddins/source/makefile.mk openoffice/branches/l10n40/main/sccomp/source/makefile.mk openoffice/branches/l10n40/main/scp2/source/makefile.mk openoffice/branches/l10n40/main/sd/source/makefile.mk openoffice/branches/l10n40/main/sdext/source/makefile.mk openoffice/branches/l10n40/main/setup_native/source/makefile.mk openoffice/branches/l10n40/main/sfx2/source/makefile.mk openoffice/branches/l10n40/main/shell/source/makefile.mk openoffice/branches/l10n40/main/solenv/inc/target.mk openoffice/branches/l10n40/main/starmath/source/makefile.mk openoffice/branches/l10n40/main/svl/source/makefile.mk openoffice/branches/l10n40/main/svtools/source/makefile.mk openoffice/branches/l10n40/main/svx/source/makefile.mk openoffice/branches/l10n40/main/sw/source/makefile.mk openoffice/branches/l10n40/main/swext/source/makefile.mk openoffice/branches/l10n40/main/sysui/source/makefile.mk openoffice/branches/l10n40/main/ucbhelper/source/makefile.mk openoffice/branches/l10n40/main/uui/source/makefile.mk openoffice/branches/l10n40/main/vcl/source/makefile.mk openoffice/branches/l10n40/main/wizards/source/makefile.mk openoffice/branches/l10n40/main/xmlsecurity/source/makefile.mk Modified: openoffice/branches/l10n40/main/accessibility/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/accessibility/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/accessibility/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/accessibility/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=accessibility TARGET=helper -LANGUAGE_FILELIST="helper/accessiblestrings.src" +LANGUAGE_FILELIST=helper/accessiblestrings.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/avmedia/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/avmedia/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/avmedia/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/avmedia/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=avmedia TARGET=none -LANGUAGE_FILELIST="framework/mediacontrol.src viewer/mediawindow.src" +LANGUAGE_FILELIST=framework/mediacontrol.src viewer/mediawindow.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/basctl/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basctl/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/basctl/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/basctl/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=basctl TARGET=none -LANGUAGE_FILELIST="\ -gbasicide/basicprint.src \ +LANGUAGE_FILELIST=gbasicide/basicprint.src \ gbasicide/basidesh.src \ gbasicide/brkdlg.src \ gbasicide/macrodlg.src \ @@ -32,7 +31,7 @@ gbasicide/moduldlg.src \ gbasicide/moptions.src \ gbasicide/objdlg.src \ gdlged/dlgresid.src \ -gdlged/managelang.src" +gdlged/managelang.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/basic/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basic/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/basic/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/basic/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=basic TARGET=none -LANGUAGE_FILELIST="classes/sb.src sbx/format.src" +LANGUAGE_FILELIST=classes/sb.src sbx/format.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/chart2/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/chart2/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/chart2/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/chart2/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=chart2 TARGET=none -LANGUAGE_FILELIST="\ -gcontroller/dialogs/dlg_DataEditor.src \ +LANGUAGE_FILELIST=gcontroller/dialogs/dlg_DataEditor.src \ gcontroller/dialogs/dlg_DataSource.src \ gcontroller/dialogs/dlg_InsertAxis_Grid.src \ gcontroller/dialogs/dlg_ShapeFont.src \ @@ -57,8 +56,8 @@ gcontroller/dialogs/tp_RangeChooser.src gcontroller/dialogs/tp_Scale.src \ gcontroller/dialogs/tp_SeriesToAxis.src \ gcontroller/dialogs/tp_TitleRotation.src \ -gcontroller/dialogs/tp_Wizard_TitlesAndObjects.src\ -" +gcontroller/dialogs/tp_Wizard_TitlesAndObjects.src + .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/crashrep/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/crashrep/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/crashrep/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/crashrep/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=crashrep TARGET=none -LANGUAGE_FILELIST="\all/crashrep.ulf" +LANGUAGE_FILELIST=all/crashrep.ulf .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/cui/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/cui/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/cui/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=cui TARGET=none -LANGUAGE_FILELIST="\ -customize/acccfg.src \ +LANGUAGE_FILELIST=customize/acccfg.src \ customize/cfg.src \ customize/eventdlg.src \ customize/macropg.src \ @@ -111,8 +110,8 @@ tabpages/tabline.src \ tabpages/tabstpge.src \ tabpages/textanim.src \ tabpages/textattr.src \ -tabpages/transfrm.src\ -" +tabpages/transfrm.src + .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/dbaccess/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/dbaccess/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/dbaccess/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=dbaccess TARGET=none -LANGUAGE_FILELIST="\ -core/resource/strings.src \ +LANGUAGE_FILELIST=core/resource/strings.src \ ext/adabas/AdabasNewDb.src \ ext/macromigration/macromigration.src \ sdbtools/resource/sdbt_strings.src \ @@ -69,8 +68,8 @@ ui/querydesign/query.src \ ui/relationdesign/relation.src \ ui/tabledesign/table.src \ ui/uno/copytablewizard.src \ -ui/uno/dbinteraction.src\ -" +ui/uno/dbinteraction.src + .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/editeng/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/editeng/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/editeng/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,14 +23,13 @@ PRJ=.. PRJNAME=basic TARGET=none -LANGUAGE_FILELIST="\ -accessibility/accessibility.src \ +LANGUAGE_FILELIST=accessibility/accessibility.src \ editeng/editeng.src \ items/page.src \ items/svxitems.src \ misc/lingu.src \ -outliner/outliner.src\ -" +outliner/outliner.src + .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/extensions/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/extensions/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/extensions/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/extensions/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=basic TARGET=none -LANGUAGE_FILELIST="\ -abpilot/abspilot.src \ +LANGUAGE_FILELIST=abpilot/abspilot.src \ bibliography/bib.src \ bibliography/datman.src \ bibliography/sections.src \ @@ -46,8 +45,7 @@ propctrlr/taborder.src \ scanner/grid.src \ scanner/sanedlg.src \ update/check/Addons.xcu \ -update/check/updatehdl.src\ -" +update/check/updatehdl.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/filter/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/filter/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/filter/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/filter/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=.. PRJNAME=basic TARGET=none -LANGUAGE_FILELIST="\ -config/fragments/filters/calc8_template_ui.xcu \ +LANGUAGE_FILELIST=config/fragments/filters/calc8_template_ui.xcu \ config/fragments/filters/calc8_ui.xcu \ config/fragments/filters/calc_HTML_WebQuery_ui.xcu \ config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu \ @@ -184,8 +183,8 @@ xsltdialog/xmlfiltersettingsdialog.src \ xsltdialog/xmlfiltertabdialog.src \ xsltdialog/xmlfiltertabpagebasic.src \ xsltdialog/xmlfiltertabpagexslt.src \ -xsltdialog/xmlfiltertestdialog.src\ -" +xsltdialog/xmlfiltertestdialog.src + .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/forms/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/forms/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/forms/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/forms/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=forms TARGET=none -LANGUAGE_FILELIST="resource/strings.src resource/xforms.src" +LANGUAGE_FILELIST=resource/strings.src resource/xforms.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/formula/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/formula/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/formula/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/formula/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=formula TARGET=none -LANGUAGE_FILELIST="core/resource/core_resource.src ui/dlg/formdlgs.src,ui/dlg/parawin.src" +LANGUAGE_FILELIST=core/resource/core_resource.src ui/dlg/formdlgs.src,ui/dlg/parawin.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/fpicker/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/fpicker/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/fpicker/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/fpicker/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=fpicker TARGET=none -LANGUAGE_FILELIST="office/iodlg.src office/OfficeFilePicker.src" +LANGUAGE_FILELIST=office/iodlg.src office/OfficeFilePicker.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/framework/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/framework/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/framework/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/framework/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,9 +23,7 @@ PRJ=.. PRJNAME=framework TARGET=helper -LANGUAGE_FILELIST="\ -classes/resource.src \ -services/fwk_services.src" +LANGUAGE_FILELIST=classes/resource.src services/fwk_services.src .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk (original) +++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,8 +23,7 @@ PRJ=../../.. PRJNAME=helpcontent2 TARGET=helper -LANGUAGE_FILELIST="\ -auxiliary/sbasic.tree,\ +LANGUAGE_FILELIST=auxiliary/sbasic.tree,\ text/sbasic/guide/create_dialog.xhp,\ text/sbasic/guide/insert_control.xhp,\ text/sbasic/guide/sample_code.xhp,\ @@ -322,7 +321,7 @@ text/sbasic/shared/03132500.xhp \ text/sbasic/shared/05060700.xhp \ text/sbasic/shared/keys.xhp \ text/sbasic/shared/main0211.xhp \ -text/sbasic/shared/main0601.xhp" +text/sbasic/shared/main0601.xhp Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk (original) +++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk Fri Aug 23 13:53:04 2013 @@ -34,8 +34,7 @@ TARGET = text_scalc MODULE = scalc # --- Settings ----------------------------------------------------- -LANGUAGE_FILELIST="\ -auxiliary/scalc.tree,\ +LANGUAGE_FILELIST=auxiliary/scalc.tree,\ text/scalc/00/00000004.xhp \ text/scalc/00/00000402.xhp \ text/scalc/00/00000403.xhp \ Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk (original) +++ openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk Fri Aug 23 13:53:04 2013 @@ -35,8 +35,7 @@ TARGET = text_schart MODULE = schart # --- Settings ----------------------------------------------------- -LANGUAGE_FILELIST="\ -auxiliary/schart.tree \ +LANGUAGE_FILELIST=auxiliary/schart.tree \ text/schart/00/00000004.xhp \ text/schart/01/03010000.xhp \ text/schart/01/04010000.xhp \ @@ -91,7 +90,7 @@ text/schart/02/02020000.xhp \ text/schart/04/01020000.xhp \ text/schart/main0000.xhp \ text/schart/main0202.xhp \ -text/schart/main0503.xhp" +text/schart/main0503.xh .IF "$(MAKETARGETS)"!="genPO" .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk (original) +++ openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk Fri Aug 23 13:53:04 2013 @@ -35,8 +35,7 @@ TARGET = text_sdraw MODULE = sdraw # --- Settings ----------------------------------------------------- -LANGUAGE_FILELIST="\ -text/sdraw/00/00000004.xhp,\ +LANGUAGE_FILELIST=text/sdraw/00/00000004.xhp,\ text/sdraw/01/04010000.xhp,\ text/sdraw/04/01020000.xhp,\ text/sdraw/guide/align_arrange.xhp,\ Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk (original) +++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk Fri Aug 23 13:53:04 2013 @@ -35,8 +35,7 @@ TARGET = text_shared MODULE = shared # --- Settings ----------------------------------------------------- -LANGUAGE_FILELIST="\ -auxiliary/shared.tree \ +LANGUAGE_FILELIST=auxiliary/shared.tree \ text/shared/00/00000001.xhp \ text/shared/00/00000002.xhp \ text/shared/00/00000003.xhp \ Modified: openoffice/branches/l10n40/main/javainstaller2/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/javainstaller2/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/javainstaller2/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/javainstaller2/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -23,7 +23,7 @@ PRJ=.. PRJNAME=javainstaller2 TARGET=helper -LANGUAGE_FILELIST="../src/Localization/setupstrings.ulf" +LANGUAGE_FILELIST=../src/Localization/setupstrings.ulf .INCLUDE : settings.mk Modified: openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx (original) +++ openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx Fri Aug 23 13:53:04 2013 @@ -243,8 +243,8 @@ void handler::run() mcMemory.setModuleName(msModuleName); // build list of languages (to be loaded and later written - if (msPoDir.size() && meWorkMode != DO_EXTRACT) - loadL10MEM(); + if (msPoDir.size()) + loadL10MEM( (meWorkMode == DO_EXTRACT) ); // use workMode to start correct control part switch (meWorkMode) @@ -279,7 +279,7 @@ void handler::runExtract() } // and generate language file - mcMemory.save(msPoOutDir, false, true, mbForceSave); + mcMemory.save(msPoOutDir, false, mbForceSave); } @@ -299,7 +299,7 @@ void handler::runMerge(bool bKid) } // and generate language file - mcMemory.save(msPoOutDir, bKid, false, mbForceSave); + mcMemory.save(msPoOutDir, bKid, mbForceSave); } @@ -328,7 +328,7 @@ void handler::runConvert() } // and generate language file - mcMemory.save(msPoOutDir, false, false, mbForceSave); + mcMemory.save(msPoOutDir, false, mbForceSave); } @@ -451,10 +451,10 @@ void handler::showManual() /********************** I M P L E M E N T A T I O N **********************/ -void handler::loadL10MEM() +void handler::loadL10MEM(bool onlyTemplates) { - std::string sMod = msModuleName + ".po"; - std::string sLoad = msPoDir + "en-US/"; + std::string sMod = msModuleName + ".pot"; + std::string sLoad = msPoDir + "templates/"; // load texts from en-US po file (master) @@ -467,7 +467,11 @@ void handler::loadL10MEM() convert_gen (mcMemory, sLoad, msTargetDir, sMod).execute(false); } + if (onlyTemplates) + return; + // loop through all languages and load text + sMod = msModuleName + ".po"; for (std::vector::iterator siLang = mvLanguages.begin(); siLang != mvLanguages.end(); ++siLang) { sLoad = msPoDir + *siLang + "/"; Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx (original) +++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx Fri Aug 23 13:53:04 2013 @@ -93,8 +93,8 @@ void l10nMem::loadEntryKey(int iL, const { l10nMem_impl::mcImpl->loadEntryKey(iL, sS, sK, sO, sT, bI); } void l10nMem::setSourceKey(int iL, const std::string& sF, const std::string& sK, const std::string& sT) { l10nMem_impl::mcImpl->setSourceKey(iL, sF, sK, sT); } -void l10nMem::save(const std::string& sT, bool bK, bool bP, bool bF) - { l10nMem_impl::mcImpl->save(*this, sT, bK, bP, bF); } +void l10nMem::save(const std::string& sT, bool bK, bool bF) + { l10nMem_impl::mcImpl->save(*this, sT, bK, bF); } int l10nMem::prepareMerge() { return l10nMem_impl::mcImpl->mcDb.prepareMerge(); } void l10nMem::dumpMem(const std::string& sT) @@ -226,16 +226,17 @@ void l10nMem_impl::setSourceKey(int /********************** I M P L E M E N T A T I O N **********************/ -void l10nMem_impl::save(l10nMem& cMem, const std::string& sTargetDir, bool bKid, bool bPOT, bool bForce) +void l10nMem_impl::save(l10nMem& cMem, const std::string& sTargetDir, bool bKid, bool bForce) { int iE, iEsize = mcDb.mcENUSlist.size(); int iL, iLsize = mcDb.mcLangList.size(); int iCntDeleted = 0, iCntChanged = 0, iCntAdded = 0; - std::string sFileName = msModuleName + (bPOT ? ".pot" : ".po"); + std::string sFileName = msModuleName + ".pot"; // and reorganize db if needed - mcDb.reorganize(); + mcDb.miCurFileInx = 0; + mcDb.reorganize(); // no save if there has been errors if(!needWrite(sFileName, bForce)) @@ -247,7 +248,7 @@ void l10nMem_impl::save(l10nMem& cMem, c { convert_gen savePo(cMem, sTargetDir, sTargetDir, sFileName); - savePo.startSave("", sFileName); + savePo.startSave("templates/", sFileName); for (iE = 1; iE < iEsize; ++iE) { l10nMem_enus_entry& cE = mcDb.mcENUSlist[iE]; @@ -262,6 +263,7 @@ void l10nMem_impl::save(l10nMem& cMem, c } // save all languages + sFileName = msModuleName + ".po"; for (iL = 1; iL < iLsize; ++iL) { convert_gen savePo(cMem, sTargetDir, sTargetDir, sFileName); @@ -305,12 +307,12 @@ void l10nMem_impl::formatAndShowText(con { std::string& cFile = mcDb.mcFileList[mcDb.miCurFileInx].msFileName; - std::cerr << sType; + std::cout << sType; if (mcDb.miCurFileInx > 0) - std::cerr << " in " << mcDb.mcFileList[mcDb.miCurFileInx].msFileName; + std::cout << " in " << mcDb.mcFileList[mcDb.miCurFileInx].msFileName; if (iLineNo) - std::cerr << "(" << iLineNo << ")"; - std::cerr << ": " << sText << std::endl; + std::cout << "(" << iLineNo << ")"; + std::cout << ": " << sText << std::endl; } Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx (original) +++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx Fri Aug 23 13:53:04 2013 @@ -165,7 +165,6 @@ class l10nMem_impl void save (l10nMem& cMem, const std::string& sTargetDir, bool bKid, - bool bPOT, bool bForce); void dumpMem (const std::string& sTargetDir); Modified: openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx (original) +++ openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx Fri Aug 23 13:53:04 2013 @@ -84,7 +84,6 @@ class l10nMem void save (const std::string& sTargetDir, bool bKid, - bool bPOT, bool bForce); void dumpMem (const std::string& sTargetDir); @@ -152,7 +151,7 @@ class handler void showUsage(std::string& sErr); void showManual(); - void loadL10MEM(); + void loadL10MEM(bool onlyTemplates); void readFileWithSources(); }; #endif Modified: openoffice/branches/l10n40/main/languages/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/makefile.mk?rev=1516849&r1=1516848&r2=1516849&view=diff ============================================================================== --- openoffice/branches/l10n40/main/languages/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/languages/source/makefile.mk Fri Aug 23 13:53:04 2013 @@ -26,7 +26,6 @@ TARGET=languages_merge .INCLUDE : settings.mk genPO: - -$(MKDIRHIER) $(COMMONMISC)/staging ALLTAR: