INTEGRATION: CWS cso001 (1.1.1.1.10); FILE MERGED

2004/03/23 12:45:36 hjs 1.1.1.1.10.1: #116006# merge

3 files changed, 23 insertions, 23 deletions

diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 1f2ad17b271e..9e3307d63a11 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Strings.src,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $
+ *  last change: $Author: obo $ $Date: 2004-04-27 10:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,14 +75,14 @@ String STR_TITLE_GRID
     Text [ dutch ] = "Raster" ;
     Text [ spanish ] = "Cuadr�cula" ;
     Text [ english_us ] = "Grid" ;
-    Text[ chinese_simplified ] = "网格线";
+    Text[ chinese_simplified ] = "网格";
     Text[ russian ] = "�����";
     Text[ polish ] = "Siatka";
     Text[ japanese ] = "目盛線";
     Text[ chinese_traditional ] = "網格";
     Text[ arabic ] = "����";
     Text[ dutch ] = "Raster";
-    Text[ chinese_simplified ] = "网格线";
+    Text[ chinese_simplified ] = "网格";
     Text[ greek ] = "������";
     Text[ korean ] = "눈금선";
     Text[ turkish ] = "K�lavuz �izgiler";
@@ -2248,7 +2248,7 @@ String STR_CHART_DOCUMENT_FULLTYPE_60
     Text [ french ] = "%PRODUCTNAME 6.0 Diagramme" ;
     Text [ portuguese ] = "%PRODUCTNAME 6.0 Gr�fico" ;
     Text [ portuguese_brazilian ] = "%PRODUCTNAME 6.0 Chart" ;
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 图表";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTVERSION 图表";
     Text[ russian ] = "��������� %PRODUCTNAME 6.0";
     Text[ polish ] = "%PRODUCTNAME 6.0 Chart";
     Text[ japanese ] = "%PRODUCTNAME 6.0 グラフ";
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
index 1493cb9e508a..f4bc292388c1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_InsertAxis_Grid.src,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $
+ *  last change: $Author: obo $ $Date: 2004-04-27 10:37:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,7 +161,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "Eixo ~X";
         Text[ japanese ] = "~X 軸";
         Text[ korean ] = "~X 축";
-        Text[ chinese_simplified ] = "~X 轴";
+        Text[ chinese_simplified ] = "X 轴";
         Text[ chinese_traditional ] = "~X 軸";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "~X ekseni";
@@ -194,7 +194,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "Eixo ~Y";
         Text[ japanese ] = "~Y 軸";
         Text[ korean ] = "~Y 축";
-        Text[ chinese_simplified ] = "~Y 轴";
+        Text[ chinese_simplified ] = "Y 轴";
         Text[ chinese_traditional ] = "~Y 軸";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "~Y ekseni";
@@ -228,7 +228,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "Eixo ~Z";
         Text[ japanese ] = "~Z 軸";
         Text[ korean ] = "~Z 축";
-        Text[ chinese_simplified ] = "~Z 轴";
+        Text[ chinese_simplified ] = "Z 轴";
         Text[ chinese_traditional ] = "~Z 軸";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "~Z ekseni";
@@ -327,7 +327,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "~Eixo X";
         Text[ japanese ] = "X軸(~A)";
         Text[ korean ] = "X 축(~A)";
-        Text[ chinese_simplified ] = "X 轴(~A)";
+        Text[ chinese_simplified ] = "X 轴";
         Text[ chinese_traditional ] = "X 軸(~A)";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "X ~ekseni";
@@ -360,7 +360,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "Ei~xo Y";
         Text[ japanese ] = "Y軸(~I)";
         Text[ korean ] = "Y 축(~I)";
-        Text[ chinese_simplified ] = "Y 轴(~I)";
+        Text[ chinese_simplified ] = "Y 轴";
         Text[ chinese_traditional ] = "Y 軸(~I)";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "Y e~kseni";
@@ -394,7 +394,7 @@ ModalDialog DLG_AXIS_OR_GRID
         Text[ portuguese_brazilian ] = "Ei~xo Y";
         Text[ japanese ] = "Z軸(~S)";
         Text[ korean ] = "Z 축(~S)";
-        Text[ chinese_simplified ] = "Z 轴(~S)";
+        Text[ chinese_simplified ] = "Z 轴";
         Text[ chinese_traditional ] = "Z 軸(~S)";
         Text[ arabic ] = "������ �";
         Text[ turkish ] = "Z ek~seni";
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index 35f4b9c358a9..69a2eade15e2 100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_Scale.src,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: obo $ $Date: 2004-04-27 10:38:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -279,14 +279,14 @@ TabPage TP_SCALE_Y
             Text [ danish ] = "Overinterval:" ;
             Text [ portuguese_brazilian ] = "Intervalo ~Principal:" ;
             Text [ portuguese ] = "Intervalo ~principal:" ;
-            Text[ chinese_simplified ] = "主区间值(~I)：";
+            Text[ chinese_simplified ] = "主区间值：";
             Text[ russian ] = "�������� ��������:";
             Text[ polish ] = "Przedz~ia� g�.:";
             Text[ japanese ] = "主間隔(~I):";
             Text[ chinese_traditional ] = "主區間值(~I)：";
             Text[ arabic ] = "���� ����� ������:";
             Text[ dutch ] = "Hoo~fdinterval:";
-            Text[ chinese_simplified ] = "主区间值(~I)：";
+            Text[ chinese_simplified ] = "主区间值：";
             Text[ greek ] = "����� ~��������:";
         Text[ korean ] = "주 간격(~I):";
         Text[ turkish ] = "Ana A~ral�k:";
@@ -358,14 +358,14 @@ TabPage TP_SCALE_Y
             Text [ danish ] = "Underinterval:" ;
             Text [ portuguese_brazilian ] = "~Intervalo auxiliar:" ;
             Text [ portuguese ] = "~Intervalo auxiliar:" ;
-            Text[ chinese_simplified ] = "次区间值(~N)：";
+            Text[ chinese_simplified ] = "次区间值：";
             Text[ russian ] = "�������������� ��������:";
             Text[ polish ] = "Przedzia� pomocn.:";
             Text[ japanese ] = "補助間隔(~N):";
             Text[ chinese_traditional ] = "次區間值(~N)：";
             Text[ arabic ] = "���� ����� ������:";
             Text[ dutch ] = "~Hulpinterval";
-            Text[ chinese_simplified ] = "次区间值(~N)：";
+            Text[ chinese_simplified ] = "次区间值：";
             Text[ greek ] = "���~�. ��������:";
         Text[ korean ] = "보조 간격(~N):";
         Text[ turkish ] = "K�~��k aral�k";
@@ -575,11 +575,11 @@ TabPage TP_SCALE_Y
         Text[ polish ] = "Znaczniki osi";
         Text[ portuguese_brazilian ] = "Marcas nos eixos";
         Text[ japanese ] = "軸の区切り";
-        Text[ chinese_simplified ] = "主区间值的标记";
+        Text[ chinese_simplified ] = "主区间值标记";
         Text[ chinese_traditional ] = "主區間值標記";
         Text[ arabic ] = "������ �������";
         Text[ dutch ] = "Asmarkeringen";
-        Text[ chinese_simplified ] = "主区间值的标记";
+        Text[ chinese_simplified ] = "主区间值标记";
         Text[ greek ] = "��������� ������";
         Text[ korean ] = "주 간격 표시";
         Text[ turkish ] = "B�y�k aral�k i�aretleri";
@@ -682,11 +682,11 @@ TabPage TP_SCALE_Y
         Text[ polish ] = "Znaczniki podzia�ki";
         Text[ portuguese_brazilian ] = "Marcas auxiliares";
         Text[ japanese ] = "補助区切り";
-        Text[ chinese_simplified ] = "次区间值的标记";
+        Text[ chinese_simplified ] = "辅区间值标记";
         Text[ chinese_traditional ] = "次區間值標記";
         Text[ arabic ] = "������ ��������";
         Text[ dutch ] = "Hulpmarkeringen";
-        Text[ chinese_simplified ] = "次区间值的标记";
+        Text[ chinese_simplified ] = "辅区间值标记";
         Text[ greek ] = "��������� �������";
         Text[ korean ] = "보조 선택 표시";
         Text[ turkish ] = "K���k aral�k i�aretleri";