Ignore:
Timestamp:
Oct 1, 2023, 4:30:02 PM (23 months ago)
Author:
erdmann
Message:

merging v2.9 into v2.9_Lars branch, in particular, this means adding french,spanish,russian translations

Location:
branches/v2.9_Lars
Files:
15 edited
6 copied

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/classes/c/c_common/except.c

    r74 r91  
    130130   USHORT  SS;
    131131} DbgBuf;
    132 /*-------------------------------------*/
    133 APIRET APIENTRY DOSQUERYMODFROMEIP( HMODULE *phMod,
    134                                     ULONG *pObjNum,
    135                                     ULONG BuffLen,
    136                                     PCHAR pBuff,
    137                                     ULONG *pOffset,
    138                                     PVOID Address );
    139 /*APIRET APIENTRY DosQueryModFromEIP( HMODULE *phMod,
    140                                     ULONG *pObjNum,
    141                                     ULONG BuffLen,
    142                                     PCHAR pBuff,
    143                                     ULONG *pOffset,
    144                                     PVOID Address );*/
    145 
    146 /*-------------------------------------*/
     132
    147133/* CW
    148134#define DBG_O_OBJMTE       0x10000000L*/
    … …  
    663649            (Version[0]>=20) &&
    664650            (Version[1]>=10) ) {
    665           /* version must be over 2.1 for DOSQUERYMODFROMEIP */
     651          /* version must be over 2.1 for DosQueryModFromEIP */
    666652          fprintf(hTrap,"OS/2 Version %d.%d\n",Version[0]/10,Version[1]);
    667           rc=DOSQUERYMODFROMEIP( &hMod, &ObjNum, CCHMAXPATH,
     653          rc=DosQueryModFromEIP( &hMod, &ObjNum, CCHMAXPATH,
    668654                                 Name, &Offset, pERepRec->ExceptionAddress);
    669655            if (rc==0) {
    … …  
    814800     if ((AllocationFlags&PAG_EXECUTE)&&
    815801         (AllocationFlags&PAG_BASE)) {
    816         rc=DOSQUERYMODFROMEIP( &hMod, &ObjNum, CCHMAXPATH,
     802        rc=DosQueryModFromEIP( &hMod, &ObjNum, CCHMAXPATH,
    817803                              Name, &Offset, BaseAddress);
    818804        if (rc==0) {
    … …  
    10381024            break; /* avoid infinite loops */
    10391025         } else {
    1040             rc = DOSQUERYMODFROMEIP(&hMod, &ObjNum, sizeof(Name),
     1026            rc = DosQueryModFromEIP(&hMod, &ObjNum, sizeof(Name),
    10411027                                    Name, &Offset, (PVOID)RetAddr);
    10421028            if (rc == NO_ERROR && ObjNum != -1)

  • branches/v2.9_Lars/classes/c/c_common/helper.c

    r74 r91  
    2323 * http://www.geocities.com/SiliconValley/Sector/5785/
    2424 */
     25#define INCL_BASE
    2526#define INCL_WIN
    2627#define INCL_DOS
    … …  
    222223   return hModule;
    223224 }
    224 
    225 /*APIRET APIENTRY DosQueryModFromEIP( HMODULE *phMod,
    226                                     ULONG *pObjNum,
    227                                     ULONG BuffLen,
    228                                     PCHAR pBuff,
    229                                     ULONG *pOffset,
    230                                     PVOID Address );*/
    231225
    232226 /* Get the HMODULE of the MM class DLL */

  • branches/v2.9_Lars/classes/c/cwmm.DEF

    r3 r91  
    11; CWMM.DEF: DEF-file for CWMM.dll
    22;
    3 ;                    (C) Chris Wohlgemuth 2002-2005
     3;                    (C) Chris Wohlgemuth 2002-2020
    44;/*
    55; * This program is free software; you can redistribute it and/or modify
    … …  
    2525
    2626LIBRARY CWMM INITGLOBAL
    27 DESCRIPTION '$@#(C) C. Wohlgemuth 2005:0.2        #@##1## 11/05/05 17:35:09        My ;-)  ::::9::@@CWMM-classes V0.2.9'
     27DESCRIPTION '$@#(C) C. Wohlgemuth 2020:0.2        #@##1## 18/07/20 19:38:26        My ;-)  ::::9::@@CWMM-classes V0.2.9'
    2828
    2929PROTMODE

  • branches/v2.9_Lars/classes/help/en/cwmm.ipf

    r90 r91  
    11:userdoc.
    2 
    32:docprof.
    4 
    5 :title.Help
    6 
     3:title.CWMM Help
     4
     5.* ----------------------------------------------------------------------------
    76:h1 res=010.MP3 audio file
    8 :p.
    9 This file is an MP3 audio file. It may be played using MMOS/2
    10 after installing of MMIOMP3 a free multimedia IO procedure.
    11 MP3 files contain compressed audio data.
    12 The compression is not lossless.
    13 :p.
    14 Get the IO procedure from
    15 :p.
    16 :link reftype=launch
    17 object='netscape.exe'
    18 data='http://www.math.berkeley.edu/~roconnor/'.
    19 http&colon.//www.math.berkeley.edu/~roconnor/:elink.
    20 
    21 :h1 res=011.ID3 Tag
    22 :p.
    23 Use this page for the editing of ID3 tags.
    24 If the entry fields
    25 are empty this file does not have any tag yet.
    26 The new information is only saved after pressing the :hp2.Save:ehp2.
    27 button.
    28 
    29 :p.
    30 The following information may be specified:
    31 :ul.
    32 :li.:hp2.Name:ehp2.
    33 .br
    34 The name of the track. The length is restricted to 30 characters.
    35 
    36 :li.:hp2.Artist:ehp2.
    37 .br
    38 The name of the Artist. The length is restricted to 30 characters.
    39 
    40 :li.:hp2.Album:ehp2.
    41 .br
    42 The album containing this track. The length is restricted to 30 characters.
    43 
    44 :li.:hp2.Comment:ehp2.
    45 .br
    46 An arbitrary comment. The length is restricted to 30 characters.
    47 
    48 :li.:hp2.Year:ehp2.
    49 .br
    50 The year the album was published.
    51 
    52 :li.:hp2.Genre:ehp2.
    53 .br
    54 The Genre of this track.
    55 
    56 :eul.
    57 
    58 :h1 res=013.ID3 Tag
    59 :p.
    60 This page displays the ID3 tags of the MP3 file. ID3 is a standard to add information
    61 to an MP3 file like the title of the track or the tracks artist.
    62 :p.
    63 If the entry fields are empty this file does not have any tag yet.
    64 
    65 :p.
    66 :ul.
    67 :li.:hp2.Name:ehp2.
    68 .br
    69 The name of the track. The length is restricted to 30 characters.
    70 
    71 :li.:hp2.Artist:ehp2.
    72 .br
    73 The name of the Artist. The length is restricted to 30 characters.
    74 
    75 :li.:hp2.Album:ehp2.
    76 .br
    77 The album containing this track. The length is restricted to 30 characters.
    78 
    79 :li.:hp2.Comment:ehp2.
    80 .br
    81 An arbitrary comment. The length is restricted to 30 characters.
    82 
    83 :li.:hp2.Year:ehp2.
    84 .br
    85 The year the album was published.
    86 
    87 :li.:hp2.Genre:ehp2.
    88 .br
    89 The Genre of this track.
    90 
    91 :eul.
    92 
    93 :h1 res=012.Track names
    94 :p.
    95 Use this page for the editing of track information. The contents of the fields will be saved
    96 in the extended attributes of the file.
    97 The new information will be only saved after pressing the :hp2.Save:ehp2.
    98 button.
     7:p.This file is an MP3 audio file. It may be played using MMOS/2 when a suitable
     8MP3 MMIOProc has been installed.
     9
     10:p.The MP3 format uses lossy compression to reduce the file size of the source
     11material. The amount of loss may or may not be acceptable. Usually, the amount
     12may be controlled by the encoding tool. Once encoded, however, it is not
     13possible to restore the bits which have been discarded. The source file must be
     14re-encoded again with a lower degree of loss.
     15
     16:p.An MP3 MMIOProc package is included in the MMAudio Pak 2, available from&colon.
     17
     18:p.http&colon.//r6.ca/MMAudioPak/
     19
     20.* ----------------------------------------------------------------------------
     21:h1 res=011.ID3 tag
     22:p.Use this page to edit selected ID3 tag fields.
     23
     24:p.An ID3 tag is metadata associated with a particular track, and is stored in
     25the MP3 file. ID3 is a :hp1.de facto:ehp1. standard, generally recognized by
     26most MP3 players.
     27
     28:p.If all entry fields are empty, the file does not have an ID3 tag. If some
     29fields are empty, this data has not been added to the tag.
     30
     31:p.The new information is only saved after pressing the :hp2.Save:ehp2. button.
     32
     33:p.The following information may be specified:
     34
     35:hp2.
     36:table rules=both frame=box cols='10 8 40'.
     37:row.
     38:c.Field
     39:c.Length
     40:c.Description
     41:row.
     42:c.Name
     43:c.30
     44:c.The name of the track.
     45:row.
     46:c.Artist
     47:c.30
     48:c.The name of the artist.
     49:row.
     50:c.Album
     51:c.30
     52:c.The album containing the track.
     53:row.
     54:c.Comment
     55:c.30
     56:c.An arbitrary comment about the track.
     57:row.
     58:c.Year
     59:c.4
     60:c.The 4-digit year in which the album was published.
     61:row.
     62:c.Genre
     63:c.30
     64:c.The genre of this track; select from dropdown.
     65:etable.
     66:ehp2.
     67
     68.* ----------------------------------------------------------------------------
     69:h1 res=013.ID3 tag
     70:p.This page displays selected fields of the ID3 tag attached to the MP3 file.
     71
     72:p.An ID3 tag is metadata associated with a particular track, and is stored in
     73the MP3 file. ID3 is a :hp1.de facto:ehp1. standard, generally recognized by
     74most MP3 players.
     75
     76:p.If all entry fields are empty, the file does not have an ID3 tag. If some
     77fields are empty, this data has not been added to the tag.
     78
     79:p.The new information is only saved after pressing the :hp2.Save:ehp2. button.
     80
     81:p.The following information may be specified:
     82
     83:hp2.
     84:table rules=both frame=box cols='10 8 40'.
     85:row.
     86:c.Field
     87:c.Length
     88:c.Description
     89:row.
     90:c.Name
     91:c.30
     92:c.The name of the track.
     93:row.
     94:c.Artist
     95:c.30
     96:c.The name of the artist.
     97:row.
     98:c.Album
     99:c.30
     100:c.The album containing the track.
     101:row.
     102:c.Comment
     103:c.30
     104:c.An arbitrary comment about the track.
     105:row.
     106:c.Year
     107:c.4
     108:c.The 4-digit year in which the album was published.
     109:row.
     110:c.Genre
     111:c.30
     112:c.The genre of this track; select from dropdown.
     113:etable.
     114:ehp2.
     115
     116.* ----------------------------------------------------------------------------
     117:h1 res=012.Track meta
     118:p.Use this page to edit track information. Unlike an ID3 tag, the contents of
     119these fields will be saved in the extended attributes of the file upon pressing
     120the :hp2.Save:ehp2. button.
     121
    99122:nt.
    100 Extended attributes are only supported with OS/2 and they're not stored on CD. So
    101 if you copy the files to CD or another operating system they will be lost.
     123Extended attributes are only supported by OS/2 and other operating systems which
     124utilize these data structures in their filesystems (HPFS, JFS, XFS, ZFS, and to
     125a limited extent, ext4). Further, this information is not written to CD or DVD.
     126As a result, this data won't be saved or transferred along with its associated
     127files to any system which does not recognize extended attributes, resulting in
     128such copies lacking this data, even if it is present and intact in the source.
     129Use this feature with care.
    102130:ent.
    103 :p.
    104 The following information may be specified. The length of each field is restricted to 256 characters.
    105 :ul.
    106 :li.:hp2.Name&colon.:ehp2.
    107 :p.The name of the track.
    108 
    109 :li.:hp2.Artist&colon.:ehp2.
    110 :p.The name of the Artist.
    111 
    112 :li.:hp2.Album&colon.:ehp2.
    113 :p.The album containing this track.
    114 
    115 :li.:hp2.Comment&colon.:ehp2.
    116 :p.An arbitrary comment.
    117 
    118 :li.:hp2.Year&colon.:ehp2.
    119 :p.The year the album was published.
    120 
    121 :li.:hp2.Genre&colon.:ehp2.
    122 :p.The Genre of this track.
    123 
    124 :eul.
    125 
    126 :h1 res=020.Help for Ogg audio file
    127 :p.
    128 This file is an Ogg audio file. It may be played using MMOS/2
    129 after installing of MMIOVORB a free multimedia IO procedure.
    130 Ogg files contain comressed audio data similar to MP3 files.
    131 The compression is not lossless.
    132 :p.
    133 Get the IO procedure from
    134 :p.
    135 :link reftype=launch
    136 object='netscape.exe'
    137 data='http://www.math.berkeley.edu/~roconnor/'.
    138 http&colon.//www.math.berkeley.edu/~roconnor/:elink.
    139 
    140 
    141 :h1 res=030.Help for CD track
    142 :p.
    143 This object is a CD audio track. Track names and other info is
    144 queried from a FreeDB server if an internet connection is available.
    145 You have to specify your email address to use FreeDB. Use the configuration
    146 object to do so.
    147 :p.
    148 The user information is stored in the cddb.ini file in the installation directory.
    149 
    150 
    151 :h1 res=040.Help for M3U playlist
    152 :p.
    153 This object is a M3U playlist. An M3U playlist is a text file which contains
    154 paths to the tracks to be played. These playlists are used e.g. by portable
    155 MP3 players. An editor is available to modify M3U files using the mouse (drag and drop).
    156 
    157 :h1 res=050.Help for Audio stream
    158 :p.
    159 This object plays a stream from a streaming server on the internet.
    160 The URL for the server can be specified using the properties notebook.
     131
     132:p.The following information may be specified. The length of each field is
     133limited to 256 characters
     134
     135:hp2.
     136:table rules=both frame=box cols='10 40'.
     137:row.
     138:c.Field
     139:c.Description
     140:row.
     141:c.Name
     142:c.The name of the track.
     143:row.
     144:c.Artist
     145:c.The name of the artist.
     146:row.
     147:c.Album
     148:c.The album containing the track.
     149:row.
     150:c.Comment
     151:c.An arbitrary comment about the track.
     152:row.
     153:c.Year
     154:c.The 4-digit year in which the album was published.
     155:row.
     156:c.Genre
     157:c.The genre of this track; select from dropdown.
     158:etable.
     159:ehp2.
     160
     161.* ----------------------------------------------------------------------------
     162:h1 res=014.Audio details
     163:p.This page displays various technical details about the selected audio track.
     164
     165:p.The following read-only information is provided&colon.
     166
     167:hp2.
     168:table rules=both frame=box cols='20 40'.
     169:row.
     170:c.Detail
     171:c.Description
     172:row.
     173:c.Play time
     174:c.Recording length in mm&colon.ss.
     175:row.
     176:c.Sample rate
     177:c.For digital audio, this refers to the number of samples taken per second.
     178Generally, the higher the sample rate (sample frequency), the higher the quality
     179of the resulting audio stream.
     180:row.
     181:c.Bits per sample
     182:c.Bit depth of each sample. The greater the bit depth, the higher the quality of
     183the resulting audio stream. CD quality audio utilizes a 16-bit depth.
     184:row.
     185:c.Channels
     186:c.Number of audio channels in the file. Monaural audio contains a single
     187channel, stereo contains two, etc.
     188:etable.
     189:ehp2.
     190
     191.* ----------------------------------------------------------------------------
     192:h1 res=020.Ogg audio file
     193:p.This file is an Ogg audio file. It may be played using MMOS/2 when a suitable
     194Ogg MMIOProc has been installed. Ogg is actually a container format, and may
     195consist of audio (Vorbis or Opus format for lossy compressed audio, or FLAC or
     196OggPCM for lossless compressed audio) or video (Theora format, which is lossy).
     197
     198:p.The amount of loss in a Vorbis or Opus audio file may or may not be
     199acceptable. Usually, the amount may be controlled by the encoding tool. Once
     200encoded, however, it is not possible to restore the bits which have been
     201discarded without re-encoding the source file again with a lower degree of loss.
     202
     203:p.Ogg MMIOProcs for FLAC and Vorbis are included with ArcaOS 5.x and above.
     204Alternatively, these MMIOProcs are available in the MMAudio Pak 2 for OS/2&colon.
     205
     206:p.http&colon.//r6.ca/MMAudioPak/
     207
     208.* ----------------------------------------------------------------------------
     209:h1 res=030.CD audio track
     210:p.This file is a CD audio track. The track name and other info is queried from
     211a CDDB server if an internet connection is available. The information presented
     212here is read-only.
     213
     214:p.Most CDDB servers follow the FreeDB practice of requiring a valid email
     215address for access. Use the FreeDB Client configuration object in the Multimedia
     216folder to set this.
     217
     218:p.The user information is stored in the cddb.ini file in the installation
     219directory.
     220
     221.* ----------------------------------------------------------------------------
     222:h1 res=040.M3U playlist
     223:p.This file is an M3U (Moving Picture Experts Group Audio Layer 3 Uniform
     224Resource Locator) playlist. M3U is a :hp1.de facto:ehp1. standard, generally
     225recognized by most music players.
     226
     227:p.An M3U playlist is a text file which contains paths (URLs) to the tracks it
     228references.
     229
     230:p.To create a playlist, drag the M3U playlist template from the Multimedia
     231Templates folder to a suitable location on the desktop. Drag and drop media
     232files in the playlist container. To reorder, ensure that :hp1.Always maintain
     233sort order:ehp1. option on the :hp2.Sort:ehp2. submenu is deselected, as well
     234as any other sort options which might affect manual ordering, and drag and drop
     235the tracks as desired. Save the playlist by selecting :hp2.File | Save:ehp2.
     236from the menu.
     237
     238.* ----------------------------------------------------------------------------
     239:h1 res=050.Audio stream
     240:p.This object points to a stream provided by a streaming server on the LAN or
     241across the internet. The URL for the server is specified in the properties
     242notebook for the stream.
    161243
    162244:nt.
    163 Only Icecast server are supported. Servers using the shoutcast protocol won't work.
     245Only Icecast servers are supported. Servers using other protocols (Ampache,
     246SHOUTcast, QuickTime Broadcaster, Open Broadcast System, etc.) will not work.
    164247:ent.
    165248
    … …  
    168251:p.Specify the target audio file type and filename, including the full path.
    169252Source audio file details are displayed at the top of the dialog. Note that some
    170 fomats may be more lossy than others, and converting from a lossy format to a
     253formats may be more lossy than others, and converting from a lossy format to a
    171254less-lossy (or lossless) format will not restore original bits which may no
    172255longer be present in the (lossy) source file, and in some cases, may result in
    … …  
    175258:p.The dropdown will list available MMIOProcs (codecs) for the target file.
    176259
    177 :p.Press the :hp2.Convert:2hp2. button to begin the process, and
     260:p.Press the :hp2.Convert:ehp2. button to begin the process, and
    178261:hp2.Abort:ehp2. to cancel once conversion has begun. Press :hp2.Close:ehp2. to
    179262exit the dialog.
    180263
     264
     265.* ----------------------------------------------------------------------------
     266:h1 res=200.Image details
     267:p.This page displays various technical details about the selected image.
     268
     269:p.The following read-only information is provided&colon.
     270
     271:hp2.
     272:table rules=both frame=box cols='20 40'.
     273:row.
     274:c.Detail
     275:c.Description
     276:row.
     277:c.IOProc
     278:c.Identifies which MMIOProc is being used to render the image.
     279:row.
     280:c.Width
     281:c.Width in pixels of the image.
     282:row.
     283:c.Height
     284:c.Height in pixels of the image.
     285:row.
     286:c.Depth
     287:c.Number of colors (color depth) of the image.
     288:etable.
     289:ehp2.
     290
     291.* ----------------------------------------------------------------------------
     292:h1 res=210.Convert digital image
     293:p.Specify the target image file type and filename, including the full path.
     294A thumbnail of the source image file is displayed at the top of the dialog. Note
     295that some formats may be more lossy than others, and converting from a lossy
     296format to a less-lossy (or lossless) format will not restore original bits which
     297may no longer be present in the (lossy) source file, and in some cases, may
     298result in a converted file of lower quality than the lossy source.
     299
     300:p.The dropdown will list available MMIOProcs (codecs) for the target file.
     301
     302:p.Press the :hp2.Convert:ehp2. button to begin the process, and
     303:hp2.Abort:ehp2. to cancel once conversion has begun. Press :hp2.Close:ehp2. to
     304exit the dialog.
     305
    181306:euserdoc.
    182 

  • branches/v2.9_Lars/classes/idl/idl_image/wpimage.idl

    r49 r91  
    4141#include <somcls.idl>
    4242
    43 //typedef LHANDLE   HPAL;        /* hpal */
    4443typedef HPAL *PHPAL;
    4544

  • branches/v2.9_Lars/classes/makefile

    r74 r91  
    122122HLP_FILES       =       ./Help/de/cwmm049.hlp \
    123123                        ./Help/en/cwmm.hlp \
     124                        ./Help/es/cwmm034.hlp \
     125                        ./Help/fr/cwmm033.hlp \
    124126                        ./Help/nl/cwmm031.hlp \
    125127                        ./Help/it/cwmm039.hlp \
    … …  
    215217        cd ./Help/en && make
    216218
     219# Spanish
     220./Help/es/cwmm034.hlp:  ./Help/es/cwmm034.ipf
     221        cd ./Help/es && make
     222
     223# French
     224./Help/fr/cwmm033.hlp:  ./Help/fr/cwmm033.ipf
     225        cd ./Help/fr && make
     226
    217227# Dutch
    218228./Help/nl/cwmm031.hlp:  ./Help/nl/cwmm031.ipf
    … …  
    223233        cd ./Help/it && make
    224234
    225 # Traditional chinese (TW)
    226 ./Help/tw/cwmm088.hlp:  ./Help/tw/cwmm088.ipf
     235# Taiwan
     236./Help/tw/cwmm088.hlp:  ./Help/tw/cwmm088.ipf
    227237        cd ./Help/tw && make
    228238
    … …  
    314324        -cd ./Help/de && make clean
    315325        -cd ./Help/en && make clean
     326        -cd ./Help/es && make clean
     327        -cd ./Help/fr && make clean
    316328        -cd ./Help/nl && make clean
    317329        -cd ./Help/it && make clean
    … …  
    327339        -cd ./Help/de && make cleaner
    328340        -cd ./Help/en && make cleaner
     341        -cd ./Help/es && make cleaner
     342        -cd ./Help/fr && make cleaner
    329343        -cd ./Help/nl && make cleaner
    330344        -cd ./Help/it && make cleaner

  • branches/v2.9_Lars/classes/mm-progs/imageconverter/imgconv.c

    r88 r91  
    3737#define INCL_PM
    3838
     39#define USE_OS2_TOOLKIT_HEADERS
    3940#include <os2.h>
    4041
    … …  
    4647#include "os2me.h"
    4748#include "mmioos2.h"
     49#include <mmio.h>
    4850#include "common.h"
    4951#include "mmres.h"

  • branches/v2.9_Lars/classes/res/en/audioconv_en.dlg

    r2 r91  
    88            FCF_SYSMENU | FCF_TITLEBAR
    99    BEGIN
    10         GROUPBOX        "", IDGB_CONVERT, 3, 105, 203, 69
     10        GROUPBOX        "Source", IDGB_CONVERT, 3, 105, 203, 69
    1111        LTEXT           "Name:", IDST_CONVERTNAMELABEL, 7, 156, 32, 8
    1212        RTEXT           "", IDST_CONVERTNAME, 45, 156, 156, 8
    13         LTEXT           "? Hz", IDST_CONVERTSAMPLERATE, 7, 131, 91, 8
    14         LTEXT           "? Channels", IDST_CONVERTCHANNELS, 7, 120, 91, 8
    15         LTEXT           "", IDST_CONVERTCDBITS, 103, 142, 98, 8
     13        LTEXT           "Sample rate: ? Hz", IDST_CONVERTSAMPLERATE, 7, 131, 91, 8
     14        LTEXT           "Channels: ?", IDST_CONVERTCHANNELS, 7, 120, 91, 8
     15        LTEXT           "Bits per sample: ?", IDST_CONVERTCDBITS, 103, 142, 98, 8
    1616        LTEXT           "(CD: 44100 Hz)", IDST_CONVERTCDSAMPLELABEL, 103, 131,
    1717                        98, 8
    1818        LTEXT           "(CD: 2 Channels)", IDST_CONVERTCDCHANNELSLABEL, 103,
    1919                        120, 98, 8
    20         LTEXT           "Playtime: ?", IDST_CONVERTPLAYTIME, 7, 109, 161, 8
    21         GROUPBOX        "", IDGB_CONVERT2, 3, 19, 203, 85
     20        LTEXT           "Play time: ?", IDST_CONVERTPLAYTIME, 7, 109, 161, 8
     21        GROUPBOX        "Target", IDGB_CONVERT2, 3, 19, 203, 85
    2222        LTEXT           "Convert to:", 317, 7, 86, 86, 8
    2323        CONTROL         "", IDDD_IOPROC, 7, 28, 195, 54, WC_COMBOBOX,
    … …  
    2626
    2727        LTEXT           "Target name:", 2419, 7, 57, 64, 8
    28         ENTRYFIELD      "", IDEF_CONVERTTARGETNAME, 9, 45, 139, 8, ES_RIGHT |
    29                         ES_MARGIN
     28        ENTRYFIELD      "", IDEF_CONVERTTARGETNAME, 9, 45, 139, 8, ES_MARGIN
     29
    3030        PUSHBUTTON      "~Browse...", IDPB_CONVERTBROWSE, 153, 42, 47, 14
    3131        CONTROL         "", IDBAR_CONVERTPROGRESS, 6, 24, 194, 13,
    … …  
    3636    END
    3737END
    38 

  • branches/v2.9_Lars/classes/res/en/audioconv_en.rc

    r2 r91  
    77BEGIN
    88
    9 IDSTR_CONVERTCHANNELS    "%d Channels"
    10 IDSTR_CONVERTSAMPLERATE  "%d Hz"
    11 IDSTR_CONVERTPLAYTIME    "%d:%02d min playtime"
     9IDSTR_CONVERTCHANNELS    "Channels: %d"
     10IDSTR_CONVERTSAMPLERATE  "Sample rate: %d Hz"
     11IDSTR_CONVERTPLAYTIME    "Play time: %d:%02d"
    1212IDSTR_CONVERTDIALOGERROR "Can't load dialog template! Please check your installation."
    1313IDSTR_CONVERTNOSPACETITLE   "Convert to wave"
    … …  
    1717
    1818END
    19 
    20 

  • branches/v2.9_Lars/classes/res/en/cwaudio_en.dlg

    r2 r91  
    1111        PUSHBUTTON      "~Cancel", IDPB_CANCEL, 87, 1, 40, 14
    1212        PUSHBUTTON      "~Help", IDPB_ID3HELP, 130, 1, 40, 14, BS_HELP
    13         GROUPBOX        "ID3 Tags", IDGB_ID3TAGS, 6, 17, 202, 97
     13        GROUPBOX        "", IDGB_ID3TAGS, 6, 17, 202, 97
    1414        LTEXT           "Name:", 210, 9, 95, 57, 8
    1515        ENTRYFIELD      "", IDEF_ID3NAME, 73, 95, 127, 8, ES_MARGIN
    … …  
    3333            WS_VISIBLE | NOT WS_SAVEBITS
    3434    BEGIN
    35         GROUPBOX        "Audio info", IDGB_WAVEINFO, 6, 4, 154, 67, NOT
     35        GROUPBOX        "", IDGB_WAVEINFO, 6, 4, 154, 67, NOT
    3636                        WS_GROUP
    37         LTEXT           "Samplerate:", IDST_SAMPLERATELABEL, 17, 35, 76, 8
     37        LTEXT           "Sample rate:", IDST_SAMPLERATELABEL, 17, 35, 76, 8
    3838        LTEXT           "Bits per sample:", IDST_BPSLABEL, 17, 23, 76, 8
    3939        LTEXT           "Play time:", IDST_PLAYTIMELABEL, 17, 47, 76, 8
    … …  
    5151            WS_VISIBLE
    5252    BEGIN
    53         GROUPBOX        "Image Information", IDGB_IMAGEINFO, 6, 4, 154, 78,
     53        GROUPBOX        "", IDGB_IMAGEINFO, 6, 4, 154, 78,
    5454                        NOT WS_GROUP
    5555        LTEXT           "Width:", IDST_IMAGEWIDTHLABEL, 17, 35, 76, 8
    … …  
    7171        GROUPBOX        "URL", IDGB_STREAMURL, 6, 4, 154, 61, NOT WS_GROUP
    7272        ENTRYFIELD      "", IDEF_URL, 13, 23, 140, 8, ES_MARGIN
    73         LTEXT           "Enter URL to streaming server:", IDST_URLTEXT, 12,
     73        LTEXT           "Enter URL for streaming server:", IDST_URLTEXT, 12,
    7474                        37, 143, 8
    7575    END
    7676END
    77 

  • branches/v2.9_Lars/classes/res/en/cwaudio_en.rc

    r2 r91  
    3131MENU ID_MENU_EDITOR
    3232BEGIN
    33         MENUITEM "~Audioeditor", ID_MENU_EDITOR       
     33        MENUITEM "~Audio editor", ID_MENU_EDITOR       
    3434END
    3535
    … …  
    7171STRINGTABLE
    7272BEGIN
    73 ID_WAVEINFOPAGENAME "~Audio information"
    74 ID_ID3TAGSPAGENAME  "~ID3 Tags"
    75 ID_TRACKNAMEPAGENAME "~Track name"
    76 IDSTR_TRACKNAME      "Trackname"
     73ID_WAVEINFOPAGENAME "~Audio details"
     74ID_ID3TAGSPAGENAME  "~ID3 tag"
     75ID_TRACKNAMEPAGENAME "~Track meta"
     76IDSTR_TRACKNAME      ""
    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 

  • branches/v2.9_Lars/classes/res/en/cwimage_en.rc

    r2 r91  
    2626IDSTR_CWIMAGETITLE  "Digital image"
    2727
    28 IDSTR_IMAGEINFOPAGENAME "~Image information"
    29 IDSTR_SPRINTFPIXEL      "%d Pixel"
     28IDSTR_IMAGEINFOPAGENAME "~Image details"
     29IDSTR_SPRINTFPIXEL      "%d Pixels"
    3030IDSTR_SPRINTFBIT       "%d Bit"
    3131;Bitmpap load errors
    … …  
    4242
    4343;Titles used when starting player and editor applications
    44 IDSTR_IMGEDITORTITLE       "Imageviewer"
     44IDSTR_IMGEDITORTITLE       "Image viewer"
    4545IDSTR_MENU_IMAGEINFO        "Image information: %d x %d x %d"
    4646
    4747;IDSTR_HELPLIBRARY   "MMPARTS.HLP"
    4848END
    49 
    50 

  • branches/v2.9_Lars/classes/res/en/imageconv_en.dlg

    r2 r91  
    1313        CONTROL         "", IDSR_BMP, 12, 100, 185, 69, WC_STATIC,
    1414                        SS_FGNDRECT | WS_GROUP | WS_VISIBLE
    15         LTEXT           "Convert to", IDST_IMGCONVERTTO, 7, 88, 53, 8
     15        LTEXT           "Convert to:", IDST_IMGCONVERTTO, 7, 88, 53, 8
    1616        CONTROL         "", IDDD_IMGIOPROC, 6, 6, 196, 78, WC_COMBOBOX,
    1717                        CBS_DROPDOWNLIST | LS_HORZSCROLL | WS_GROUP |
    … …  
    2727    END
    2828END
    29 

  • branches/v2.9_Lars/classes/res/en/mmfind_en.rc

    r4 r91  
    1010IDSTR_AUDIOINFOTEXT   "Play time:\t%02d:%02d\x0a\x0aSamplerate:\t%d\x0a\x0aBits per sample:\t%d\x0a\x0aChannels:\t%d"
    1111IDSTR_NOMMTEMPLATEFLDRTITLE "Error during file creation"
    12 IDSTR_NOMMTEMPLATEFLDR "Multimedia template folder can't be found. It may has lost the object ID <MMPM2_MMTEMPLATEFOLDER>."
     12IDSTR_NOMMTEMPLATEFLDR "Multimedia template folder can't be found. It may have lost the object ID <MMPM2_MMTEMPLATEFOLDER>."
    1313END
Note: See TracChangeset for help on using the changeset viewer.