Merge SRC630: 04.05.01 - 22:17:17 (NoBranch)

1 files changed, 29 insertions, 2 deletions

diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src
index 802994489fd6..cdf40686de2b 100644
--- a/sc/source/ui/dbgui/consdlg.src
+++ b/sc/source/ui/dbgui/consdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: consdlg.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2001-03-31 06:16:02 $
+ *  last change: $Author: kz $ $Date: 2001-05-04 20:17:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -412,6 +412,20 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         < " " ; Default ; > ;
         < " " ; Default ; > ;
     };
+    StringList [ catalan ] =
+    {
+            < "Suma" ; Default ; > ;
+        < "Cantidad" ; Default ; > ;
+        < "Promedio" ; Default ; > ;
+        < "M�x" ; Default ; > ;
+        < "M�n" ; Default ; > ;
+        < "Producto" ; Default ; > ;
+        < "Cantidad (solo n�meros)" ; Default ; > ;
+        < "DesvEst (Muestra)" ; Default ; > ;
+        < "DesvEstP (Poblaci�n)" ; Default ; > ;
+        < "Varianza (Muestra)" ; Default ; > ;
+        < "VarP (Poblaci�n)" ; Default ; > ;
+    };
     };
     Edit ED_DATA_AREA
     {
@@ -454,6 +468,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Verkleinern";
+        QuickHelpText[ catalan ] = "Reducir";
     };
     ImageButton RB_DEST_AREA
     {
@@ -482,6 +497,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Verkleinern";
+        QuickHelpText[ catalan ] = "Reducir";
     };
     ListBox LB_DATA_AREA
     {
@@ -534,6 +550,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "��ꡡ��Ģ(~F)";
         Text[ turkish ] = "Fonksi~yon";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~Instrucci�n de c�lculo";
     };
     FixedText FT_CONSAREAS
     {
@@ -562,6 +579,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "���� ����(~C)";
         Text[ turkish ] = "Bir~le�tirme aral�klar�";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~�reas de consolidaci�n";
     };
     FixedText FT_DATA_AREA
     {
@@ -590,6 +608,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�ҽ� ������ ����(~S)";
         Text[ turkish ] = "Kaynak veri a~ral�klar�";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~�rea de datos fuente";
     };
     FixedText FT_DEST_AREA
     {
@@ -618,6 +637,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "����� ���(~T)";
         Text[ turkish ] = "Sonuc~un g�sterilece�i yer";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Re~sultado a partir de";
     };
     CheckBox BTN_BYROW
     {
@@ -647,6 +667,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�� ��(~R)";
         Text[ turkish ] = "Sa~t�r etiketleri";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Etiqueta ~de filas";
     };
     CheckBox BTN_BYCOL
     {
@@ -677,6 +698,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�� �Ӹ���(~O)";
         Text[ turkish ] = "S~�tun ba�l�klar�";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "T�tulos de ~columnas";
     };
     GroupBox GB_CONSBY
     {
@@ -705,6 +727,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�� ����";
         Text[ turkish ] = "Birle�tirme �l��t�";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Consolidar seg�n";
     };
     CheckBox BTN_REFS
     {
@@ -734,6 +757,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�ҽ� �����Ϳ� ����(~L)";
         Text[ turkish ] = "Kaynak verilerine ~ba�la";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~Vincular con datos fuente";
     };
     OKButton BTN_OK
     {
@@ -806,6 +830,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "����(~D)";
         Text[ turkish ] = "~Sil";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~Eliminar";
     };
     PushButton BTN_ADD
     {
@@ -836,6 +861,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         Text[ korean ] = "�߰�(~A)";
         Text[ turkish ] = "~Ekle";
         Text[ language_user1 ] = " ";
+        Text[ catalan ] = "~A�adir";
     };
     Text[ chinese_simplified ] = "�ϲ�����";
     Text[ russian ] = "���������������";
@@ -847,4 +873,5 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
     Text[ korean ] = "����";
     Text[ turkish ] = "Birle�tir";
     Text[ language_user1 ] = " ";
+    Text[ catalan ] = "Consolidar";
 };