validityref: merge with DEV300_m64

4 files changed, 18 insertions, 18 deletions

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index c5b8cfd1a9e8..fb3890616aa0 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -304,23 +304,23 @@ Resource RID_GLOBSTR
     };
     String STR_UNDO_INSERTNOTE
     {
-        Text [ en-US ] = "Insert Note" ;
+        Text [ en-US ] = "Insert Comment" ;
     };
     String STR_UNDO_DELETENOTE
     {
-        Text [ en-US ] = "Delete Note" ;
+        Text [ en-US ] = "Delete Comment" ;
     };
     String STR_UNDO_SHOWNOTE
     {
-        Text [ en-US ] = "Show Note" ;
+        Text [ en-US ] = "Show Comment" ;
     };
     String STR_UNDO_HIDENOTE
     {
-        Text [ en-US ] = "Hide note" ;
+        Text [ en-US ] = "Hide Comment" ;
     };
     String STR_UNDO_EDITNOTE
     {
-        Text [ en-US ] = "Edit Note" ;
+        Text [ en-US ] = "Edit Comment" ;
     };
     String STR_UNDO_DEC_INDENT
     {
@@ -1020,7 +1020,7 @@ Resource RID_GLOBSTR
     };
     String STR_NOTES
     {
-        Text [ en-US ] = "Notes" ;
+        Text [ en-US ] = "Comments" ;
     };
     String STR_QUERY_DELTAB
     {
@@ -1260,7 +1260,7 @@ Resource RID_GLOBSTR
     };
     String STR_SCATTR_PAGE_NOTES
     {
-        Text [ en-US ] = "Notes" ;
+        Text [ en-US ] = "Comments" ;
     };
     String STR_SCATTR_PAGE_GRID
     {
diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index 6b80e2597b87..7ba7b6a1c8fe 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.src
@@ -136,8 +136,8 @@ Menu RID_POPUP_ROWHEADER
         PART2
         MenuItem
         {
-            Identifier = FID_PASTE_CONTENTS ;
-            HelpId = FID_PASTE_CONTENTS ;
+            Identifier = SID_PASTE_SPECIAL ;
+            HelpId = SID_PASTE_SPECIAL ;
             Text [ en-US ] = "P~aste Special..." ;
         };
     };
@@ -214,8 +214,8 @@ Menu RID_POPUP_COLHEADER
         PART2
         MenuItem
         {
-            Identifier = FID_PASTE_CONTENTS ;
-            HelpId = FID_PASTE_CONTENTS ;
+            Identifier = SID_PASTE_SPECIAL ;
+            HelpId = SID_PASTE_SPECIAL ;
             Text [ en-US ] = "Paste ~Special..." ;
         };
     };
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index ed84da38b742..66e42d08dcef 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -363,7 +363,7 @@ TabPage RID_SCPAGE_CONTENT
     {
         Pos = MAP_APPFONT ( 139 , 40 ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "~Note indicator" ;
+        Text [ en-US ] = "~Comment indicator" ;
     };
     CheckBox CB_VALUE
     {
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 05d10b9813bd..b03c0c0ae135 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -86,19 +86,19 @@ Menu RID_POPUP_CELLS
         {
             Identifier = SID_INSERT_POSTIT ;
             HelpId = SID_INSERT_POSTIT ;
-            Text [ en-US ] = "Insert ~Note" ;
+            Text [ en-US ] = "Insert Co~mment" ;
         };
         MenuItem
         {
             Identifier = SID_DELETE_NOTE ;
             HelpId = SID_DELETE_NOTE ;
-            Text [ en-US ] = "D~elete Note" ;
+            Text [ en-US ] = "D~elete Comment" ;
         };
         MenuItem
         {
             Identifier = FID_NOTE_VISIBLE ;
             HelpId = FID_NOTE_VISIBLE ;
-            Text [ en-US ] = "Sho~w Note" ;
+            Text [ en-US ] = "Sho~w Comment" ;
         };
          //------------------------------
         MenuItem { Separator = TRUE ; };
@@ -126,8 +126,8 @@ Menu RID_POPUP_CELLS
 
         MenuItem
         {
-            Identifier = FID_PASTE_CONTENTS ;
-            HelpId = FID_PASTE_CONTENTS ;
+            Identifier = SID_PASTE_SPECIAL ;
+            HelpId = SID_PASTE_SPECIAL ;
             Text [ en-US ] = "P~aste Special..." ;
         };
          //------------------------------
@@ -524,7 +524,7 @@ Menu RID_POPUP_PAGEBREAK
         {
             Identifier = FID_NOTE_VISIBLE ;
             HelpId = FID_NOTE_VISIBLE ;
-            Text [ en-US ] = "Sho~w Note" ;
+            Text [ en-US ] = "Sho~w Comment" ;
         };
     };
 };