Author: mseidel
Date: Tue Jun 18 10:53:45 2019
New Revision: 1861568
URL: http://svn.apache.org/viewvc?rev=1861568&view=rev
Log:
Merged r1861567 from trunk
i128128 - Lost translations in database wizard
Fixing double slash and wrong paths
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/dbaccess/AllLangResTarget_dbui.mk
openoffice/branches/AOO42X/main/solenv/gbuild/AllLangResTarget.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 18 10:53:45 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567
Modified: openoffice/branches/AOO42X/main/dbaccess/AllLangResTarget_dbui.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/dbaccess/AllLangResTarget_dbui.mk?rev=1861568&r1=1861567&r2=1861568&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/dbaccess/AllLangResTarget_dbui.mk (original)
+++ openoffice/branches/AOO42X/main/dbaccess/AllLangResTarget_dbui.mk Tue Jun
18 10:53:45 2019
@@ -126,7 +126,7 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/dlg/localize.sdf -l all)
$(WORKDIR)/inc/dbaccess/toolbox.hrc :
$(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
$(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
echo merging $@
@@ -136,7 +136,7 @@ $(WORKDIR)/inc/dbaccess/toolbox.hrc : $(
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/inc/localize.sdf -l all)
endif
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/AllLangResTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/AllLangResTarget.mk?rev=1861568&r1=1861567&r2=1861568&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/AllLangResTarget.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/AllLangResTarget.mk Tue Jun
18 10:53:45 2019
@@ -27,7 +27,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND :=
$(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND)
$(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
@@ -102,8 +102,8 @@ $(call gb_SrsPartTarget_get_target,$(1))
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
endif
endef
