ooo-build r14574 - in trunk: . patches/dev300

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14574 - in trunk: . patches/dev300
Date: Fri, 21 Nov 2008 22:33:40 +0000 (UTC)
Author: kyoshida
Date: Fri Nov 21 22:33:40 2008
New Revision: 14574
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14574&view=rev

Log:
2008-11-21  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/helpcontent-scalc-01.diff: modified the entry for 
	inline array separators to match our localized separator feature.

	* patches/dev300/apply: apply this new patch under new [ HelpContent ]
	section.


Added:
   trunk/patches/dev300/helpcontent-scalc-01.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 21 22:33:40 2008
@@ -11,7 +11,7 @@
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
-	 Fixes, DefaultSettings, Features, VCL, Misc, \
+	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
@@ -158,6 +158,8 @@
 # Create a safe hash number interval for ooo-build only resources.
 sc-hrc-ooo-build-resources.diff, kohei
 
+[ HelpContent ]
+helpcontent-scalc-01.diff, kohei
 
 [ LinuxOnly ]
 # Don't stat tons of config files we don't need to read on startup

Added: trunk/patches/dev300/helpcontent-scalc-01.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/helpcontent-scalc-01.diff	Fri Nov 21 22:33:40 2008
@@ -0,0 +1,48 @@
+diff --git helpcontent2/source/text/scalc/01/04060107.xhp helpcontent2/source/text/scalc/01/04060107.xhp
+index 58d4d67..995b557 100644
+--- helpcontent2/source/text/scalc/01/04060107.xhp
++++ helpcontent2/source/text/scalc/01/04060107.xhp
+@@ -163,7 +163,7 @@
+ <paragraph role="paragraph" id="par_id3154342" xml-lang="en-US" l10n="U" oldref="5">The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range.</paragraph>
+ <paragraph role="heading" id="hd_id8834803" xml-lang="en-US" level="3" l10n="NEW">Using Inline Array Constants in Formulas</paragraph>
+ <paragraph role="paragraph" id="par_id985747" xml-lang="en-US" l10n="NEW">Calc supports inline matrix/array constants in formulas. An inline array is surrounded by curly braces '{' and '}'. Elements can be each a number (including negatives), a logical constant (TRUE, FALSE), or a literal string. Non-constant expressions are not allowed. Arrays can be entered with one or more rows, and one or more columns. All rows must consist of the same number of elements, all columns must consist of the same number of elements. </paragraph>
+-<paragraph role="paragraph" id="par_id936613" xml-lang="en-US" l10n="NEW">The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. </paragraph>
++<paragraph role="paragraph" id="par_id936613" xml-lang="en-US" l10n="NEW">The column separator (separating elements in one row) and the row separator are language and locale dependent.  But in this help content, the ';' semicolon and '|' pipe symbol are used to indicate the column and row separators, respectively.  For example, in the English locale, the ',' comma is used as the column separator, while the ';' semicolon is used as the row separator.</paragraph>
+ <paragraph role="paragraph" id="par_id1877498" xml-lang="en-US" l10n="NEW">Arrays can not be nested.</paragraph>
+ <paragraph role="paragraph" id="par_id4262520" xml-lang="en-US" l10n="NEW">
+ <emph>Examples:</emph>
+diff --git helpcontent2/source/text/scalc/01/localize.sdf helpcontent2/source/text/scalc/01/localize.sdf
+index 6b18d82..40b93c0 100644
+--- helpcontent2/source/text/scalc/01/localize.sdf
++++ helpcontent2/source/text/scalc/01/localize.sdf
+@@ -127951,30 +127951,6 @@ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	sl	={1;
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	sv	={1;2;3|4;5;6}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	zh-CN	={1;2;3|4;5;6}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	zh-TW	={1;2;3|4;5;6}				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ar	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	bg	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	br	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ca	El separador de columna (que separa els elements d'una fila) Ãs el punt i coma ';'. El separador de fila Ãs un sÃmbol de barra vertical '|'. Els separadors no depenen de la llengua ni de la configuraciÃ regional. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	cs	OddÄlovaÄem sloupcÅ (rozdÄlenÃ prvkÅ jednoho ÅÃdku) je stÅednÃk ';'. OddÄlovaÄem ÅÃdkÅ je symbol roury '|'. OddÄlovaÄe nezÃvisejÃ na jazykovÃm nastavenÃ.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	da	Kolonneadskilleren (opdeler elementerne i en rÃkke) er ';' semikolon. RÃkkeadskilleren er '|' dataledningssymbolet. Skilletegnene er ikke sprog- eller lokalitetsafhÃngige. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	de	Der Spaltentrenner (trennt die Elemente in einer Zeile) ist das ';' Semikolon. Der Zeilentrenner ist ein '|' Pipe Symbol. Die Trenner sind sprachunabhÃngig. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	es	El separador de columnas (separando elementos en una fila) es el ";" punto y coma. El separador de filas es la "|" barra. Los separadores no estÃn dependiente de idioma ni local.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	et	Veergude eraldaja (Ãhes reas asuvate elementide eraldaja) on semikoolon ';'. Ridade eraldajaks on pÃstkriipsu mÃrk '|'. Need eraldajad ei sÃltu keelest ega lokaadist.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	fr	Le sÃparateur de colonne (sÃparant les ÃlÃments dans une ligne) est le ';' point-virgule. Le sÃparateur de ligne est '|' la barre verticale. Les sÃparateurs ne sont pas dÃpendants de la langue ou de l'environnemenrt localisÃ. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	hu	Az oszlopelvÃlasztÃ (amely elvÃlasztja a soron belÃl az elemeket) a pontosvesszÅ (;). A sorelvÃlasztÃ a fÃggÅleges vonal (|). Az elvÃlasztÃk nem fÃggnek a nyelvtÅl Ãs a terÃleti beÃllÃtÃsoktÃl. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	it	Il separatore di colonne (che separa gli elementi appartententi ad una stessa riga) Ã il punto e virgola ';'. Il separatore di riga Ã il simbolo '|'. I separatori non dipendono dal linguaggio o dalla localizzazione.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ja	åååãèå (1 åãèçãååããã) ã ããããã (;) ããã èååãèåããããèå (|) ããã ååãèåãèèãããããããããããäåããããã 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	km	áááááááááâáááâáá (áááááâááááâááâáááâáááááá) ááááâáááááâáááááâááááá ';'Âá ááááâáááááâáááâáááâááâááâááááááááááááââááááá '|'Âá ááááâááááá ááâááááááâááâáááá áááâáááâááááâááááááááááÂá				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ko	(í íìì ììë ëëíë) ì êëìë ';' ìëìëìëë. í êëìë '|' íìí êíìëë. êëìë ìì ë ëììì ëëììëë. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	nl	Het kolomscheidingsteken (dat de elementen in ÃÃn rij scheidt) is de puntkomma ';'. Het rijscheidingsteken is het 'pipe'-teken '|'. De scheidingstekens zijn niet afhankelijk van taal en locale. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pl	Separator kolumn (oddzielajÄcy elementy w jednym wierszu) to Årednik (;). Separator wierszy to symbol potoku â|â. Separatory sÄ niezaleÅne od jÄzyka i ustawieÅ regionalnych. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pt	O separador de colunas (que separa elementos numa linha) Ã o ponto e vÃrgula ';'. O separador de linhas Ã o sÃmbolo '|'. Os separadores nÃo estÃo dependentes de idioma ou configuraÃÃo regional. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pt-BR	O separador de coluna (separando elementos em uma linha) Ã o ponto-e vÃrgula ';'. O separador de linhas Ã o sÃmbolo '|'. Os separadores nÃo dependem do idioma ou da locale. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ru	ÐÐÐÐÐÐÐÑÐÐÑ ÑÑÐÐÐÑÐÐ (ÑÐÐÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÑÑ Ð ÐÐÐÐÐ ÑÑÑÐÐÐ) - ";" (ÑÐÑÐÐ Ñ ÐÐÐÑÑÐÐ). ÐÐÐÐÐÐÐÑÐÐÑ ÑÑÑÐÐ - "|" (ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐÑÐÐ). ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÑÑ ÐÑ ÑÐÑÐÐ Ð ÐÐÐÐÐÐ. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	sl	LoÄilo stolpcev (ki loÄuje elemente ene vrstice) je podpiÄje (';'). LoÄilo vrstic je simbol '|'. LoÄila niso odvisna od jezikovnih in krajevnih nastavitev. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	sv	Semikolon ';' anvÃnds som kolumnavgrÃnsare (avgrÃnsar elementen pÃ en rad). Som radavgrÃnsare anvÃnds symbolen '|'. AvgrÃnsarna Ãr inte sprÃk- eller sprÃkvariantberoende. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	zh-CN	ååéçïçäåéèäçåçïæåå ';'ãèåéçæçççå '|'ãèäåéçäèèåèèçåæåã 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	zh-TW	æåéç (åéåäåäçåç) çåèã;ããååéçççççèã|ããåéçèèèåèèçåçéã 				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	ar	={1;2;3}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	bg	={1;2;3}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	br	={1;2;3}				2002-02-02 02:02:02
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]