Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv839/src

Modified Files:
        AboutDialog.cpp BatchProcessDialog.cpp LabelDialog.cpp 
        LabelDialog.h LabelTrack.cpp Menus.cpp Mix.cpp Project.cpp 
        SplashDialog.cpp TimeTrack.cpp TrackPanel.cpp 
Log Message:
Removed _NoAcc() usage and "&" from text since they mnemonics were being added 
to string by translators and it didn't make any sense to have them on any of 
the strings...near as I could figure anyway.

Index: BatchProcessDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchProcessDialog.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- BatchProcessDialog.cpp      15 Feb 2009 17:26:48 -0000      1.27
+++ BatchProcessDialog.cpp      1 Jun 2009 05:43:40 -0000       1.28
@@ -451,8 +451,8 @@
          mList->InsertColumn(BlankColumn, wxT(""), wxLIST_FORMAT_LEFT);
          /* i18n-hint: This is the number of the command in the list */
          mList->InsertColumn(ItemNumberColumn, _("Num"), wxLIST_FORMAT_RIGHT);
-         mList->InsertColumn(ActionColumn, _NoAcc("&Command"), 
wxLIST_FORMAT_RIGHT);
-         mList->InsertColumn(ParamsColumn, _NoAcc("&Parameters"), 
wxLIST_FORMAT_LEFT);
+         mList->InsertColumn(ActionColumn, _("Command"), wxLIST_FORMAT_RIGHT);
+         mList->InsertColumn(ParamsColumn, _("Parameters"), 
wxLIST_FORMAT_LEFT);
 
          S.StartHorizontalLay(wxCENTER, false);
          {

Index: Mix.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Mix.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Mix.cpp     20 Apr 2009 17:27:22 -0000      1.78
+++ Mix.cpp     1 Jun 2009 05:43:40 -0000       1.79
@@ -117,7 +117,7 @@
                             rate, format);
 
    wxYield();
-   ProgressDialog *progress = new ProgressDialog(_NoAcc("&Mix and Render"),
+   ProgressDialog *progress = new ProgressDialog(_("Mix and Render"),
                                                  _("Mixing and rendering 
tracks"));
    
    int updateResult = eProgressSuccess;

Index: LabelDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LabelDialog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LabelDialog.h       5 Aug 2007 07:13:40 -0000       1.8
+++ LabelDialog.h       1 Jun 2009 05:43:40 -0000       1.9
@@ -49,7 +49,7 @@
    bool Validate();
    void FindAllLabels();
    void AddLabels(LabelTrack *t);
-   wxString TrackName(int & index, wxString dflt = _NoAcc("&Label Track"));
+   wxString TrackName(int & index, wxString dflt = _("Label Track"));
 
    void OnUpdate(wxCommandEvent &event);
    void OnInsert(wxCommandEvent &event);

Index: TimeTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TimeTrack.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- TimeTrack.cpp       16 May 2009 11:13:12 -0000      1.20
+++ TimeTrack.cpp       1 Jun 2009 05:43:40 -0000       1.21
@@ -41,7 +41,7 @@
    mEnvelope->SetInterpolateDB(false);
    mEnvelope->Flatten(0.5);
    mEnvelope->Mirror(false);
-   SetDefaultName(_NoAcc("&Time Track"));
+   SetDefaultName(_("Time Track"));
    SetName(GetDefaultName());
 
    mRuler = new Ruler();

Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -d -r1.455 -r1.456
--- TrackPanel.cpp      28 May 2009 04:58:00 -0000      1.455
+++ TrackPanel.cpp      1 Jun 2009 05:43:40 -0000       1.456
@@ -4268,7 +4268,7 @@
          WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
          if (linked)
             linked->RemoveCutLine(mCapturedTrackLocation.pos);
-         MakeParentPushState(_("Removed Cut Line"), _NoAcc("&Remove"), false );
+         MakeParentPushState(_("Removed Cut Line"), _("Remove"), false );
          handled = true;
       }
       

Index: LabelDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LabelDialog.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- LabelDialog.cpp     5 Oct 2008 14:43:59 -0000       1.19
+++ LabelDialog.cpp     1 Jun 2009 05:43:40 -0000       1.20
@@ -97,7 +97,7 @@
                          double rate)
 : wxDialog(parent,
            wxID_ANY,
-           _NoAcc("&Edit Labels"),
+           _("Edit Labels"),
            wxDefaultPosition,
            wxSize(800, 600),
            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
@@ -702,7 +702,7 @@
       wxTextEntryDialog d(this,
                           _("New Label Track"),
                           _("Enter track name"),
-                          _NoAcc("&Label Track"));
+                          _("Label Track"));
 
       // User canceled so repopulating the grid will set the track
       // name to the orignal value

Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- Menus.cpp   1 Jun 2009 04:08:28 -0000       1.485
+++ Menus.cpp   1 Jun 2009 05:43:40 -0000       1.486
@@ -4403,7 +4403,7 @@
          else
             msg.Printf(_("Mixed and rendered %d tracks into one new mono 
track"),
                        selectedCount);
-         PushState(msg, _NoAcc("&Mix and Render"));
+         PushState(msg, _("Mix and Render"));
       }
 
       mTrackPanel->SetFocusedTrack(newLeft);

Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- AboutDialog.cpp     20 Apr 2009 17:27:22 -0000      1.69
+++ AboutDialog.cpp     1 Jun 2009 05:43:40 -0000       1.70
@@ -140,7 +140,7 @@
 IMPLEMENT_CLASS(AboutDialog, wxDialog)
 
 AboutDialog::AboutDialog(wxWindow * parent)
-   :  wxDialog(parent, -1, _NoAcc("&About Audacity..."),
+   :  wxDialog(parent, -1, _("About Audacity..."),
                wxDefaultPosition, wxDefaultSize)
 {
    this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));

Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- Project.cpp 1 Jun 2009 04:08:28 -0000       1.426
+++ Project.cpp 1 Jun 2009 05:43:40 -0000       1.427
@@ -3158,7 +3158,7 @@
          ShowWarningDialog(this, wxT("FirstProjectSave"),
                            _("You are saving an Audacity project file 
(.aup).\n\nSaving a project creates a file that only Audacity can open.\n\nTo 
save an audio file for other programs, use one of the \"File > Export\" 
commands.\n"));
 
-      fName = FileSelector(_NoAcc("Save Project &As...") + wxT(":"),
+      fName = FileSelector(_("Save Project As...") + wxT(":"),
                     path, fName, wxT(""),
                     _("Audacity projects (*.aup)|*.aup"),
                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER, this);

Index: LabelTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LabelTrack.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- LabelTrack.cpp      25 May 2009 11:13:01 -0000      1.104
+++ LabelTrack.cpp      1 Jun 2009 05:43:40 -0000       1.105
@@ -89,7 +89,7 @@
    mMouseOverLabelRight(-1),
    mIsAdjustingLabel(false)
 {
-   SetDefaultName(_NoAcc("&Label Track"));
+   SetDefaultName(_("Label Track"));
    SetName(GetDefaultName());
 
    // Label tracks are narrow

Index: SplashDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SplashDialog.cpp    28 Jun 2008 21:10:52 -0000      1.12
+++ SplashDialog.cpp    1 Jun 2009 05:43:40 -0000       1.13
@@ -57,7 +57,7 @@
 IMPLEMENT_CLASS(SplashDialog, wxDialog)
 
 SplashDialog::SplashDialog(wxWindow * parent)
-   :  wxDialog(parent, -1, _NoAcc("&Welcome to Audacity!"),
+   :  wxDialog(parent, -1, _("Welcome to Audacity!"),
       wxPoint( -1, 60 ), // default x position, y position 60 pixels from top 
of screen.
       wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {


------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com 
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to