Ignore:
Timestamp:
Oct 2, 2023, 8:59:09 PM (23 months ago)
Author:
gyoung
Message:

These 3 files had conflicts when merged with Lars 2.9 branch. I took a mixture of the 2 versions. so these should be merged back into the branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/classes/res/en/cwaudio_en.rc

    r93 r103  
    3131MENU ID_MENU_EDITOR
    3232BEGIN
    33         MENUITEM "~Audioeditor", ID_MENU_EDITOR       
     33        MENUITEM "~Audio editor", ID_MENU_EDITOR       
    3434END
    3535
     
    7777
    7878IDSTR_PLAYTIME      "Play time"
    79 IDSTR_SAMPLERATE    "Samplerate"
     79IDSTR_SAMPLERATE    "Sample rate"
    8080IDSTR_CHANNELS      "Channels"
    8181IDSTR_BPS           "Bits per sample"
     
    113113;Used as an information when starting and audio file from the WPS
    114114IDSTR_STARTINGTRACK      "Starting track..."
    115 IDSTR_AUDIOSCANNING     "Scanning Audiofile..."
    116 IDSTR_AUDIOSTREAMTITLE  "Audio-Stream"
    117 IDSTR_STREAMURLPAGENAME "~URL-Setting"
    118 IDSTR_CDTRACKTITLE      "CD-Track"
     115IDSTR_AUDIOSCANNING     "Scanning audio file..."
     116IDSTR_AUDIOSTREAMTITLE  "Audio stream"
     117IDSTR_STREAMURLPAGENAME "~URL"
     118IDSTR_CDTRACKTITLE      "CD track"
    119119IDSTR_M3UTITLE          "M3U playlist"
    120120;Titles used when starting player and editor applications
     
    127127
    128128END
    129 
    130 
Note: See TracChangeset for help on using the changeset viewer.