diff --git a/base/applications/cmdutils/reg/Pt.rc b/base/applications/cmdutils/reg/Pt.rc index 0de0e336149..dc2d11ace20 100644 --- a/base/applications/cmdutils/reg/Pt.rc +++ b/base/applications/cmdutils/reg/Pt.rc @@ -24,7 +24,7 @@ #pragma code_page(65001) -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/base/applications/cmdutils/reg/Uk.rc b/base/applications/cmdutils/reg/Uk.rc index 70c86f70cb9..d2c776a5832 100644 --- a/base/applications/cmdutils/reg/Uk.rc +++ b/base/applications/cmdutils/reg/Uk.rc @@ -31,10 +31,10 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" - STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" + STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <розділювач>] [/d дані] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" STRING_SUCCESS, "Операція успішно завершена\n" STRING_INVALID_KEY, "Помилка: неправильне ім'я ключа\n" STRING_INVALID_CMDLINE, "Помилка: неправильні параметри командного рядка\n" diff --git a/base/applications/cmdutils/xcopy/It.rc b/base/applications/cmdutils/xcopy/It.rc index 258cb3f4a7b..a3b742a14e1 100644 --- a/base/applications/cmdutils/xcopy/It.rc +++ b/base/applications/cmdutils/xcopy/It.rc @@ -31,10 +31,10 @@ STRINGTABLE STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" STRING_INVPARM, "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" STRING_PAUSE, "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY, "%d file(s) sarebbero copiati\n" - STRING_COPY, "%d file(s) copiati\n" + STRING_SIMCOPY, "%d file sarebbero copiati\n" + STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n" \ - "sull'obiettivo?\n" \ + "nell'obiettivo?\n" \ "(F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (Sì|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n" @@ -56,27 +56,27 @@ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Dove:\n\ \n\ -[/I] Assumi una cartella se la destinazione non esiste e sono copiati 2 o\n\ -\tpiù files\n\ +[/I] Assume una cartella se la destinazione non esiste e sono copiati 2 o\n\ +\tpiù file\n\ [/S] Copia le cartelle e le sottocartelle\n\ [/E] Copia le cartelle e le sottocartelle, includendo quelle vuote\n\ -[/Q] Non mostrare i nomi durante la copia, modalità silenziosa.\n\ +[/Q] Non mostra i nomi durante la copia, modalità silenziosa.\n\ [/F] Mostra i nomi completi della sorgente e della destinazione durante la copia\n\ [/L] Simula l'operazione, mostrando i nome che sarebbero copiati\n\ -[/W] Prompts before beginning the copy operation\n\ +[/W] Richiede prima di iniziare l'operazione di copia\n\ [/T] Crea la struttura di cartelle vuote ma non copia i files\n\ [/Y] Disabilita le conferme quando sono sovrascritti files\n\ [/-Y] Abilita le conferme quando sono sovrascritti files\n\ [/P] Chiede conferma per ogni file sorgente prima di copiare\n\ -[/N] Copia usando gli short names\n\ +[/N] Copia usando i nomi abbreviati\n\ [/U] Copia solo files che sono già presenti nella destinazione\n\ -[/R] Sovrascrivi ogni file che abbia l'attributo Sola Lettura\n\ -[/H] Includi files nascosti e di sistema nella copia\n\ +[/R] Sovrascrive ogni file che abbia l'attributo Sola Lettura\n\ +[/H] Include i file nascosti e di sistema nella copia\n\ [/C] Continua anche se accade un errore durante la copia\n\ -[/A] Copia solo files che abbiano l'attributo Archivio\n\ -[/M] Copia solo files che abbiano l'attributo Archivio, rimuovendo\n\ +[/A] Copia solo i file che abbiano l'attributo Archivio\n\ +[/M] Copia solo i file che abbiano l'attributo Archivio, rimuovendo\n\ \tl'attributo\n\ -[/D | /D:m-g-a] Copia i nuovi files o quelli modificati dopo la data fornita.\n\ +[/D | /D:m-g-a] Copia i nuovi file o quelli modificati dopo la data fornita.\n\ \t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\ \t\tdella sorgente\n\n" diff --git a/base/applications/cmdutils/xcopy/Ko.rc b/base/applications/cmdutils/xcopy/Ko.rc index 6a5071cae86..2d32095502e 100644 --- a/base/applications/cmdutils/xcopy/Ko.rc +++ b/base/applications/cmdutils/xcopy/Ko.rc @@ -3,7 +3,7 @@ * Korean language support * * Copyright (C) 2007 J. Edmeades - * Copyright (C) 2007 YunSong Hwang(hys545@dreamwiz.com) + * Copyright (C) 2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,8 +54,8 @@ XCOPY \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] ʴ 丮 ϰ ΰ \n\ +\ \n\ [/S] 丮ϰ 丮 \n\ [/E] 丮 ؼ 丮 丮 \n\ [/Q] ϰ Ǵ ̳ 丮 ǥ ʰ .\n\ @@ -73,7 +73,7 @@ Where:\n\ [/C] ϴ ȿ ߻ص \n\ [/A] Ӽ Ǿִ ϸ \n\ [/M] Ӽ ϸ鼭 Ӽ Ǿִ\n\ -\ϸ \n\ +\ ϸ \n\ [/D | /D:m-d-y] ¥ Ŀ ǰų ο .\n\ \t\tI  ¥ , \n\ \t\t ͸ \n\n" diff --git a/base/applications/cmdutils/xcopy/Pt.rc b/base/applications/cmdutils/xcopy/Pt.rc index d8254d5e1fb..f8f70c317ad 100644 --- a/base/applications/cmdutils/xcopy/Pt.rc +++ b/base/applications/cmdutils/xcopy/Pt.rc @@ -3,6 +3,7 @@ * Portuguese language support * * Copyright (C) 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,21 +22,81 @@ #include "xcopy.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE { - STRING_INVPARMS, "Nmero de parmetros invlido - Use xcopy /? para ajuda\n" - STRING_INVPARM, "Parmetro invlido '%s' - Use xcopy /? para ajuda\n" - STRING_PAUSE, "Carregue para iniciar cpia\n" - STRING_SIMCOPY, "%d ficheiro(s) seriam copiados\n" - STRING_COPY, "%d ficheiro(s) copiados\n" - STRING_QISDIR, "'%s' um ficheiro ou directrio\n" \ + STRING_INVPARMS, "Número de parâmetros inválido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Pressione para iniciar a cópia\n" + STRING_SIMCOPY, "%d arquivo(s) seriam copiado(s)\n" + STRING_COPY, "%d arquivo(s) copiado(s)\n" + STRING_QISDIR, "'%s' é um arquivo ou diretório\n" \ "no alvo?\n" \ - "(F - Ficheiro, D - Directrio)\n" + "(A - Arquivo, D - Directório)\n" + STRING_SRCPROMPT,"%s? (Sim|Não)\n" + STRING_OVERWRITE,"Reescrever %s? (Sim|Não|Tudo)\n" + STRING_COPYFAIL, "Falha ao copiar '%s' para '%s' com r/c %d\n" + STRING_OPENFAIL, "Falha ao abrir '%s'\n" + STRING_READFAIL, "Falha a ler '%s'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copia arquivos ou diretórios para um destino\n\ +\n\ +Sintaxe:\n\ +XCOPY fonte [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Onde:\n\ +\n\ +[/I] Assume diretório se o destino não existe e está copiando 2 ou\n\ +\tmais arquivos\n\ +[/S] Copiar diretórios e subdiretórios\n\ +[/E] Copiar diretórios e subdiretórios, incluindo os vazios\n\ +[/Q] Não mostrar nomes durante a cópia, ie modo silencioso.\n\ +[/F] Mostrar por completo os nomes de fonte e destino durante a cópia\n\ +[/L] Simular a operação, mostrando os nomes que seriam copiados\n\ +[/W] Alerta antes de iniciar a operação de cópia\n\ +[/T] Cria a estrutura de diretórios mas não copia arquivos\n\ +[/Y] Omitir alertas ao sobrescrever arquivos\n\ +[/-Y] Alertar ao sobrescrever arquivos\n\ +[/P] Alertar antes de cada arquivo ser copiado\n\ +[/N] Copiar usando nomes pequenos\n\ +[/U] Copiar apenas arquivos que já existem no destino\n\ +[/R] Reescrever quaisquer arquivos de somente leitura\n\ +[/H] Incluir arquivos ocultos e de sistema na cópia\n\ +[/C] Continuar mesmo que ocorra um erro durante a cópia\n\ +[/A] Copiar apenas arquivos com atributo de arquivo\n\ +[/M] Copiar apenas arquivos com atributo de arquivo, removendo\n\ +\to atributo de arquivo\n\ +[/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data fornecida\n\ +\t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ +\t\tfor mais antigo que a fonte\n\n" + +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ + STRING_INVPARMS, "Número de parâmetros inválido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Carregue para iniciar cópia\n" + STRING_SIMCOPY, "%d ficheiro(s) seriam copiado(s)\n" + STRING_COPY, "%d ficheiro(s) copiado(s)\n" + STRING_QISDIR, "'%s' é um ficheiro ou directório\n" \ + "no alvo?\n" \ + "(F - Ficheiro, D - Directório)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" - STRING_COPYFAIL, "Cpia de '%s' para '%s' falhou com r/c %d\n" + STRING_COPYFAIL, "Cópia de '%s' para '%s' falhou com r/c %d\n" STRING_OPENFAIL, "Falhou ao abrir '%s'\n" STRING_READFAIL, "Falhou a ler '%s'\n" STRING_YES_CHAR, "Y" @@ -45,7 +106,7 @@ STRINGTABLE STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - Copia ficheiros ou directrios para um destino\n\ +"XCOPY - Copia ficheiros ou directórios para um destino\n\ \n\ Sintaxe:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ @@ -53,28 +114,28 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Onde:\n\ \n\ -[/I] Assume directrio se o destino no existe e est a copiar 2 ou\n\ +[/I] Assume directório se o destino não existe e está a copiar 2 ou\n\ \tmais ficheiros\n\ -[/S] Copiar directrios e subdirectrios\n\ -[/E] Copiar directrios e subdirectrios, incluindo os vazios\n\ -[/Q] No mostrar nomes durante a cpia, ie quiet.\n\ -[/F] Mostrar por completo os nomes de fonte e destino durante a cpia\n\ -[/L] Simular a operao, mostrando os nomes que seriam copiados\n\ -[/W] Alerta antes de iniciar a operao de cpia\n\ -[/T] Cria a estrutura de directrios mas no copia ficheiros\n\ +[/S] Copiar directórios e subdirectórios\n\ +[/E] Copiar directórios e subdirectórios, incluindo os vazios\n\ +[/Q] Não mostrar nomes durante a cópia, ie quiet.\n\ +[/F] Mostrar por completo os nomes de fonte e destino durante a cópia\n\ +[/L] Simular a operação, mostrando os nomes que seriam copiados\n\ +[/W] Alerta antes de iniciar a operação de cópia\n\ +[/T] Cria a estrutura de directórios mas não copia ficheiros\n\ [/Y] Suprimir alertas quando reescreve ficheiros\n\ [/-Y] Alertar quando reescreve ficheiros\n\ -[/P] Alertar antes de cada ficheiros ser copiado\n\ +[/P] Alertar antes de cada ficheiro ser copiado\n\ [/N] Copiar usando nomes pequenos\n\ -[/U] Copiar apenas ficheiros que j existem no destino\n\ +[/U] Copiar apenas ficheiros que já existem no destino\n\ [/R] Reescrever quaisquer ficheiros apenas de leitura\n\ -[/H] Incluir ficheiros ocultos e de sistema na cpia\n\ -[/C] Continuar mesmo que ocorra um erro durante a cpia\n\ +[/H] Incluir ficheiros ocultos e de sistema na cópia\n\ +[/C] Continuar mesmo que ocorra um erro durante a cópia\n\ [/A] Copiar apenas ficheiros com atributo de arquivo\n\ [/M] Copiar apenas ficheiros com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ -[/D | /D:m-d-y] Copiar novos ficheiros ou os alterados aps a data fornecida\n\ -\t\tSe nenhuma data for fornecida, apenas copiar se o destino for mais antigo\n\ -\t\tque a fonte\n\n" +[/D | /D:m-d-y] Copiar novos ficheiros ou os alterados após a data fornecida\n\ +\t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ +\t\tfor mais antigo que a fonte\n\n" } diff --git a/base/applications/cmdutils/xcopy/Uk.rc b/base/applications/cmdutils/xcopy/Uk.rc index 6d59e1bfac6..eb0ec1fe57d 100644 --- a/base/applications/cmdutils/xcopy/Uk.rc +++ b/base/applications/cmdutils/xcopy/Uk.rc @@ -34,8 +34,7 @@ STRINGTABLE STRING_PAUSE, "Натисніть щоб почати копіювання\n" STRING_SIMCOPY, "%d файл(ів) буде скопійовано\n" STRING_COPY, "%d файл(ів) скопійовано\n" - STRING_QISDIR, "'%s' є файлом чи директорією\n" \ - "on the target?\n" \ + STRING_QISDIR, "'%s' є файлом чи директорією?\n" \ "(F - Файл, D - Директорія)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n" @@ -51,34 +50,34 @@ STRINGTABLE STRING_HELP, "XCOPY - Копіює файли та дерева директорій за призначенням\n\ \n\ -Syntax:\n\ +Синтаксис:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Where:\n\ +Де:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] Якщо кінцева папка відсутня і копіюється бiльше одного файлу,\n\ +\tто припускається, що мiсце призначення є папкою\n\ [/S] Копіює директорії та піддиректорії\n\ [/E] Копіює директорії та піддиректорії, включно з порожніми\n\ -[/Q] Do not list names during copy, ie quiet.\n\ +[/Q] Не відображає імена файлів під час копіювання.\n\ [/F] Під час копіювання відображає повні імена початкових і кінцевих файлів\n\ -[/L] Simulate operation, showing names which would be copied\n\ +[/L] Виводить список файлів, які будуть скопійовані\n\ [/W] Питає підтвердження перед початком копіювання\n\ [/T] Створює структуру каталогів але не копіює файли\n\ -[/Y] Suppress prompting when overwriting files\n\ +[/Y] Придушує запит на підтвердження перезапису файлів\n\ [/-Y] Питає підтвердження на перезапис файлів\n\ -[/P] Prompts on each source file before copying\n\ +[/P] Питає підтвердження для кожного копійованого файлу\n\ [/N] Копіює, використовуючи короткі імена\n\ -[/U] Copy only files which already exist in destination\n\ +[/U] Копіює лише ті файли, як вже iснують в кінцевій папці\n\ [/R] Перезаписує файли, доступні лише для читання\n\ -[/H] Include hidden and system files in the copy\n\ -[/C] Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\ +[/H] Копіює також приховані та системні файли\n\ +[/C] Продовжує роботу, навіть якщо при копіюванні сталася помилка\n\ [/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ [/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ \властивість АРХІВНИЙ\n\ -[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\ -\t\tЯкщо дата не вказана, only copy if destination is older\n\ -\t\tthan source\n\n" +[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної\n\ +дати. Якщо дата не вказана, копіює лише ті файли, які новіші\n\ +в початковій папці\n\n" } diff --git a/base/applications/cmdutils/xcopy/rsrc.rc b/base/applications/cmdutils/xcopy/rsrc.rc index 06a61dbca3e..60fa9083732 100644 --- a/base/applications/cmdutils/xcopy/rsrc.rc +++ b/base/applications/cmdutils/xcopy/rsrc.rc @@ -31,7 +31,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Ko.rc" #include "No.rc" #include "Pl.rc" -#include "Pt.rc" /* UTF-8 */ #include "De.rc" @@ -40,6 +39,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Ja.rc" #include "Lt.rc" #include "Nl.rc" +#include "Pt.rc" #include "Ro.rc" #include "Ru.rc" #include "Si.rc" diff --git a/base/applications/rapps/rapps/firefox36.txt b/base/applications/rapps/rapps/firefox36.txt index 382c3cfd31f..52168fc91b8 100644 --- a/base/applications/rapps/rapps/firefox36.txt +++ b/base/applications/rapps/rapps/firefox36.txt @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.6 +Version = 3.6.7 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/en-US/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/en-US/Firefox%20Setup%203.6.7.exe CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Webbrowser. Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/de/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/de/Firefox%20Setup%203.6.7.exe [Section.040a] Description = El más popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/es-ES/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/es-ES/Firefox%20Setup%203.6.7.exe [Section.0414] Description = Mest populære og best også gratis nettleserene der ute. Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/nb-NO/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/nb-NO/Firefox%20Setup%203.6.7.exe [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych. Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/pl/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/pl/Firefox%20Setup%203.6.7.exe [Section.0419] Description = Один из самых популярных и лучших бесплатных браузеров. Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/ru/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/ru/Firefox%20Setup%203.6.7.exe [Section.0422] Description = Найпопулярніший та один з кращих безплатних веб-браузерів. Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/uk/Firefox%20Setup%203.6.6.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.7/win32/uk/Firefox%20Setup%203.6.7.exe diff --git a/base/applications/rapps/rapps/kdewin.txt b/base/applications/rapps/rapps/kdewin.txt index b12ebedb53f..f0bd4ecd08c 100644 --- a/base/applications/rapps/rapps/kdewin.txt +++ b/base/applications/rapps/rapps/kdewin.txt @@ -2,13 +2,13 @@ [Section] Name = K Desktop Environment -Version = 0.9.6-5 +Version = 0.9.7-0 Licence = GPL Description = KDE for Windows. Size = 2.0MB Category = 15 URLSite = http://www.winkde.org/ -URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.6-5.exe +URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.7-0.exe CDPath = none [Section.0407] diff --git a/base/applications/rapps/rapps/mirandaim.txt b/base/applications/rapps/rapps/mirandaim.txt index 1c9f24de097..b387bb9ba2f 100644 --- a/base/applications/rapps/rapps/mirandaim.txt +++ b/base/applications/rapps/rapps/mirandaim.txt @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.26 +Version = 0.8.27 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.8MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.26-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.27-unicode.exe CDPath = none [Section.0407] diff --git a/base/applications/rapps/rapps/mono2.txt b/base/applications/rapps/rapps/mono2.txt index 8a3427b4be9..6de2539031c 100644 --- a/base/applications/rapps/rapps/mono2.txt +++ b/base/applications/rapps/rapps/mono2.txt @@ -2,13 +2,13 @@ [Section] Name = Mono .net Development Framework -Version = 2.6.4 +Version = 2.6.7 Licence = Unknown Description = Open Source .net Framework. -Size = 71MB +Size = 72MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.4/windows-installer/3/mono-2.6.4-gtksharp-2.12.10-win32-3.exe +URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.7/windows-installer/2/mono-2.6.7-gtksharp-2.12.10-win32-2.exe CDPath = none [Section.0422] diff --git a/base/applications/rapps/rapps/opera.txt b/base/applications/rapps/rapps/opera.txt index 94ab020b263..0701b776196 100644 --- a/base/applications/rapps/rapps/opera.txt +++ b/base/applications/rapps/rapps/opera.txt @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 10.54 +Version = 10.60 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. -Size = 12.5M +Size = 12.7M Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://get4.opera.com/pub/opera/win/1054/int/Opera_1054_int_Setup.exe +URLDownload = http://get4.opera.com/pub/opera/win/1060/int/Opera_1060_int_Setup.exe CDPath = none [Section.0407] diff --git a/base/applications/rapps/rapps/rosbeamd64.txt b/base/applications/rapps/rapps/rosbeamd64.txt index 1c84f548256..88b8d6b9707 100644 --- a/base/applications/rapps/rapps/rosbeamd64.txt +++ b/base/applications/rapps/rapps/rosbeamd64.txt @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment AMD64 Addon -Version = 1.3 +Version = 1.4b Licence = GPL Description = Allows you to build the ReactOS AMD64 Source. For more instructions see ReactOS wiki. -Size = 15.8MB +Size = 15.4MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE64-1.3.exe +URLDownload = http://dreimer.bplaced.net/rosbe/RosBE64-1.4b.exe CDPath = none [Section.0407] diff --git a/base/applications/rapps/rapps/seamonkey.txt b/base/applications/rapps/rapps/seamonkey.txt index 1c2951b9ce3..e73790a437e 100644 --- a/base/applications/rapps/rapps/seamonkey.txt +++ b/base/applications/rapps/rapps/seamonkey.txt @@ -2,36 +2,36 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0.4 +Version = 2.0.6 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 10.1MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/en-US/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/en-US/SeaMonkey%20Setup%202.0.6.exe CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen. Size = 10.0MB -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/de/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/de/SeaMonkey%20Setup%202.0.6.exe [Section.040a] Description = La suite de Mozilla está viva. Es el primero y único navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarás. Size = 10.0MB -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/es-ES/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/es-ES/SeaMonkey%20Setup%202.0.6.exe [Section.0415] Description = Pakiet Mozilla żyje. W zestawie: przeglądarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 10.8MB -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/pl/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/pl/SeaMonkey%20Setup%202.0.6.exe [Section.0419] Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор. Size = 10.4MB -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/ru/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/ru/SeaMonkey%20Setup%202.0.6.exe [Section.0422] Description = Mozilla Suite повернувся. Пакет містить в собі браузер, поштовий клієнт, IRC-клієнт та HTML-редактор. Size = 10.4MB -URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/ru/SeaMonkey%20Setup%202.0.4.exe +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.6/win32/ru/SeaMonkey%20Setup%202.0.6.exe diff --git a/base/applications/rapps/rapps/thunderbird.txt b/base/applications/rapps/rapps/thunderbird.txt index d68d140c174..86fefbf871a 100644 --- a/base/applications/rapps/rapps/thunderbird.txt +++ b/base/applications/rapps/rapps/thunderbird.txt @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1 +Version = 3.1.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/en-US/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/en-US/Thunderbird%20Setup%203.1.1.exe CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Mail-Clients. Size = 8.9M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/de/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/de/Thunderbird%20Setup%203.1.1.exe [Section.040a] Description = El más popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/es-ES/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/es-ES/Thunderbird%20Setup%203.1.1.exe [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/pl/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/pl/Thunderbird%20Setup%203.1.1.exe [Section.0419] Description = Один из самых популярных и лучших бесплатных почтовых клиентов. Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/ru/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/ru/Thunderbird%20Setup%203.1.1.exe [Section.0422] Description = Найпопулярніший та один з кращих поштових клієнтів. Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/uk/Thunderbird%20Setup%203.1.exe +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/win32/uk/Thunderbird%20Setup%203.1.1.exe diff --git a/base/applications/rapps/rapps/utorrent.txt b/base/applications/rapps/rapps/utorrent.txt index 8e721644c5e..80a4bd52bb9 100644 --- a/base/applications/rapps/rapps/utorrent.txt +++ b/base/applications/rapps/rapps/utorrent.txt @@ -2,13 +2,13 @@ [Section] Name = µTorrent -Version = 2.0.2 +Version = 2.0.3 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 315K +Size = 320K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/2.0.2/utorrent.exe +URLDownload = http://download.utorrent.com/2.0.3/utorrent.exe CDPath = none diff --git a/base/applications/rapps/rapps/vlc.txt b/base/applications/rapps/rapps/vlc.txt index 4f155e6f0cf..514f36a601d 100644 --- a/base/applications/rapps/rapps/vlc.txt +++ b/base/applications/rapps/rapps/vlc.txt @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.1.0 +Version = 1.1.1 Licence = GPL Description = A media player. Size = 18.6MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.0/win32/vlc-1.1.0-win32.exe +URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.1/win32/vlc-1.1.1-win32.exe CDPath = none [Section.0407] diff --git a/base/applications/winhlp32/Bg.rc b/base/applications/winhlp32/Bg.rc index e6d3143db24..ee9c07bbe71 100644 --- a/base/applications/winhlp32/Bg.rc +++ b/base/applications/winhlp32/Bg.rc @@ -20,9 +20,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&" { MENUITEM "&", MNID_FILE_OPEN @@ -68,7 +70,7 @@ MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE " STID_WHERROR, "" @@ -83,5 +85,4 @@ STID_ALL_FILES, " STID_HELP_FILES_HLP, " (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Cs.rc b/base/applications/winhlp32/Cs.rc index a8f8db31a26..7b89d24dc3c 100644 --- a/base/applications/winhlp32/Cs.rc +++ b/base/applications/winhlp32/Cs.rc @@ -23,11 +23,13 @@ #include "winhelp_res.h" +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + /* Czech strings in CP1250 */ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Soubor" { MENUITEM "&Otevt", MNID_FILE_OPEN @@ -73,7 +75,7 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "Npovda WINE" STID_WHERROR, "CHYBA" @@ -88,5 +90,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "Soubory npovdy (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Da.rc b/base/applications/winhlp32/Da.rc index 20e3331bd51..4db0268522e 100644 --- a/base/applications/winhlp32/Da.rc +++ b/base/applications/winhlp32/Da.rc @@ -74,7 +74,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -82,7 +82,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Søg" @@ -91,7 +91,7 @@ CAPTION "Søg" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Wine Hjælp" STID_WHERROR, "FEJL" @@ -106,7 +106,6 @@ STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" -STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU diff --git a/base/applications/winhlp32/De.rc b/base/applications/winhlp32/De.rc index 2e14f70ad84..a5d2e3c8190 100644 --- a/base/applications/winhlp32/De.rc +++ b/base/applications/winhlp32/De.rc @@ -21,11 +21,13 @@ #include "winhelp_res.h" +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + #pragma code_page(65001) /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Datei" { MENUITEM "Ö&ffnen...", MNID_FILE_OPEN @@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -78,7 +80,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Suche" @@ -88,7 +90,7 @@ CAPTION "Suche" /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE { STID_WINE_HELP, "WINE Hilfe" STID_WHERROR, "FEHLER" @@ -106,7 +108,7 @@ STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Br STID_PSH_INDEX, "Hilfethemen: " } -CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/En.rc b/base/applications/winhlp32/En.rc index a4e9d8add4e..7526d1c71ed 100644 --- a/base/applications/winhlp32/En.rc +++ b/base/applications/winhlp32/En.rc @@ -23,7 +23,9 @@ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Open", MNID_FILE_OPEN @@ -68,7 +70,9 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } } -MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Open", MNID_FILE_OPEN @@ -113,7 +117,9 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -121,7 +127,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Search" @@ -130,7 +136,7 @@ CAPTION "Search" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "Wine Help" STID_WHERROR, "ERROR" @@ -148,7 +154,7 @@ STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" STID_PSH_INDEX, "Help topics: " } -CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN @@ -171,7 +177,9 @@ BEGIN END END -CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Es.rc b/base/applications/winhlp32/Es.rc index 745cac62692..f39ddbde6b9 100644 --- a/base/applications/winhlp32/Es.rc +++ b/base/applications/winhlp32/Es.rc @@ -22,9 +22,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Archivo" { MENUITEM "A&brir...", MNID_FILE_OPEN @@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "ndice" @@ -77,7 +79,7 @@ CAPTION " LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Buscar" @@ -86,7 +88,7 @@ CAPTION "Buscar" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE { STID_WINE_HELP, "Ayuda de WINE" STID_WHERROR, "ERROR" diff --git a/base/applications/winhlp32/Fi.rc b/base/applications/winhlp32/Fi.rc index 5585619e4ed..bb6b7848153 100644 --- a/base/applications/winhlp32/Fi.rc +++ b/base/applications/winhlp32/Fi.rc @@ -22,9 +22,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Tiedosto" { MENUITEM "&Avaa...", MNID_FILE_OPEN @@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE Ohje" STID_WHERROR, "VIRHE" @@ -86,5 +88,4 @@ STID_ALL_FILES, "Kaikki tiedostot (*.*)" STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Fr.rc b/base/applications/winhlp32/Fr.rc index cedb0f694b7..4178810588c 100644 --- a/base/applications/winhlp32/Fr.rc +++ b/base/applications/winhlp32/Fr.rc @@ -22,6 +22,8 @@ #include "winhelp_res.h" +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + /* UTF-8 */ #pragma code_page(65001) @@ -74,7 +76,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -82,7 +84,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Recherche" @@ -91,7 +93,7 @@ CAPTION "Recherche" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE { STID_WINE_HELP, "Aide de Wine" STID_WHERROR, "ERREUR" diff --git a/base/applications/winhlp32/Hu.rc b/base/applications/winhlp32/Hu.rc index ef3a1ee2bc3..4fccbebccd2 100644 --- a/base/applications/winhlp32/Hu.rc +++ b/base/applications/winhlp32/Hu.rc @@ -22,9 +22,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Fjl" { MENUITEM "&Megnyits...", MNID_FILE_OPEN @@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE sg" STID_WHERROR, "HIBA" @@ -86,5 +88,4 @@ STID_ALL_FILES, "Minden f STID_HELP_FILES_HLP, "Sg fjlok (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/It.rc b/base/applications/winhlp32/It.rc index 44b2481e319..b146b1009c1 100644 --- a/base/applications/winhlp32/It.rc +++ b/base/applications/winhlp32/It.rc @@ -21,11 +21,13 @@ #include "winhelp_res.h" +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + #pragma code_page(65001) /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Apri...", MNID_FILE_OPEN @@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indice" @@ -78,7 +80,7 @@ CAPTION "Indice" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Cerca" @@ -87,7 +89,7 @@ CAPTION "Cerca" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +STRINGTABLE { STID_WINE_HELP, "Guida di WINE" STID_WHERROR, "ERRORE" @@ -105,7 +107,7 @@ STID_NO_RICHEDIT "Non è stato possibile trovare un'implementazione richedit... STID_PSH_INDEX, "Argomenti di aiuto: " } -CONTEXT_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Ja.rc b/base/applications/winhlp32/Ja.rc index b73d18dd192..8d3f3542575 100644 --- a/base/applications/winhlp32/Ja.rc +++ b/base/applications/winhlp32/Ja.rc @@ -21,12 +21,14 @@ #include "winhelp_res.h" +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + /* UTF-8 */ #pragma code_page(65001) /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "ファイル(&F)" { MENUITEM "開く(&O)", MNID_FILE_OPEN @@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "索引" @@ -79,7 +81,7 @@ CAPTION "索引" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "検索" @@ -88,7 +90,7 @@ CAPTION "検索" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE ヘルプ" STID_WHERROR, "エラー" @@ -106,7 +108,7 @@ STID_NO_RICHEDIT "リッチエディット実装が見つかりません... 終 STID_PSH_INDEX, "ヘルプ トピック: " } -CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Ko.rc b/base/applications/winhlp32/Ko.rc index 8b4c785ed0c..e4eff0ba0b3 100644 --- a/base/applications/winhlp32/Ko.rc +++ b/base/applications/winhlp32/Ko.rc @@ -21,9 +21,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "(&F)" { MENUITEM "(&O)...", MNID_FILE_OPEN @@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "ε" @@ -77,7 +79,7 @@ CAPTION " LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "ã" @@ -87,7 +89,7 @@ CAPTION "ã /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "Wine " STID_WHERROR, "" @@ -105,7 +107,7 @@ STID_NO_RICHEDIT "richedit STID_PSH_INDEX, " : " } -CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Lt.rc b/base/applications/winhlp32/Lt.rc index f8e78681aae..b6ee9c792fb 100644 --- a/base/applications/winhlp32/Lt.rc +++ b/base/applications/winhlp32/Lt.rc @@ -72,7 +72,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indeksas" @@ -80,7 +80,7 @@ CAPTION "Indeksas" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Paieška" @@ -89,7 +89,7 @@ CAPTION "Paieška" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Wine žinynas" STID_WHERROR, "KLAIDA" diff --git a/base/applications/winhlp32/Nl.rc b/base/applications/winhlp32/Nl.rc index 9294856e7dd..228667df4ba 100644 --- a/base/applications/winhlp32/Nl.rc +++ b/base/applications/winhlp32/Nl.rc @@ -72,7 +72,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -80,7 +80,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Zoeken" @@ -89,7 +89,7 @@ CAPTION "Zoeken" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Wine Help" STID_WHERROR, "FOUT" diff --git a/base/applications/winhlp32/No.rc b/base/applications/winhlp32/No.rc index 2cf2a782372..141ad3a1b84 100644 --- a/base/applications/winhlp32/No.rc +++ b/base/applications/winhlp32/No.rc @@ -20,9 +20,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +MAIN_MENU MENU { POPUP "&Fil" { MENUITEM "&pne", MNID_FILE_OPEN @@ -67,7 +69,7 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Innhold" @@ -75,7 +77,7 @@ CAPTION "Innhold" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Sk" @@ -84,7 +86,7 @@ CAPTION "S } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STRINGTABLE { STID_WINE_HELP, "Hjelp" STID_WHERROR, "FEIL" @@ -102,7 +104,7 @@ STID_NO_RICHEDIT "Klarte ikke finne richedit; avbryter" STID_PSH_INDEX, "Emner i Hjelp: " } -CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Pl.rc b/base/applications/winhlp32/Pl.rc index f549b25de60..2a561f2c0b8 100644 --- a/base/applications/winhlp32/Pl.rc +++ b/base/applications/winhlp32/Pl.rc @@ -72,7 +72,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indeks" @@ -80,7 +80,7 @@ CAPTION "Indeks" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Szukaj" @@ -89,7 +89,7 @@ CAPTION "Szukaj" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "WINE - Pomoc" STID_WHERROR, "BD" diff --git a/base/applications/winhlp32/Pt.rc b/base/applications/winhlp32/Pt.rc index 28933a22a6f..4b62a5fbb19 100644 --- a/base/applications/winhlp32/Pt.rc +++ b/base/applications/winhlp32/Pt.rc @@ -8,6 +8,7 @@ * Copyright 2003 Marcelo Duarte * Copyright 2004,2007 Américo José Melo * Copyright 2009 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -50,21 +51,21 @@ MAIN_MENU MENU POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opções" { + POPUP "Ajuda sempre visível" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Padrão", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visível", MNID_OPTS_HELP_VISIBLE + MENUITEM "Invisível", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Histórico", MNID_OPTS_HISTORY + POPUP "Fontes" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeno", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usar cores do sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON @@ -72,7 +73,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Sobre WINE", MNID_HELP_WINE + MENUITEM "&Sobre o WINE", MNID_HELP_WINE #endif } } @@ -124,7 +125,9 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Índice" @@ -132,7 +135,7 @@ CAPTION "Índice" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Procura" @@ -144,7 +147,7 @@ CAPTION "Procura" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" @@ -153,18 +156,18 @@ STID_INFO, "Informação" STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" STID_INDEX, "&Conteúdo" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Sumário" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os arquivos (*.*)" STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este arquivo você mesmo?" +STID_NO_RICHEDIT "Não foi possível encontrar uma implementação do richedit... Abortando" +STID_PSH_INDEX, "Tópicos de ajuda: " } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" @@ -182,7 +185,36 @@ STID_NO_RICHEDIT "Não foi possível encontrar uma implementação do richedit.. STID_PSH_INDEX, "Tópicos de ajuda: " } -CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Anotação...", MNID_CTXT_ANNOTATE + MENUITEM "Copiar", MNID_CTXT_COPY + MENUITEM "Imprimir...", MNID_CTXT_PRINT + POPUP "Fontes" + BEGIN + MENUITEM "Pequeno", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajuda sempre visível" + BEGIN + MENUITEM "Padrão", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visível", MNID_CTXT_HELP_VISIBLE + MENUITEM "Invisível", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS + END +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Rm.rc b/base/applications/winhlp32/Rm.rc index 3b2a1fa9403..a5462b87a32 100644 --- a/base/applications/winhlp32/Rm.rc +++ b/base/applications/winhlp32/Rm.rc @@ -22,6 +22,8 @@ #include "winhelp_res.h" +LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT + #pragma code_page(65001) /* FIXME: This file is in the Vallader Romansh dialect and not in the @@ -29,7 +31,7 @@ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Datoteca" { MENUITEM "&Rivir", MNID_FILE_OPEN @@ -75,7 +77,7 @@ MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE ag�d" STID_WHERROR, "SBAGL" @@ -90,5 +92,4 @@ STID_ALL_FILES, "Tuot las datotecas (*.*)" STID_HELP_FILES_HLP, "Datotecas d'ag�d (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Ro.rc b/base/applications/winhlp32/Ro.rc index 1f916ac21d5..845b1cc5754 100644 --- a/base/applications/winhlp32/Ro.rc +++ b/base/applications/winhlp32/Ro.rc @@ -73,7 +73,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -81,7 +81,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Căutare" @@ -90,7 +90,7 @@ CAPTION "Căutare" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Ajutor Wine" STID_WHERROR, "EROARE" diff --git a/base/applications/winhlp32/Ru.rc b/base/applications/winhlp32/Ru.rc index 43181cc1e47..f8bc3cbe924 100644 --- a/base/applications/winhlp32/Ru.rc +++ b/base/applications/winhlp32/Ru.rc @@ -72,7 +72,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Указатель" @@ -80,7 +80,7 @@ CAPTION "Указатель" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Поиск" @@ -89,7 +89,7 @@ CAPTION "Поиск" } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "Справка WINE" STID_WHERROR, "ОШИБКА" diff --git a/base/applications/winhlp32/Si.rc b/base/applications/winhlp32/Si.rc index 527b45431ee..340b9414551 100644 --- a/base/applications/winhlp32/Si.rc +++ b/base/applications/winhlp32/Si.rc @@ -20,11 +20,13 @@ #include "winhelp_res.h" +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + #pragma code_page(65001) /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Datoteka" { MENUITEM "&Odpri", MNID_FILE_OPEN @@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indeks" @@ -77,7 +79,7 @@ CAPTION "Indeks" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Iskanje" @@ -86,7 +88,7 @@ CAPTION "Iskanje" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE Pomoč" STID_WHERROR, "NAPAKA" @@ -104,7 +106,7 @@ STID_NO_RICHEDIT "Ne morem najti knjižnice richedit ... Prekinjam" STID_PSH_INDEX, "Teme pomoči: " } -CONTEXT_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Sk.rc b/base/applications/winhlp32/Sk.rc index 1b45e1fe89e..773f5405e9d 100644 --- a/base/applications/winhlp32/Sk.rc +++ b/base/applications/winhlp32/Sk.rc @@ -20,7 +20,9 @@ #include "winhelp_res.h" -MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Sbor" { MENUITEM "&Otvori...", MNID_FILE_OPEN @@ -66,7 +68,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE Pomoc" STID_WHERROR, "CHYBA" @@ -81,5 +83,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "Sbory pomoci (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Sv.rc b/base/applications/winhlp32/Sv.rc index 935b618909b..8a5da49ce54 100644 --- a/base/applications/winhlp32/Sv.rc +++ b/base/applications/winhlp32/Sv.rc @@ -24,9 +24,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Arkiv" { MENUITEM "&ppna", MNID_FILE_OPEN @@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -79,7 +81,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Sk" @@ -88,7 +90,7 @@ CAPTION "S } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STRINGTABLE { STID_WINE_HELP, "Wine Hjlp" STID_WHERROR, "FEL" @@ -106,7 +108,7 @@ STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" STID_PSH_INDEX, "Hjlprubriker: " } -CONTEXT_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/winhlp32/Tr.rc b/base/applications/winhlp32/Tr.rc index 876f33caa2f..62202f7fc95 100644 --- a/base/applications/winhlp32/Tr.rc +++ b/base/applications/winhlp32/Tr.rc @@ -20,9 +20,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Dosya" { MENUITEM "&A", MNID_FILE_OPEN @@ -68,7 +70,7 @@ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "WINE Yardm" STID_WHERROR, "HATA" @@ -83,5 +85,4 @@ STID_ALL_FILES, "T STID_HELP_FILES_HLP, "Yardm dosyalar (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/base/applications/winhlp32/Uk.rc b/base/applications/winhlp32/Uk.rc index bf026b0eca1..f4e72d0e8ee 100644 --- a/base/applications/winhlp32/Uk.rc +++ b/base/applications/winhlp32/Uk.rc @@ -28,9 +28,11 @@ /* UTF-8 */ #pragma code_page(65001) +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Файл" { MENUITEM "&Відкрити", MNID_FILE_OPEN @@ -43,17 +45,17 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT POPUP "&Правка" { MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + MENUITEM "&Замітки...", MNID_EDIT_ANNOTATE } POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE + MENUITEM "&Задати...", MNID_BKMK_DEFINE } POPUP "&Налаштування" { - POPUP "Help always visible" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не зверху", MNID_OPTS_HELP_NONVISIBLE END MENUITEM "Історія", MNID_OPTS_HISTORY POPUP "Шрифти" @@ -65,7 +67,7 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS } POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Довідка &про Довідку", MNID_HELP_HELPON MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Інформація...", MNID_HELP_ABOUT @@ -75,69 +77,24 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT } } -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL -{ - POPUP "&Файл" { - MENUITEM "&Відкрити", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Друк", MNID_FILE_PRINT - MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "В&ихід", MNID_FILE_EXIT - } - POPUP "&Правка" { - MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE - } - POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE - } - POPUP "&Налаштування" { - POPUP "Help always visible" - BEGIN - MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "Історія", MNID_OPTS_HISTORY - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_OPTS_FONTS_SMALL - MENUITEM "Нормальний", MNID_OPTS_FONTS_NORMAL - MENUITEM "Великий", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS - } - POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON - MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Інформація...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Про Wine", MNID_HELP_WINE -#endif - } -} - -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Index" +CAPTION "Вказівник" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Search" +CAPTION "Пошук" { LTEXT "Ще не впроваджено", -1, 10, 10, 180, 150 } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE { STID_WINE_HELP, "Довідка Wine" STID_WHERROR, "ПОМИЛКА" @@ -145,21 +102,21 @@ STID_WARNING, "УВАГА" STID_INFO, "Інформація" STID_NOT_IMPLEMENTED, "Не впроваджено" STID_HLPFILE_ERROR_s, "Помилка читання файлу довідки `%s'" -STID_INDEX, "&Index" -STID_CONTENTS, "Summary" +STID_INDEX, "&Зміст" +STID_CONTENTS, "Сумарно" STID_BACK, "&Назад" STID_ALL_FILES, "Всі файли (*.*)" STID_HELP_FILES_HLP, "Файли довідки (*.hlp)" STID_FILE_NOT_FOUND_s "Не можу знайти '%s'. Хочете знайти цей файл самотужки?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Не можу знайти richedit... Скасовую" STID_PSH_INDEX, "Розділи Довідки: " } -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Замітки...", MNID_CTXT_ANNOTATE MENUITEM "Копіювати", MNID_CTXT_COPY MENUITEM "Друк...", MNID_CTXT_PRINT POPUP "Шрифти" @@ -168,35 +125,12 @@ BEGIN MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL MENUITEM "Великий", MNID_CTXT_FONTS_LARGE END - POPUP "Довідка завжди видима" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не зверху", MNID_CTXT_HELP_NONVISIBLE END MENUITEM "Використати системні кольори", MNID_CTXT_SYSTEM_COLORS END END - -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL -BEGIN - POPUP "" - BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE - MENUITEM "Копіювати", MNID_CTXT_COPY - MENUITEM "Друк...", MNID_CTXT_PRINT - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_CTXT_FONTS_SMALL - MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL - MENUITEM "Великий", MNID_CTXT_FONTS_LARGE - END - POPUP "Довідка завжди видима" - BEGIN - MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE - END - MENUITEM "Використати ситемні кольори", MNID_CTXT_SYSTEM_COLORS - END -END diff --git a/base/applications/winhlp32/Zh.rc b/base/applications/winhlp32/Zh.rc index ed20356cf47..9401e74a84c 100644 --- a/base/applications/winhlp32/Zh.rc +++ b/base/applications/winhlp32/Zh.rc @@ -75,7 +75,7 @@ MAIN_MENU MENU } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "WINE 帮助" STID_WHERROR, "错误" @@ -143,7 +143,7 @@ MAIN_MENU MENU } /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE { STID_WINE_HELP, "WINE 幫助" STID_WHERROR, "錯誤" diff --git a/base/applications/wordpad/Da.rc b/base/applications/wordpad/Da.rc index b3a8e0a526f..64b49ef9230 100644 --- a/base/applications/wordpad/Da.rc +++ b/base/applications/wordpad/Da.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Fil" BEGIN @@ -96,7 +96,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -109,7 +109,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -133,7 +133,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og tid" FONT 10, "MS Sans Serif" @@ -144,7 +144,7 @@ BEGIN PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ny" FONT 10, "MS Sans Serif" @@ -155,7 +155,7 @@ BEGIN PUSHBUTTON "&Annuller",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Formater afsnit" FONT 8, "MS Shell Dlg" @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatorer" FONT 8, "MS SHell DLg" @@ -187,7 +187,7 @@ BEGIN PUSHBUTTON "Fjern all&e", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -204,7 +204,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Rig tekstformat (*.rtf)" STRING_TEXT_FILES_TXT, "Tekstdokument (*.txt)" @@ -212,33 +212,33 @@ BEGIN STRING_ALL_FILES, "Alle filer (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Rig tekstdokument" STRING_NEWFILE_TXT, "Tekstdokument" STRING_NEWFILE_TXT_UNICODE, "Tekstdokument (Unicode)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Venstrestillet" STRING_ALIGN_RIGHT, "Højrestillet" STRING_ALIGN_CENTER, "Midterstillet" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Printerfiler (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Alternativer" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Rig tekst" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Udskriv" STRING_PREVIEW_NEXTPAGE, "Næste side" @@ -256,7 +256,7 @@ BEGIN STRING_UNITS_PT, "pkt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Gemme ændringer i «%s»?" diff --git a/base/applications/wordpad/De.rc b/base/applications/wordpad/De.rc index f6079c53541..a369f38a593 100644 --- a/base/applications/wordpad/De.rc +++ b/base/applications/wordpad/De.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Datei" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -132,7 +132,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" @@ -143,7 +143,7 @@ BEGIN PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Neu" FONT 10, "MS Sans Serif" @@ -154,7 +154,7 @@ BEGIN PUSHBUTTON "A&bbrechen",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Absatz" FONT 8, "MS Shell Dlg" @@ -172,7 +172,7 @@ BEGIN PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabstopps" FONT 8, "MS SHell DLg" @@ -186,7 +186,7 @@ BEGIN PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -203,7 +203,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "RTF-Format (*.rtf)" STRING_TEXT_FILES_TXT, "Textdokumente (*.txt)" @@ -211,33 +211,33 @@ BEGIN STRING_ALL_FILES, "Alle Dokumente (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Links" STRING_ALIGN_RIGHT, "Rechts" STRING_ALIGN_CENTER, "Zentriert" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "RTF-Dokument" STRING_NEWFILE_TXT, "Textdokument" STRING_NEWFILE_TXT_UNICODE, "Unicode-Textdokument" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Druckerdateien (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Optionen" STRING_VIEWPROPS_TEXT, "Text" STRING_VIEWPROPS_RICHTEXT, "Rich Text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "&Drucken" STRING_PREVIEW_NEXTPAGE, "&Nächste" @@ -255,7 +255,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" diff --git a/base/applications/wordpad/En.rc b/base/applications/wordpad/En.rc index 312f0ebbf5e..9ee5521bd1e 100644 --- a/base/applications/wordpad/En.rc +++ b/base/applications/wordpad/En.rc @@ -20,7 +20,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN @@ -93,7 +93,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -106,7 +106,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -130,7 +130,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" FONT 10, "MS Sans Serif" @@ -141,7 +141,7 @@ BEGIN PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "New" FONT 10, "MS Sans Serif" @@ -152,7 +152,7 @@ BEGIN PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Paragraph format" FONT 8, "MS Shell Dlg" @@ -170,7 +170,7 @@ BEGIN PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabs" FONT 8, "MS SHell DLg" @@ -184,7 +184,7 @@ BEGIN PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -201,7 +201,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "All documents (*.*)" STRING_TEXT_FILES_TXT, "Text documents (*.txt)" @@ -213,21 +213,21 @@ BEGIN STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Left" STRING_ALIGN_RIGHT, "Right" STRING_ALIGN_CENTER, "Center" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Options" STRING_VIEWPROPS_TEXT, "Text" STRING_VIEWPROPS_RICHTEXT, "Rich text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" @@ -245,7 +245,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" @@ -266,7 +266,7 @@ END LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Left" STRING_ALIGN_RIGHT, "Right" diff --git a/base/applications/wordpad/Fr.rc b/base/applications/wordpad/Fr.rc index 499c05b1bd3..b315bfbd27e 100644 --- a/base/applications/wordpad/Fr.rc +++ b/base/applications/wordpad/Fr.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Fichier" BEGIN @@ -97,7 +97,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -110,7 +110,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -134,7 +134,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date et heure" FONT 10, "MS Sans Serif" @@ -145,7 +145,7 @@ BEGIN PUSHBUTTON "&Annuler",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Nouveau" FONT 10, "MS Sans Serif" @@ -156,7 +156,7 @@ BEGIN PUSHBUTTON "&Annuler",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Format de paragraphe" FONT 8, "MS Shell Dlg" @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulations" FONT 8, "MS SHell DLg" @@ -188,7 +188,7 @@ BEGIN PUSHBUTTON "Supprimer &tous", ID_TAB_EMPTY, 137, 51, 56, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -205,7 +205,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Format de texte enrichi (*.rtf)" STRING_TEXT_FILES_TXT, "Documents texte (*.txt)" @@ -213,33 +213,33 @@ BEGIN STRING_ALL_FILES, "Tous les documents (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Gauche" STRING_ALIGN_RIGHT, "Droite" STRING_ALIGN_CENTER, "Centrer" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Format de texte enrichi (RTF)" STRING_NEWFILE_TXT, "Document texte" STRING_NEWFILE_TXT_UNICODE, "Document texte Unicode" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Fichiers d'impression (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Options" STRING_VIEWPROPS_TEXT, "Texte" STRING_VIEWPROPS_RICHTEXT, "Texte riche" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Imprimer" STRING_PREVIEW_NEXTPAGE, "Page suivante" @@ -257,7 +257,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Enregistrer les modifications de « %s » ?" diff --git a/base/applications/wordpad/Hu.rc b/base/applications/wordpad/Hu.rc index 5f5cb2f65dc..da13a26ab8f 100644 --- a/base/applications/wordpad/Hu.rc +++ b/base/applications/wordpad/Hu.rc @@ -20,7 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Fjl" BEGIN @@ -93,7 +93,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/wordpad/It.rc b/base/applications/wordpad/It.rc index 121f72011fe..de9828eb1b9 100644 --- a/base/applications/wordpad/It.rc +++ b/base/applications/wordpad/It.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN @@ -97,7 +97,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -110,7 +110,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -134,7 +134,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e ora" FONT 10, "MS Sans Serif" @@ -145,7 +145,7 @@ BEGIN PUSHBUTTON "&Annulla",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Nuovo" FONT 10, "MS Sans Serif" @@ -156,7 +156,7 @@ BEGIN PUSHBUTTON "&Annulla",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Formato del paragrafo" FONT 8, "MS Shell Dlg" @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "&Annulla", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulazioni" FONT 8, "MS SHell DLg" @@ -188,7 +188,7 @@ BEGIN PUSHBUTTON "Rimuovi &tutti", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 310, 110 +IDD_FORMATOPTS DIALOG 0, 0, 310, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -205,7 +205,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "Tutti i files (*.*)" STRING_TEXT_FILES_TXT, "File di testo (*.txt)" @@ -217,21 +217,21 @@ BEGIN STRING_PRINTER_FILES_PRN, "File di stampa (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Sinistra" STRING_ALIGN_RIGHT, "Destra" STRING_ALIGN_CENTER, "Centro" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Opzioni" STRING_VIEWPROPS_TEXT, "Testo" STRING_VIEWPROPS_RICHTEXT, "Rich text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Stampa" STRING_PREVIEW_NEXTPAGE, "Prossima pagina" @@ -249,7 +249,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Documento" STRING_PROMPT_SAVE_CHANGES, "Salva i cambiamenti su '%s'?" diff --git a/base/applications/wordpad/Ja.rc b/base/applications/wordpad/Ja.rc index 09c776f57b2..a7d59f6b6cd 100644 --- a/base/applications/wordpad/Ja.rc +++ b/base/applications/wordpad/Ja.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "ファイル(&F)" BEGIN @@ -96,7 +96,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -109,7 +109,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -133,7 +133,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日付と時刻" FONT 10, "MS Shell Dlg" @@ -144,7 +144,7 @@ BEGIN PUSHBUTTON "キャンセル(&C)",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "新規作成" FONT 10, "MS Shell Dlg" @@ -155,7 +155,7 @@ BEGIN PUSHBUTTON "キャンセル(&C)",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "段落の設定" FONT 9, "MS Shell Dlg" @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "キャンセル(&C)", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "タブの設定" FONT 9, "MS Shell Dlg" @@ -187,7 +187,7 @@ BEGIN PUSHBUTTON "すべて削除(&L)", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL CAPTION "" FONT 9, "MS Shell Dlg" @@ -204,7 +204,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "すべてのファイル (*.*)" STRING_TEXT_FILES_TXT, "テキスト文書 (*.txt)" @@ -216,21 +216,21 @@ BEGIN STRING_PRINTER_FILES_PRN, "プリンタファイル (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "左" STRING_ALIGN_RIGHT, "右" STRING_ALIGN_CENTER, "中央" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "オプション" STRING_VIEWPROPS_TEXT, "テキスト" STRING_VIEWPROPS_RICHTEXT, "リッチテキスト" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "印刷" STRING_PREVIEW_NEXTPAGE, "次のページ" @@ -248,7 +248,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "文書" STRING_PROMPT_SAVE_CHANGES, "'%s'への変更を保存しますか?" diff --git a/base/applications/wordpad/Ko.rc b/base/applications/wordpad/Ko.rc index 8a4419495c8..0df74686300 100644 --- a/base/applications/wordpad/Ko.rc +++ b/base/applications/wordpad/Ko.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "(&F)" BEGIN @@ -94,7 +94,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -107,7 +107,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -131,7 +131,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "¥ ð" FONT 10, "MS Shell Dlg" @@ -142,7 +142,7 @@ BEGIN PUSHBUTTON "(&C)",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION " " FONT 10, "MS Shell Dlg" @@ -153,7 +153,7 @@ BEGIN PUSHBUTTON "(&C)",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "ܶ " FONT 9, "MS Shell Dlg" @@ -171,7 +171,7 @@ BEGIN PUSHBUTTON "(&C)", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "" FONT 9, "MS Shell Dlg" @@ -185,7 +185,7 @@ BEGIN PUSHBUTTON " (&L)", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 9, "MS Shell Dlg" @@ -202,7 +202,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, " (*.*)" STRING_TEXT_FILES_TXT, "ؽƮ (*.txt)" @@ -215,21 +215,21 @@ BEGIN END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "" STRING_ALIGN_RIGHT, "" STRING_ALIGN_CENTER, "" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "ɼ" STRING_VIEWPROPS_TEXT, "ؽƮ" STRING_VIEWPROPS_RICHTEXT, "ġ ؽƮ" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "μ" STRING_PREVIEW_NEXTPAGE, " " @@ -247,7 +247,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "" STRING_PROMPT_SAVE_CHANGES, "'%s' ٲ ϰڽϱ?" diff --git a/base/applications/wordpad/Lt.rc b/base/applications/wordpad/Lt.rc index f9cd88f730a..82df7c893c1 100644 --- a/base/applications/wordpad/Lt.rc +++ b/base/applications/wordpad/Lt.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Failas" BEGIN @@ -96,7 +96,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -109,7 +109,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -133,7 +133,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data ir laikas" FONT 10, "MS Sans Serif" @@ -144,7 +144,7 @@ BEGIN PUSHBUTTON "&Atsisakyti",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Naujas" FONT 10, "MS Sans Serif" @@ -155,7 +155,7 @@ BEGIN PUSHBUTTON "&Atsisakyti",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Pastraipos formatas" FONT 8, "MS Shell Dlg" @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "&Atsisakyti", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabuliavimo žymės" FONT 8, "MS SHell DLg" @@ -187,7 +187,7 @@ BEGIN PUSHBUTTON "Pašalinti &visas", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -204,7 +204,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Raiškiojo teksto dokumentai (*.rtf)" STRING_TEXT_FILES_TXT, "Tekstiniai dokumentai (*.txt)" @@ -212,33 +212,33 @@ BEGIN STRING_ALL_FILES, "Visi dokumentai (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Kairinė" STRING_ALIGN_RIGHT, "Dešininė" STRING_ALIGN_CENTER, "Centrinė" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Raiškiojo teksto dokumentas" STRING_NEWFILE_TXT, "Tekstinis dokumentas" STRING_NEWFILE_TXT_UNICODE, "Teksto unikodu dokumentas" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Spausdintuvo failai (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Parinktys" STRING_VIEWPROPS_TEXT, "Tekstas" STRING_VIEWPROPS_RICHTEXT, "Raiškusis tekstas" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Spausdinti" STRING_PREVIEW_NEXTPAGE, "Tolesnis puslapis" @@ -256,7 +256,7 @@ BEGIN STRING_UNITS_PT, "tašk." END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokumentas" STRING_PROMPT_SAVE_CHANGES, "Išsaugoti „%s“ pakeitimus?" diff --git a/base/applications/wordpad/Nl.rc b/base/applications/wordpad/Nl.rc index 2c363f5abcc..17b30368e8f 100644 --- a/base/applications/wordpad/Nl.rc +++ b/base/applications/wordpad/Nl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL #pragma code_page(65001) -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Bestand" BEGIN @@ -96,7 +96,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -109,7 +109,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -133,7 +133,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum en tijd" FONT 10, "MS Sans Serif" @@ -144,7 +144,7 @@ BEGIN PUSHBUTTON "&Annuleren",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Nieuw" FONT 10, "MS Sans Serif" @@ -155,7 +155,7 @@ BEGIN PUSHBUTTON "&Annuleren",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Paragraaf formaat" FONT 8, "MS Shell Dlg" @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "&Annuleren", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabs" FONT 8, "MS SHell DLg" @@ -187,7 +187,7 @@ BEGIN PUSHBUTTON "Verwijder al&len", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -204,7 +204,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "Alle documenten (*.*)" STRING_TEXT_FILES_TXT, "Tekstdocumenten (*.txt)" @@ -216,21 +216,21 @@ BEGIN STRING_PRINTER_FILES_PRN, "Afdrukbestanden (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Links" STRING_ALIGN_RIGHT, "Rechts" STRING_ALIGN_CENTER, "Gecentreerd" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Opties" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Rich tekst" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Afdrukken" STRING_PREVIEW_NEXTPAGE, "Volgende pagina" @@ -248,7 +248,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Wijzigingen opslaan naar '%s'?" diff --git a/base/applications/wordpad/No.rc b/base/applications/wordpad/No.rc index 7fa0c84b956..dca3f95db31 100644 --- a/base/applications/wordpad/No.rc +++ b/base/applications/wordpad/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 by Alexander N. Sørnes + * Copyright 2006-2010 by Alexander N. Sørnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Fil" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -118,7 +118,7 @@ BEGIN MENUITEM "Oliven" ID_COLOR_OLIVE MENUITEM "Marineblå" ID_COLOR_NAVY MENUITEM "Purpur" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Blågrønn" ID_COLOR_TEAL MENUITEM "Grå" ID_COLOR_GRAY MENUITEM "Sølv" ID_COLOR_SILVER MENUITEM "Rød" ID_COLOR_RED @@ -126,13 +126,13 @@ BEGIN MENUITEM "Gul" ID_COLOR_YELLOW MENUITEM "Blå" ID_COLOR_BLUE MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Turkis" ID_COLOR_AQUA MENUITEM "Hvit" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatisk" ID_COLOR_AUTOMATIC END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og klokkeslett" FONT 10, "MS Sans Serif" @@ -143,7 +143,7 @@ BEGIN PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ny" FONT 10, "MS Sans Serif" @@ -154,7 +154,7 @@ BEGIN PUSHBUTTON "&Avbryt",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Formater avsnitt" FONT 8, "MS Shell Dlg" @@ -172,7 +172,7 @@ BEGIN PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatorer" FONT 8, "MS SHell DLg" @@ -186,13 +186,13 @@ BEGIN PUSHBUTTON "Fjern all&e", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Linjebryting", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Ingen linjebryting", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 @@ -203,7 +203,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Rikt tekstformat (*.rtf)" STRING_TEXT_FILES_TXT, "Tekstdokument (*.txt)" @@ -211,45 +211,51 @@ BEGIN STRING_ALL_FILES, "Alle filer (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Rikt tekstdokument" STRING_NEWFILE_TXT, "Tekstdokument" STRING_NEWFILE_TXT_UNICODE, "Tekstdokument (Unicode)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Venstrestilt" STRING_ALIGN_RIGHT, "Høyrestilt" STRING_ALIGN_CENTER, "Midtstilt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Skriverfiler (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Alternativer" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Rik tekst" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Skriv ut" STRING_PREVIEW_NEXTPAGE, "Neste side" STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" STRING_PREVIEW_ONEPAGE, "Én side" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Forstørr" + STRING_PREVIEW_ZOOMOUT, "Forminsk" STRING_PREVIEW_CLOSE, "Lukk" + STRING_PREVIEW_PAGE, "Side" + STRING_PREVIEW_PAGES, "Sider" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "tommer" + STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i «%s»?" @@ -259,7 +265,7 @@ BEGIN "vil føre til at all formatering går tapt. Er du " \ "sikker på at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter støttes ikke" STRING_WRITE_FAILED, "Klarte ikke lagre filen." STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til å lagre filen." STRING_OPEN_FAILED, "Klarte ikke åpne filen." diff --git a/base/applications/wordpad/Pl.rc b/base/applications/wordpad/Pl.rc index 053ecf20439..c2a4214f971 100644 --- a/base/applications/wordpad/Pl.rc +++ b/base/applications/wordpad/Pl.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Plik" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -132,7 +132,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data i godzina" FONT 10, "MS Sans Serif" @@ -143,7 +143,7 @@ BEGIN PUSHBUTTON "&Anuluj",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Nowy" FONT 10, "MS Sans Serif" @@ -154,7 +154,7 @@ BEGIN PUSHBUTTON "&Anuluj",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Format akapitu" FONT 8, "MS Shell Dlg" @@ -172,7 +172,7 @@ BEGIN PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatory" FONT 8, "MS Shell Dlg" @@ -186,7 +186,7 @@ BEGIN PUSHBUTTON "Usu &wszystkie", ID_TAB_EMPTY, 137, 51, 57, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -203,7 +203,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Tekst sformatowany - RTF (*.rtf)" STRING_TEXT_FILES_TXT, "Dokument tekstowy (*.txt)" @@ -211,33 +211,33 @@ BEGIN STRING_ALL_FILES, "Wszystkie dokumenty (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Do lewej" STRING_ALIGN_RIGHT, "Do prawej" STRING_ALIGN_CENTER, "Wyrodkowane" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Dokument sformatowany (RTF)" STRING_NEWFILE_TXT, "Dokument tekstowy" STRING_NEWFILE_TXT_UNICODE, "Dokument tekstowy Unicode" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Pliki drukarki (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Opcje" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Tekst sformatowany" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Drukuj" STRING_PREVIEW_NEXTPAGE, "Nast. strona" @@ -255,7 +255,7 @@ BEGIN STRING_UNITS_PT, "punkt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Zapisa zmiany w pliku '%s'?" diff --git a/base/applications/wordpad/Pt.rc b/base/applications/wordpad/Pt.rc index 2bc44febd79..ffb5c567a74 100644 --- a/base/applications/wordpad/Pt.rc +++ b/base/applications/wordpad/Pt.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Arquivo" BEGIN @@ -100,7 +100,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Ficheiro" BEGIN @@ -176,7 +176,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -191,7 +191,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -207,7 +207,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -231,7 +231,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e hora" FONT 10, "MS Sans Serif" @@ -242,7 +242,7 @@ BEGIN PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Novo" FONT 10, "MS Sans Serif" @@ -253,7 +253,7 @@ BEGIN PUSHBUTTON "&Cancelar",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110 +IDD_PARAFORMAT DIALOG 30, 20, 220, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Parágrafo" FONT 8, "MS Shell Dlg" @@ -271,7 +271,7 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulações" FONT 8, "MS SHell DLg" @@ -285,7 +285,7 @@ BEGIN PUSHBUTTON "Remover &todos", ID_TAB_EMPTY, 135, 51, 55, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -302,18 +302,10 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE -BEGIN - STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" - STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" - STRING_ALL_FILES, "Todos os documentos (*.*)" -END - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "Todos os documentos (*.*)" STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" @@ -327,7 +319,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "Todos os documentos (*.*)" STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" @@ -342,21 +334,21 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Esquerda" STRING_ALIGN_RIGHT, "Direita" STRING_ALIGN_CENTER, "Centro" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Opções" STRING_VIEWPROPS_TEXT, "Texto" STRING_VIEWPROPS_RICHTEXT, "Rich text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Imprimir" STRING_PREVIEW_NEXTPAGE, "Próxima página" @@ -377,7 +369,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Documento" STRING_PROMPT_SAVE_CHANGES, "Salvar as alterações de '%s'?" @@ -398,7 +390,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Documento" STRING_PROMPT_SAVE_CHANGES, "Guardar alterações a '%s'?" diff --git a/base/applications/wordpad/Ro.rc b/base/applications/wordpad/Ro.rc new file mode 100644 index 00000000000..4db8a95e9a1 --- /dev/null +++ b/base/applications/wordpad/Ro.rc @@ -0,0 +1,267 @@ +/* + * Copyright 2004 Krzysztof Foltman + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wordpad.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDM_MAINMENU MENU +BEGIN + POPUP "&Fișier" + BEGIN + MENUITEM "&Nou...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Deschide...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Salvează\tCtrl+S", ID_FILE_SAVE + MENUITEM "S&alvează ca...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "Im&primă...\tCtrl+P", ID_PRINT + MENUITEM "Pre&vizualizare imprimare...", ID_PREVIEW + MENUITEM "&Opțiuni pagină...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Ieșire", ID_FILE_EXIT + END + POPUP "&Editare" + BEGIN + MENUITEM "&Anulează\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "R&efă\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Taie\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Copiază\tCtrl+C", ID_EDIT_COPY + MENUITEM "Li&pește\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Curăță\tDEL", ID_EDIT_CLEAR + MENUITEM "&Selectează tot\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Cău&tare...\tCrtl+F", ID_FIND + MENUITEM "Caută &următorul\tF3", ID_FIND_NEXT + MENUITEM "Î&nlocuire...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "D&oar citire", ID_EDIT_READONLY + MENUITEM "&Modificat", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "S&uplimente" + BEGIN + MENUITEM "Detal&ii pentru selecție", ID_EDIT_SELECTIONINFO + MENUITEM "&Format caracter", ID_EDIT_CHARFORMAT + MENUITEM "For&mat caracter implicit", ID_EDIT_DEFCHARFORMAT + MENUITEM "Format ¶graf", ID_EDIT_PARAFORMAT + MENUITEM "Extra&ge textul", ID_EDIT_GETTEXT + END + END + POPUP "&Vizualizare" + BEGIN + MENUITEM "Bara de unel&te", ID_TOGGLE_TOOLBAR + MENUITEM "Bara de &format", ID_TOGGLE_FORMATBAR + MENUITEM "&Riglă", ID_TOGGLE_RULER + MENUITEM "Bară de &stare", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opțiuni...", ID_VIEWPROPERTIES + END + POPUP "&Inserare" + BEGIN + MENUITEM "&Data și ora...", ID_DATETIME + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Font...", ID_FONTSETTINGS + MENUITEM "Punct &bulină" ID_BULLET + MENUITEM "&Paragraf..." ID_PARAFORMAT + MENUITEM "&Taburi..." ID_TABSTOPS + POPUP "Fun&dal" + BEGIN + MENUITEM "&Sistem\tCtrl+1", ID_BACK_1 + MENUITEM "Gălbui de &post-it\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Ajutor" + BEGIN + MENUITEM "&Despre Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Taie", ID_EDIT_CUT + MENUITEM "&Copiază", ID_EDIT_COPY + MENUITEM "&Lipește", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Punct &bulină" ID_BULLET + MENUITEM "&Paragraf..." ID_PARAFORMAT + END +END + +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Negru", ID_COLOR_BLACK + MENUITEM "Maro", ID_COLOR_MAROON + MENUITEM "Verde", ID_COLOR_GREEN + MENUITEM "Oliv" ID_COLOR_OLIVE + MENUITEM "Bleumarin" ID_COLOR_NAVY + MENUITEM "Violet" ID_COLOR_PURPLE + MENUITEM "Verde-albăstrui" ID_COLOR_TEAL + MENUITEM "Gri" ID_COLOR_GRAY + MENUITEM "Argintiu" ID_COLOR_SILVER + MENUITEM "Roșu" ID_COLOR_RED + MENUITEM "Lămâie verde" ID_COLOR_LIME + MENUITEM "Galben" ID_COLOR_YELLOW + MENUITEM "Albastru" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Culoarea apei" ID_COLOR_AQUA + MENUITEM "Alb" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + +IDD_DATETIME DIALOG 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Data și ora" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Formate disponibile",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Anulează",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Nou" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Nou tip de document",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Anulează",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Format paragraf" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indentare", -1, 10, 10, 120, 68 + LTEXT "Stânga", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Dreapta", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "Primul rând", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Aliniere", -1, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Anulează", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Taburi" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Spațiere tab", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&Adaugă", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Elimină", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Anulează", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "E&limină tot", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Despărțire rânduri", -1, 10, 10, 130, 85 + RADIOBUTTON "Fără desparțire râ&nduri", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Încadrează textul în chenarul &ferestrei", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Încadrează textul în limitele ri&glei", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Bare de unelte", -1, 150, 10, 120, 85 + CHECKBOX "Bara de unel&te", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "Bara de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Riglă", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Bară de &stare", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE +BEGIN + STRING_ALL_FILES, "Toate documentele (*.*)" + STRING_TEXT_FILES_TXT, "Documentele text (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentele text unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formatul de text îmbogățit (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Document text îmbogățit" + STRING_NEWFILE_TXT, "Document text" + STRING_NEWFILE_TXT_UNICODE, "Document text unicode" + STRING_PRINTER_FILES_PRN, "Fișiere de imprimat (*.PRN)" +END + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "Stânga" + STRING_ALIGN_RIGHT, "Dreapta" + STRING_ALIGN_CENTER, "Centru" +END + +STRINGTABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opțiuni" + STRING_VIEWPROPS_TEXT, "Text" + STRING_VIEWPROPS_RICHTEXT, "Text îmbogățit" +END + +STRINGTABLE +BEGIN + STRING_PREVIEW_PRINT, "Imprimă" + STRING_PREVIEW_NEXTPAGE, "Pagina următoare" + STRING_PREVIEW_PREVPAGE, "Pagina precedentă" + STRING_PREVIEW_TWOPAGES, "Două pagini" + STRING_PREVIEW_ONEPAGE, "O pagină" + STRING_PREVIEW_ZOOMIN, "Mărește" + STRING_PREVIEW_ZOOMOUT, "Micșorează" + STRING_PREVIEW_CLOSE, "Închide" + STRING_PREVIEW_PAGE, "Pagină" + STRING_PREVIEW_PAGES, "Pagini" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "țol" + STRING_UNITS_PT, "pt" +END + +STRINGTABLE +BEGIN + STRING_DEFAULT_FILENAME, "Document" + STRING_PROMPT_SAVE_CHANGES, "Salvați modificările la „%s”?" + STRING_SEARCH_FINISHED, "S-a terminat căutarea în document." + STRING_LOAD_RICHED_FAILED, "Nu s-a putut încărca biblioteca RichEdit." + STRING_SAVE_LOSEFORMATTING, "Ați ales să salvați în formatul de text simplu, care va pierde formatarea. Sigur doriți să continuați?" + STRING_INVALID_NUMBER, "Formatul de număr nu este valid." + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentele de depozitare OLE nu sunt suportate." + STRING_WRITE_FAILED, "Nu s-a putut salva fișierul." + STRING_WRITE_ACCESS_DENIED, "Nu aveți permisiunea să salvați fișierul." + STRING_OPEN_FAILED, "Nu s-a putut deschide fișierul." + STRING_OPEN_ACCESS_DENIED, "Nu aveți permisiunea de a deschide fișierul." + STRING_PRINTING_NOT_IMPLEMENTED, "Imprimarea nu este implementată." + STRING_MAX_TAB_STOPS, "Nu se pot adăuga mai mult de 32 de taburi." +END diff --git a/base/applications/wordpad/Ru.rc b/base/applications/wordpad/Ru.rc index 06fb33274a3..4eb0819cee1 100644 --- a/base/applications/wordpad/Ru.rc +++ b/base/applications/wordpad/Ru.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Файл" BEGIN @@ -96,7 +96,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -109,7 +109,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -133,7 +133,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Дата и время" FONT 10, "MS Sans Serif" @@ -144,7 +144,7 @@ BEGIN PUSHBUTTON "О&тмена",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Новый документ" FONT 10, "MS Sans Serif" @@ -155,7 +155,7 @@ BEGIN PUSHBUTTON "О&тмена",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Абзац" FONT 8, "MS Shell Dlg" @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "О&тмена", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Табуляция" FONT 8, "MS SHell DLg" @@ -187,7 +187,7 @@ BEGIN PUSHBUTTON "Очистить &все", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -204,7 +204,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Файлы RTF (*.rtf)" STRING_TEXT_FILES_TXT, "Текстовые документы (*.txt)" @@ -212,33 +212,33 @@ BEGIN STRING_ALL_FILES, "Все документы (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "По левому краю" STRING_ALIGN_RIGHT, "По правому краю" STRING_ALIGN_CENTER, "По центру" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Файл RTF" STRING_NEWFILE_TXT, "Текстовый документ" STRING_NEWFILE_TXT_UNICODE, "Документ в формате Unicode" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Файлы принтера (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Настройки" STRING_VIEWPROPS_TEXT, "Текст" STRING_VIEWPROPS_RICHTEXT, "Файл RTF" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Печать" STRING_PREVIEW_NEXTPAGE, "Следующая" @@ -250,14 +250,13 @@ BEGIN STRING_PREVIEW_CLOSE, "Закрыть" STRING_PREVIEW_PAGE, "Страница" STRING_PREVIEW_PAGES, "Страницы" + STRING_UNITS_CM, "см" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "см" -END - -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Документ" STRING_PROMPT_SAVE_CHANGES, "Сохранить изменения в '%s'?" diff --git a/base/applications/wordpad/Si.rc b/base/applications/wordpad/Si.rc index 556197bd05b..11caf33986c 100644 --- a/base/applications/wordpad/Si.rc +++ b/base/applications/wordpad/Si.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Datotka" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -132,7 +132,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum in čas" FONT 10, "MS Sans Serif" @@ -143,7 +143,7 @@ BEGIN PUSHBUTTON "&Prekliči",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Nov dokument" FONT 10, "MS Sans Serif" @@ -154,7 +154,7 @@ BEGIN PUSHBUTTON "&Prekliči",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Oblika odstavka" FONT 8, "MS Shell Dlg" @@ -172,7 +172,7 @@ BEGIN PUSHBUTTON "&Prekliči", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatorji" FONT 8, "MS SHell DLg" @@ -186,7 +186,7 @@ BEGIN PUSHBUTTON "Odstrani v&se", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -203,7 +203,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Dokument z obogatenim besedilom (*.rtf)" STRING_TEXT_FILES_TXT, "Dokument z besedilom (*.txt)" @@ -211,33 +211,33 @@ BEGIN STRING_ALL_FILES, "Vsi dokumenti (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Levo" STRING_ALIGN_RIGHT, "Desno" STRING_ALIGN_CENTER, "Sredina" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Dokument z obogatenim besedilom" STRING_NEWFILE_TXT, "Dokument z besedilom" STRING_NEWFILE_TXT_UNICODE, "Dokument z Unicode besedilom" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Tiskalnikova datoteka (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Možnosti" STRING_VIEWPROPS_TEXT, "Besedilo" STRING_VIEWPROPS_RICHTEXT, "Obogateno besedilo" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Natisni" STRING_PREVIEW_NEXTPAGE, "Naslednja" @@ -255,7 +255,7 @@ BEGIN STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Ali naj shranim spremembe v '%s'?" diff --git a/base/applications/wordpad/Sv.rc b/base/applications/wordpad/Sv.rc index edc35a9b24a..acf4f94eeb9 100644 --- a/base/applications/wordpad/Sv.rc +++ b/base/applications/wordpad/Sv.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL #pragma code_page(65001) -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Arkiv" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN @@ -132,7 +132,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum och tid" FONT 10, "MS Sans Serif" @@ -143,7 +143,7 @@ BEGIN PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ny" FONT 10, "MS Sans Serif" @@ -154,7 +154,7 @@ BEGIN PUSHBUTTON "&Avbryt",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Formatera stycke" FONT 8, "MS Shell Dlg" @@ -172,7 +172,7 @@ BEGIN PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatorer" FONT 8, "MS Shell Dlg" @@ -186,7 +186,7 @@ BEGIN PUSHBUTTON "Ta bort a&lla", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" @@ -203,7 +203,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "Rich text-format (*.rtf)" STRING_TEXT_FILES_TXT, "Textdokument (*.txt)" @@ -211,33 +211,33 @@ BEGIN STRING_ALL_FILES, "Alla filer (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "Vänsterställt" STRING_ALIGN_RIGHT, "Högerställt" STRING_ALIGN_CENTER, "Centrerat" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "Rich text-dokument" STRING_NEWFILE_TXT, "Textdokument" STRING_NEWFILE_TXT_UNICODE, "Textdokument (Unicode)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "Skrivarfiler (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Alternativ" STRING_VIEWPROPS_TEXT, "Text" STRING_VIEWPROPS_RICHTEXT, "Rich text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Skriv ut" STRING_PREVIEW_NEXTPAGE, "Nästa sida" @@ -251,12 +251,15 @@ BEGIN STRING_PREVIEW_PAGES, "Sidor" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "tum" + STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Spara ändringar i '%s'?" diff --git a/base/applications/wordpad/Tr.rc b/base/applications/wordpad/Tr.rc index 2273175700a..93875cb0dbe 100644 --- a/base/applications/wordpad/Tr.rc +++ b/base/applications/wordpad/Tr.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "&Dosya" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -108,7 +108,7 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN diff --git a/base/applications/wordpad/Uk.rc b/base/applications/wordpad/Uk.rc index 35e35977e59..8a86989cebb 100644 --- a/base/applications/wordpad/Uk.rc +++ b/base/applications/wordpad/Uk.rc @@ -27,71 +27,71 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Файл" BEGIN - MENUITEM "&Новий...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Новий...\tCtrl+N", ID_FILE_NEW MENUITEM "&Відкрити...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Зберегти\tCtrl+S", ID_FILE_SAVE MENUITEM "Зберегти &як...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Друк...\tCtrl+P", ID_PRINT - MENUITEM "Попередній перег&ляд...", ID_PREVIEW - MENUITEM "Налаштування &сторінки...", ID_PRINTSETUP + MENUITEM "&Друк...\tCtrl+P", ID_PRINT + MENUITEM "Попередній перег&ляд...", ID_PREVIEW + MENUITEM "Налаштування &сторінки...", ID_PRINTSETUP MENUITEM SEPARATOR - MENUITEM "В&ихід", ID_FILE_EXIT + MENUITEM "В&ихід", ID_FILE_EXIT END POPUP "&Правка" BEGIN - MENUITEM "&Відмінити\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "Повт&орити\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&Відмінити\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "Повт&орити\tCtrl+Y", ID_EDIT_REDO MENUITEM SEPARATOR - MENUITEM "Виріза&ти\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Копіювати\tCtrl+C", ID_EDIT_COPY - MENUITEM "В&ставити\tCtrl+V", ID_EDIT_PASTE - MENUITEM "О&чистити\tDEL", ID_EDIT_CLEAR - MENUITEM "Виб&рати все\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM "Виріза&ти\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Копіювати\tCtrl+C", ID_EDIT_COPY + MENUITEM "В&ставити\tCtrl+V", ID_EDIT_PASTE + MENUITEM "О&чистити\tDEL", ID_EDIT_CLEAR + MENUITEM "Виб&рати все\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Знайти...\tCtrl+F", ID_FIND - MENUITEM "Знайти д&алі\tF3", ID_FIND_NEXT - MENUITEM "За&мінтити...\tCtrl+H", ID_REPLACE + MENUITEM "&Знайти...\tCtrl+F", ID_FIND + MENUITEM "Знайти д&алі\tF3", ID_FIND_NEXT + MENUITEM "За&мінити...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Лише д&ля читання", ID_EDIT_READONLY + MENUITEM "Лише д&ля читання", ID_EDIT_READONLY MENUITEM "Зм&інений", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "Д&одатково" BEGIN - MENUITEM "&Інформація про виділення", ID_EDIT_SELECTIONINFO - MENUITEM "&Формат символів", ID_EDIT_CHARFORMAT - MENUITEM "Формат символів &по замовчуванні", ID_EDIT_DEFCHARFORMAT - MENUITEM "Paragrap&h format", ID_EDIT_PARAFORMAT - MENUITEM "&Взяти текст", ID_EDIT_GETTEXT + MENUITEM "&Інформація про виділення", ID_EDIT_SELECTIONINFO + MENUITEM "&Формат символів", ID_EDIT_CHARFORMAT + MENUITEM "Формат символів &по замовчуванні", ID_EDIT_DEFCHARFORMAT + MENUITEM "Абза&ц", ID_EDIT_PARAFORMAT + MENUITEM "&Взяти текст", ID_EDIT_GETTEXT END END POPUP "&Вигляд" BEGIN - MENUITEM "Панель інс&трументів", ID_TOGGLE_TOOLBAR + MENUITEM "Панель інс&трументів", ID_TOGGLE_TOOLBAR MENUITEM "Панель &форматування", ID_TOGGLE_FORMATBAR - MENUITEM "&Лінійка", ID_TOGGLE_RULER - MENUITEM "&Рядок стану", ID_TOGGLE_STATUSBAR + MENUITEM "&Лінійка", ID_TOGGLE_RULER + MENUITEM "&Рядок стану", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Параметри...", ID_VIEWPROPERTIES + MENUITEM "&Параметри...", ID_VIEWPROPERTIES END POPUP "&Вставка" BEGIN - MENUITEM "&Дата та час...", ID_DATETIME + MENUITEM "&Дата та час...", ID_DATETIME END POPUP "Ф&ормат" BEGIN - MENUITEM "&Шрифт...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Абзац..." ID_PARAFORMAT - MENUITEM "&Табуляція..." ID_TABSTOPS + MENUITEM "&Шрифт...", ID_FONTSETTINGS + MENUITEM "&Маркери" ID_BULLET + MENUITEM "&Абзац..." ID_PARAFORMAT + MENUITEM "&Табуляція..." ID_TABSTOPS POPUP "&Фон" BEGIN - MENUITEM "&Ситсемний\tCtrl+1", ID_BACK_1 - MENUITEM "&Жовтуватий PostThat\tCtrl+2", ID_BACK_2 + MENUITEM "&Системний\tCtrl+1", ID_BACK_1 + MENUITEM "&Жовтуватий PostThat\tCtrl+2", ID_BACK_2 END END POPUP "&Довідка" @@ -100,44 +100,44 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "Вир&ізати", ID_EDIT_CUT - MENUITEM "&Копіювати", ID_EDIT_COPY - MENUITEM "&Вставити", ID_EDIT_PASTE + MENUITEM "Вир&ізати", ID_EDIT_CUT + MENUITEM "&Копіювати", ID_EDIT_COPY + MENUITEM "&Вставити", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Абзац..." ID_PARAFORMAT + MENUITEM "&Маркери" ID_BULLET + MENUITEM "&Абзац..." ID_PARAFORMAT END END -IDM_COLOR_POPUP MENU DISCARDABLE +IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "×îðíèé" ID_COLOR_BLACK - MENUITEM "Áðóíàòíèé" ID_COLOR_MAROON - MENUITEM "Çåëåíèé" ID_COLOR_GREEN - MENUITEM "Îëèâêîâèé" ID_COLOR_OLIVE - MENUITEM "Ñèí³é" ID_COLOR_NAVY - MENUITEM "Ïóðïóðíèé" ID_COLOR_PURPLE - MENUITEM "Çåëåíî-ñèí³é" ID_COLOR_TEAL - MENUITEM "ѳðèé" ID_COLOR_GRAY - MENUITEM "Ñð³áíèé" ID_COLOR_SILVER - MENUITEM "×åðâîíèé" ID_COLOR_RED - MENUITEM "Ñàëàòîâèé" ID_COLOR_LIME - MENUITEM "Æîâòèé" ID_COLOR_YELLOW - MENUITEM "Ãîëóáèé" ID_COLOR_BLUE - MENUITEM "Ô³îëåòîâèé" ID_COLOR_FUCHSIA - MENUITEM "Àêâàìàðèí" ID_COLOR_AQUA - MENUITEM "Á³ëèé" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Чорний" ID_COLOR_BLACK + MENUITEM "Коричневий" ID_COLOR_MAROON + MENUITEM "Зелений" ID_COLOR_GREEN + MENUITEM "Оливковий" ID_COLOR_OLIVE + MENUITEM "Темно-синій" ID_COLOR_NAVY + MENUITEM "Пурпуровий" ID_COLOR_PURPLE + MENUITEM "Синьо-зелений" ID_COLOR_TEAL + MENUITEM "Сірий" ID_COLOR_GRAY + MENUITEM "Сріблястий" ID_COLOR_SILVER + MENUITEM "Червоний" ID_COLOR_RED + MENUITEM "Салатовий" ID_COLOR_LIME + MENUITEM "Жовтий" ID_COLOR_YELLOW + MENUITEM "Синій" ID_COLOR_BLUE + MENUITEM "Малиновий" ID_COLOR_FUCHSIA + MENUITEM "Блакитний" ID_COLOR_AQUA + MENUITEM "Білий" ID_COLOR_WHITE + MENUITEM "Автоматично" ID_COLOR_AUTOMATIC END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Дата та час" FONT 10, "MS Sans Serif" @@ -148,7 +148,7 @@ BEGIN PUSHBUTTON "&Скасувати",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Новий" FONT 10, "MS Sans Serif" @@ -159,7 +159,7 @@ BEGIN PUSHBUTTON "&Скасувати",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Абзац" FONT 8, "MS Shell Dlg" @@ -169,20 +169,20 @@ BEGIN EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "Справа", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Перший рядок", -1, 15, 58, 40, 13 + LTEXT "Перший рядок", -1, 15, 58, 40, 18 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Вирівнювання", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + LTEXT "Вирівнювання", -1, 13, 87, 50, 13 + COMBOBOX IDC_PARA_ALIGN, 63, 85, 75, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Скасувати", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Табуляція" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", -1, 10, 10, 120, 90 + GROUPBOX "Позиції табуляції", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "&Додати", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Видалити", ID_TAB_DEL, 72, 80, 45, 15 @@ -191,24 +191,24 @@ BEGIN PUSHBUTTON "Видалити в&се", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 - RADIOBUTTON "&No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", -1, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 + GROUPBOX "Перенос рядка", -1, 10, 10, 130, 85 + RADIOBUTTON "&Без переносу", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "По &межі вікна", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "По м&ежі поля", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Панелі", -1, 150, 10, 120, 85 + CHECKBOX "Панель інс&трументів", IDC_PAGEFMT_TB, 160, 20, 88, 15 + CHECKBOX "Панель &форматування", IDC_PAGEFMT_FB, 160, 38, 88, 15 CHECKBOX "&Лінійка", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Рядоу стану", IDC_PAGEFMT_SB, 160, 74, 80, 15 + CHECKBOX "&Рядок стану", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALL_FILES, "Всі документи (*.*)" STRING_TEXT_FILES_TXT, "Текстові документи (*.txt)" @@ -217,24 +217,24 @@ BEGIN STRING_NEWFILE_RICHTEXT, "Rich text документ" STRING_NEWFILE_TXT, "Текстовий документ" STRING_NEWFILE_TXT_UNICODE, "Текстовий документ Unicode" - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" + STRING_PRINTER_FILES_PRN, "Файли принтера (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "По Лівому Краю" STRING_ALIGN_RIGHT, "По Правому Краю" STRING_ALIGN_CENTER, "По Центру" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "Налаштування" STRING_VIEWPROPS_TEXT, "Текст" STRING_VIEWPROPS_RICHTEXT, "Rich text" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "Друк" STRING_PREVIEW_NEXTPAGE, "Наступна сторінка" @@ -244,12 +244,15 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Збільшити" STRING_PREVIEW_ZOOMOUT, "Зменшити" STRING_PREVIEW_CLOSE, "Закрити" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" - STRING_UNITS_CM, "cm" + STRING_PREVIEW_PAGE, "Сторінка" + STRING_PREVIEW_PAGES, "Сторінок" + STRING_UNITS_CM, "см" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "дюйм" + STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Документ" STRING_PROMPT_SAVE_CHANGES, "Зберегти зміни в '%s'?" @@ -270,7 +273,7 @@ END LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "По Лівому Краю" STRING_ALIGN_RIGHT, "По правому Краю" diff --git a/base/applications/wordpad/Zh.rc b/base/applications/wordpad/Zh.rc index bae40a7fb02..63bfc57c3b6 100644 --- a/base/applications/wordpad/Zh.rc +++ b/base/applications/wordpad/Zh.rc @@ -2,6 +2,7 @@ * wordpad (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni + * Copyright 2010 Cheer Xiao * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,7 +26,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "文件(&F)" BEGIN @@ -83,9 +84,9 @@ BEGIN POPUP "格式(&O)" BEGIN MENUITEM "字体(&F)..", ID_FONTSETTINGS - MENUITEM "子弹点(&B)", ID_BULLET + MENUITEM "项目符号(&B)", ID_BULLET MENUITEM "段落(&P)...", ID_PARAFORMAT - MENUITEM "标签(&T)...", ID_TABSTOPS + MENUITEM "制表位(&T)...", ID_TABSTOPS POPUP "背景(&D)" BEGIN MENUITEM "系统(&S)\tCtrl+1", ID_BACK_1 @@ -98,7 +99,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -106,23 +107,47 @@ BEGIN MENUITEM "复制(&C)", ID_EDIT_COPY MENUITEM "粘贴(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "子弹点(&B)" ID_BULLET + MENUITEM "项目符号(&B)" ID_BULLET MENUITEM "段落(&P)..." ID_PARAFORMAT END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "黑", ID_COLOR_BLACK + MENUITEM "Maroon", ID_COLOR_MAROON + MENUITEM "绿", ID_COLOR_GREEN + MENUITEM "Olive" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "紫" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "灰" ID_COLOR_GRAY + MENUITEM "Silver" ID_COLOR_SILVER + MENUITEM "红" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "黄" ID_COLOR_YELLOW + MENUITEM "蓝" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "白" ID_COLOR_WHITE + MENUITEM "自动" ID_COLOR_AUTOMATIC + END +END + +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和时间" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "可用格式",-1,3,2,100,15 + LTEXT "可选格式",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "确定(&O)",IDOK,87,12,40,12 PUSHBUTTON "取消(&C)",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "新建" FONT 9, "MS Shell Dlg" @@ -133,7 +158,7 @@ BEGIN PUSHBUTTON "取消(&C)",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "段落格式" FONT 9, "MS Shell Dlg" @@ -143,7 +168,7 @@ BEGIN EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "右", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "第一行", -1, 15, 58, 40, 13 + LTEXT "首行", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "对齐", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST @@ -151,12 +176,12 @@ BEGIN PUSHBUTTON "取消(&C)", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "标签" +Caption "制表位" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "标签停点", -1, 10, 10, 120, 90 + GROUPBOX "制表位宽度", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "添加(&A)", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "删除(&R)", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,14 +190,14 @@ BEGIN PUSHBUTTON "全部删除(&R)", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "自动换行", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "按视窗宽度(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "不要自动换行", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "按窗口宽度(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "按纸张宽度(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "工具栏", -1, 150, 10, 120, 85 CHECKBOX "工具栏(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 @@ -182,72 +207,80 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "RTF丰富格式 (*.rtf)" + STRING_RICHTEXT_FILES_RTF, "RTF 富文本 (*.rtf)" STRING_TEXT_FILES_TXT, "文本文件 (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "统一码文本文件 (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode 文本文件 (*.txt)" STRING_ALL_FILES, "所有文件 (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "左" STRING_ALIGN_RIGHT, "右" STRING_ALIGN_CENTER, "中" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - STRING_NEWFILE_RICHTEXT, "RTF丰富格式文件" + STRING_NEWFILE_RICHTEXT, "RTF 富文本" STRING_NEWFILE_TXT, "文本文件 " - STRING_NEWFILE_TXT_UNICODE, "统一码文本文件" + STRING_NEWFILE_TXT_UNICODE, "Unicode 文本文件" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "打印文件 (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "选项" STRING_VIEWPROPS_TEXT, "文本文字" - STRING_VIEWPROPS_RICHTEXT, "丰富格式文字" + STRING_VIEWPROPS_RICHTEXT, "富文本格式" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "打印" STRING_PREVIEW_NEXTPAGE, "下一页" STRING_PREVIEW_PREVPAGE, "上一页" STRING_PREVIEW_TWOPAGES, "双页" STRING_PREVIEW_ONEPAGE, "单页" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "放大" + STRING_PREVIEW_ZOOMOUT, "缩小" STRING_PREVIEW_CLOSE, "关闭" + STRING_PREVIEW_PAGE, "页" + STRING_PREVIEW_PAGES, "页" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "英寸" + STRING_UNITS_PT, "pt" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "保存改动到 '%s'?" + STRING_DEFAULT_FILENAME, "文档" + STRING_PROMPT_SAVE_CHANGES, "要保存 '%s' 吗?" STRING_SEARCH_FINISHED, "文件查找结束." STRING_LOAD_RICHED_FAILED, "RichEdit 装载失败." STRING_SAVE_LOSEFORMATTING, "你已经选择保存为文本文件, " \ "这可能导致格式丢失. " \ "你确定要这么做吗?" STRING_INVALID_NUMBER, "数字格式无效" - STRING_OLE_STORAGE_NOT_SUPPORTED, "不支持OLE 储存文件" + STRING_OLE_STORAGE_NOT_SUPPORTED, "不支持 OLE 储存文件" STRING_WRITE_FAILED, "不能保存文件." - STRING_WRITE_ACCESS_DENIED, "你没有保存文件的权力." + STRING_WRITE_ACCESS_DENIED, "你没有保存文件的权限." STRING_OPEN_FAILED, "不能打开文件." - STRING_OPEN_ACCESS_DENIED, "你没有打开文件的权力." + STRING_OPEN_ACCESS_DENIED, "你没有打开文件的权限." + STRING_PRINTING_NOT_IMPLEMENTED, "打印功能尚未实现" + STRING_MAX_TAB_STOPS, "最多只能添加 32 个制表位宽度." END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDM_MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU BEGIN POPUP "檔案(&F)" BEGIN @@ -320,7 +353,7 @@ BEGIN END END -IDM_POPUP MENU DISCARDABLE +IDM_POPUP MENU BEGIN POPUP "" BEGIN @@ -333,7 +366,7 @@ BEGIN END END -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +IDD_DATETIME DIALOG 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和時間" FONT 9, "MS Shell Dlg" @@ -344,7 +377,7 @@ BEGIN PUSHBUTTON "取消(&C)",IDCANCEL,87,26,40,12 END -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "新建" FONT 9, "MS Shell Dlg" @@ -355,7 +388,7 @@ BEGIN PUSHBUTTON "取消(&C)",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "段落格式" FONT 9, "MS Shell Dlg" @@ -373,7 +406,7 @@ BEGIN PUSHBUTTON "取消(&C)", IDCANCEL, 137, 33, 50, 15 END -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_TABSTOPS DIALOG 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "標籤" FONT 9, "MS Shell Dlg" @@ -387,12 +420,13 @@ BEGIN PUSHBUTTON "全部刪除(&R)", ID_TAB_EMPTY, 137, 51, 50, 15 END -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 STYLE DS_SYSMODAL Caption "" FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "自動換行", -1, 10, 10, 130, 85 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "按視窗寬度(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 RADIOBUTTON "按紙張寬度(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 GROUPBOX "工具欄", -1, 150, 10, 120, 85 @@ -403,7 +437,7 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_RICHTEXT_FILES_RTF, "RTF豐富格式 (*.rtf)" STRING_TEXT_FILES_TXT, "文本檔案 (*.txt)" @@ -411,43 +445,45 @@ BEGIN STRING_ALL_FILES, "所有檔案 (*.*)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_ALIGN_LEFT, "左" STRING_ALIGN_RIGHT, "右" STRING_ALIGN_CENTER, "中" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_NEWFILE_RICHTEXT, "RTF豐富格式檔案" STRING_NEWFILE_TXT, "文本檔案 " STRING_NEWFILE_TXT_UNICODE, "統一碼文本檔案" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PRINTER_FILES_PRN, "列印檔案 (*.PRN)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "選項" STRING_VIEWPROPS_TEXT, "文本文字" STRING_VIEWPROPS_RICHTEXT, "豐富格式文字" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_PREVIEW_PRINT, "列印" STRING_PREVIEW_NEXTPAGE, "下一頁" STRING_PREVIEW_PREVPAGE, "上一頁" STRING_PREVIEW_TWOPAGES, "雙頁" STRING_PREVIEW_ONEPAGE, "單頁" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "關閉" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "儲存改動到 '%s'?" @@ -462,4 +498,5 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "你沒有儲存檔案的權力." STRING_OPEN_FAILED, "不能開啟檔案." STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力." + STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" END diff --git a/base/applications/wordpad/olecallback.c b/base/applications/wordpad/olecallback.c new file mode 100644 index 00000000000..8b279ada89d --- /dev/null +++ b/base/applications/wordpad/olecallback.c @@ -0,0 +1,210 @@ +/* + * Wordpad implementation - Richedit OLE callback implementation + * + * Copyright 2010 by Dylan Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include +#include +#include +#include + +#include "wine/debug.h" +#include "wordpad.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wordpad); + +struct IRichEditOleCallbackImpl { + const IRichEditOleCallbackVtbl *vtbl; + IStorage *stg; + int item_num; +}; + +struct IRichEditOleCallbackImpl olecallback; + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInterface( + IRichEditOleCallback* This, + REFIID riid, + void **ppvObject) +{ + WINE_TRACE("(%p, %s, %p)\n", This, wine_dbgstr_guid(riid), ppvObject); + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IRichEditOleCallback)) + { + *ppvObject = This; + return S_OK; + } + WINE_FIXME("Unknown interface: %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallback_AddRef( + IRichEditOleCallback* This) +{ + WINE_TRACE("(%p)\n", This); + /* singleton */ + return 1; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallback_Release( + IRichEditOleCallback* This) +{ + WINE_TRACE("(%p)\n", This); + return 1; +} + +/*** IRichEditOleCallback methods ***/ +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetNewStorage( + IRichEditOleCallback* This, + LPSTORAGE *lplpstg) +{ + WCHAR name[32]; + static const WCHAR template[] = {'R','E','O','L','E','_','%','u','\0'}; + + WINE_TRACE("(%p, %p)\n", This, lplpstg); + wsprintfW(name, template, olecallback.item_num++); + return IStorage_CreateStorage(olecallback.stg, name, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, + 0, 0, lplpstg); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetInPlaceContext( + IRichEditOleCallback* This, + LPOLEINPLACEFRAME *lplpFrame, + LPOLEINPLACEUIWINDOW *lplpDoc, + LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + WINE_FIXME("(%p, %p, %p, %p) stub\n", This, lplpFrame, lplpDoc, lpFrameInfo); + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_ShowContainerUI( + IRichEditOleCallback* This, + BOOL fShow) +{ + WINE_TRACE("(%p, %d)\n", This, fShow); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject( + IRichEditOleCallback* This, + LPCLSID lpclsid, + LPSTORAGE lpstg, + LONG cp) +{ + WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_DeleteObject( + IRichEditOleCallback* This, + LPOLEOBJECT lpoleobj) +{ + WINE_TRACE("(%p, %p)\n", This, lpoleobj); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData( + IRichEditOleCallback* This, + LPDATAOBJECT lpdataobj, + CLIPFORMAT *lpcfFormat, + DWORD reco, + BOOL fReally, + HGLOBAL hMetaPict) +{ + WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n", + This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_ContextSensitiveHelp( + IRichEditOleCallback* This, + BOOL fEnterMode) +{ + WINE_TRACE("(%p, %d)\n", This, fEnterMode); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData( + IRichEditOleCallback* This, + CHARRANGE *lpchrg, + DWORD reco, + LPDATAOBJECT *lplpdataobj) +{ + WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect( + IRichEditOleCallback* This, + BOOL fDrag, + DWORD grfKeyState, + LPDWORD pdwEffect) +{ + WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect); + if (pdwEffect) + *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetContextMenu( + IRichEditOleCallback* This, + WORD seltype, + LPOLEOBJECT lpoleobj, + CHARRANGE *lpchrg, + HMENU *lphmenu) +{ + HINSTANCE hInstance = GetModuleHandleW(0); + HMENU hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); + + WINE_TRACE("(%p, %x, %p, %p, %p)\n", + This, seltype, lpoleobj, lpchrg, lphmenu); + + *lphmenu = GetSubMenu(hPopupMenu, 0); + return S_OK; +} + +struct IRichEditOleCallbackVtbl olecallbackVtbl = { + RichEditOleCallback_QueryInterface, + RichEditOleCallback_AddRef, + RichEditOleCallback_Release, + RichEditOleCallback_GetNewStorage, + RichEditOleCallback_GetInPlaceContext, + RichEditOleCallback_ShowContainerUI, + RichEditOleCallback_QueryInsertObject, + RichEditOleCallback_DeleteObject, + RichEditOleCallback_QueryAcceptData, + RichEditOleCallback_ContextSensitiveHelp, + RichEditOleCallback_GetClipboardData, + RichEditOleCallback_GetDragDropEffect, + RichEditOleCallback_GetContextMenu +}; + +struct IRichEditOleCallbackImpl olecallback = { + &olecallbackVtbl, NULL, 0 +}; + +HRESULT setup_richedit_olecallback(HWND hEditorWnd) +{ + HRESULT hr = StgCreateDocfile(NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, + 0, &olecallback.stg); + + SendMessageW(hEditorWnd, EM_SETOLECALLBACK, 0, (LPARAM)&olecallback); + return hr; +} diff --git a/base/applications/wordpad/print.c b/base/applications/wordpad/print.c index 231c90e891c..7761c32379a 100644 --- a/base/applications/wordpad/print.c +++ b/base/applications/wordpad/print.c @@ -33,8 +33,6 @@ typedef struct _previewinfo int textlength; HDC hdc; HDC hdc2; - HDC hdcSized; - HDC hdcSized2; RECT window; RECT rcPage; SIZE bmSize; @@ -705,43 +703,44 @@ static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) update_preview_scrollbars(hwndPreview, &window); } -static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight, BOOL draw_margins) +static void draw_margin_lines(HDC hdc, int x, int y, float ratio) { - HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - HBITMAP oldbm; HPEN hPen, oldPen; - int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + SIZE dpi; + RECT page_margin = preview.rcPage; - if(*hdcSized) { - oldbm = SelectObject(*hdcSized, hBitmapScaled); - DeleteObject(oldbm); - } else { - *hdcSized = CreateCompatibleDC(hdc); - SelectObject(*hdcSized, hBitmapScaled); - } + dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); + dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); - StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + page_margin.left = preview.rcPage.left + margins.left; + page_margin.top = preview.rcPage.top + margins.top; + page_margin.bottom = preview.rcPage.bottom - margins.bottom; + page_margin.right = preview.rcPage.right - margins.right; - if (!draw_margins) return; + page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); + page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); + page_margin.bottom = (int)((float)twips_to_pixels(page_margin.bottom, dpi.cy) * ratio); + page_margin.right = (int)((float)twips_to_pixels(page_margin.right, dpi.cx) * ratio); + + page_margin.left += x; + page_margin.top += y; + page_margin.bottom += y; + page_margin.right += x; - /* Draw margin lines */ hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - oldPen = SelectObject(*hdcSized, hPen); + oldPen = SelectObject(hdc, hPen); - MoveToEx(*hdcSized, 0, TopMargin, NULL); - LineTo(*hdcSized, bmNewWidth, TopMargin); - MoveToEx(*hdcSized, 0, BottomMargin, NULL); - LineTo(*hdcSized, bmNewWidth, BottomMargin); + MoveToEx(hdc, x, page_margin.top, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.top); + MoveToEx(hdc, x, page_margin.bottom, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.bottom); - MoveToEx(*hdcSized, LeftMargin, 0, NULL); - LineTo(*hdcSized, LeftMargin, bmNewHeight); - MoveToEx(*hdcSized, RightMargin, 0, NULL); - LineTo(*hdcSized, RightMargin, bmNewHeight); + MoveToEx(hdc, page_margin.left, y, NULL); + LineTo(hdc, page_margin.left, y + preview.bmScaledSize.cy); + MoveToEx(hdc, page_margin.right, y, NULL); + LineTo(hdc, page_margin.right, y + preview.bmScaledSize.cy); - SelectObject(*hdcSized, oldPen); + SelectObject(hdc, oldPen); DeleteObject(hPen); } @@ -750,41 +749,6 @@ static BOOL is_last_preview_page(int page) return preview.pageEnds[page - 1] >= preview.textlength; } -/* Update for zoom ratio changes with same page. */ -static void update_scaled_preview(HWND hMainWnd) -{ - FORMATRANGE fr; - HWND hwndPreview; - - /* This may occur on WM_CREATE before update_preview is called - * because a WM_SIZE message is generated from updating the - * scrollbars. */ - if (!preview.hdc) return; - - hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); - fr.hdcTarget = make_dc(); - fr.rc = fr.rcPage = preview.rcPage; - fr.rc.left += margins.left; - fr.rc.top += margins.top; - fr.rc.bottom -= margins.bottom; - fr.rc.right -= margins.right; - - draw_preview_page(preview.hdc, &preview.hdcSized, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy, TRUE); - - if(preview.pages_shown > 1) - { - draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy, - !is_last_preview_page(preview.page)); - } - - InvalidateRect(hwndPreview, NULL, TRUE); - DeleteDC(fr.hdcTarget); -} - void init_preview(HWND hMainWnd, LPWSTR wszFileName) { HINSTANCE hInstance = GetModuleHandleW(0); @@ -824,18 +788,6 @@ void close_preview(HWND hMainWnd) DeleteObject(oldbm); preview.hdc2 = NULL; } - if(preview.hdcSized) { - HBITMAP oldbm = GetCurrentObject(preview.hdcSized, OBJ_BITMAP); - DeleteDC(preview.hdcSized); - DeleteObject(oldbm); - preview.hdcSized = NULL; - } - if(preview.hdcSized2) { - HBITMAP oldbm = GetCurrentObject(preview.hdcSized2, OBJ_BITMAP); - DeleteDC(preview.hdcSized2); - DeleteObject(oldbm); - preview.hdcSized2 = NULL; - } preview_bar_show(hMainWnd, FALSE); DestroyWindow(hwndPreview); @@ -893,43 +845,69 @@ static void update_preview_buttons(HWND hMainWnd) static LRESULT print_preview(HWND hwndPreview) { + HPEN hPen, oldPen; HDC hdc; + HRGN back_rgn, excl_rgn; RECT window, background; PAINTSTRUCT ps; - POINT scrollpos; + int x, y; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); + back_rgn = CreateRectRgnIndirect(&window); - FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - - scrollpos.x = GetScrollPos(hwndPreview, SB_HORZ); - scrollpos.y = GetScrollPos(hwndPreview, SB_VERT); - - background.left = preview.spacing.cx - 2 - scrollpos.x; - background.right = background.left + preview.bmScaledSize.cx + 4; - background.top = preview.spacing.cy - 2 - scrollpos.y; - background.bottom = background.top + preview.bmScaledSize.cy + 4; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + x = preview.spacing.cx - GetScrollPos(hwndPreview, SB_HORZ); + y = preview.spacing.cy - GetScrollPos(hwndPreview, SB_VERT); + /* draw page outlines */ + hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); + oldPen = SelectObject(hdc, hPen); + background.left = x - 2; + background.right = x + preview.bmScaledSize.cx + 2; + background.top = y - 2; + background.bottom = y + preview.bmScaledSize.cy + 2; + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + excl_rgn = CreateRectRgnIndirect(&background); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); if(preview.pages_shown > 1) { background.left += preview.bmScaledSize.cx + preview.spacing.cx; background.right += preview.bmScaledSize.cx + preview.spacing.cx; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + SetRectRgn(excl_rgn, background.left, background.top, + background.right, background.bottom); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); } + SelectObject(hdc, oldPen); + DeleteObject(hPen); + FillRgn(hdc, back_rgn, GetStockObject(GRAY_BRUSH)); + DeleteObject(excl_rgn); + DeleteObject(back_rgn); - BitBlt(hdc, preview.spacing.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.hdcSized, 0, 0, SRCCOPY); + StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + draw_margin_lines(hdc, x, y, preview.zoomratio); if(preview.pages_shown > 1) { - BitBlt(hdc, preview.spacing.cx * 2 + preview.bmScaledSize.cx - scrollpos.x, - preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, - preview.bmScaledSize.cy, preview.hdcSized2, 0, 0, SRCCOPY); + if (!is_last_preview_page(preview.page)) { + x += preview.spacing.cx + preview.bmScaledSize.cx; + StretchBlt(hdc, x, y, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc2, 0, 0, + preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + draw_margin_lines(hdc, x, y, preview.zoomratio); + } else { + background.left += 2; + background.right -= 2; + background.top += 2; + background.bottom -= 2; + FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); + } } preview.window = window; @@ -1011,7 +989,7 @@ static void update_preview(HWND hMainWnd) DeleteDC(fr.hdcTarget); ReleaseDC(hwndPreview, hdc); - update_scaled_preview(hMainWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hMainWnd); update_preview_statusbar(hMainWnd); } @@ -1103,7 +1081,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: { update_preview_sizes(hWnd, FALSE); - update_scaled_preview(hWnd); + InvalidateRect(hWnd, NULL, FALSE); break; } @@ -1216,7 +1194,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) toggle_num_pages(hMainWnd); } else { update_preview_sizes(hWnd, TRUE); - update_scaled_preview(hMainWnd); + InvalidateRect(hWnd, NULL, FALSE); update_preview_buttons(hMainWnd); } @@ -1285,7 +1263,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) } else { HWND hwndPreview = GetDlgItem(hWnd, IDC_PREVIEW); update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } } @@ -1301,7 +1279,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) toggle_num_pages(hWnd); } else { update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } } diff --git a/base/applications/wordpad/registry.c b/base/applications/wordpad/registry.c index 7311fb68232..472ed4da9be 100644 --- a/base/applications/wordpad/registry.c +++ b/base/applications/wordpad/registry.c @@ -34,6 +34,7 @@ static const WCHAR key_text[] = {'T','e','x','t',0}; static const WCHAR var_file[] = {'F','i','l','e','%','d',0}; static const WCHAR var_framerect[] = {'F','r','a','m','e','R','e','c','t',0}; static const WCHAR var_barstate0[] = {'B','a','r','S','t','a','t','e','0',0}; +static const WCHAR var_wrap[] = {'W','r','a','p',0}; static const WCHAR var_maximized[] = {'M','a','x','i','m','i','z','e','d',0}; static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) @@ -377,10 +378,22 @@ static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], D if(!fetched) barState[index] = (1 << BANDID_TOOLBAR) | (1 << BANDID_FORMATBAR) | (1 << BANDID_RULER) | (1 << BANDID_STATUSBAR); - if(index == reg_formatindex(SF_RTF)) - wordWrap[index] = ID_WORDWRAP_WINDOW; - else if(index == reg_formatindex(SF_TEXT)) - wordWrap[index] = ID_WORDWRAP_NONE; + fetched = FALSE; + if(action == REG_OPENED_EXISTING_KEY) + { + DWORD size = sizeof(DWORD); + if(RegQueryValueExW(hKey, var_wrap, 0, NULL, (LPBYTE)&wordWrap[index], + &size) == ERROR_SUCCESS) + fetched = TRUE; + } + + if (!fetched) + { + if(index == reg_formatindex(SF_RTF)) + wordWrap[index] = ID_WORDWRAP_WINDOW; + else if(index == reg_formatindex(SF_TEXT)) + wordWrap[index] = ID_WORDWRAP_NONE; + } RegCloseKey(hKey); } @@ -391,7 +404,7 @@ void registry_read_formatopts_all(DWORD barState[], DWORD wordWrap[]) registry_read_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } -static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) +static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[]) { HKEY hKey; DWORD action = 0; @@ -400,13 +413,14 @@ static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) { RegSetValueExW(hKey, var_barstate0, 0, REG_DWORD, (LPBYTE)&barState[index], sizeof(DWORD)); - + RegSetValueExW(hKey, var_wrap, 0, REG_DWORD, (LPBYTE)&wordWrap[index], + sizeof(DWORD)); RegCloseKey(hKey); } } -void registry_set_formatopts_all(DWORD barState[]) +void registry_set_formatopts_all(DWORD barState[], DWORD wordWrap[]) { - registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState); - registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState); + registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState, wordWrap); + registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } diff --git a/base/applications/wordpad/rsrc.rc b/base/applications/wordpad/rsrc.rc index e0609440672..658505a59ed 100644 --- a/base/applications/wordpad/rsrc.rc +++ b/base/applications/wordpad/rsrc.rc @@ -72,6 +72,7 @@ IDC_ZOOM CURSOR "zoom.cur" #include "Nl.rc" #include "No.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc" diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c index 0e6566df74c..187aef09842 100644 --- a/base/applications/wordpad/wordpad.c +++ b/base/applications/wordpad/wordpad.c @@ -62,7 +62,6 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static HWND hMainWnd; static HWND hEditorWnd; static HWND hFindWnd; -static HMENU hPopupMenu; static HMENU hColorPopupMenu; static UINT ID_FINDMSGSTRING; @@ -89,6 +88,13 @@ typedef enum UNIT_PT } UNIT; +typedef struct +{ + int endPos; + BOOL wrapped; + WCHAR findBuffer[128]; +} FINDREPLACE_custom; + /* Load string resources */ static void DoLoadStrings(void) { @@ -1215,13 +1221,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(pFr->Flags & FR_FINDNEXT || pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) { - DWORD flags = FR_DOWN; - FINDTEXTW ft; - static CHARRANGE cr; - LRESULT end, ret; - GETTEXTLENGTHEX gt; - LRESULT length; - int startPos; + FINDREPLACE_custom *custom_data = (FINDREPLACE_custom*)pFr->lCustData; + DWORD flags; + FINDTEXTEXW ft; + CHARRANGE sel; + LRESULT ret = -1; HMENU hMenu = GetMenu(hMainWnd); MENUITEMINFOW mi; @@ -1230,69 +1234,69 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) mi.dwItemData = 1; SetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); - gt.flags = GTL_NUMCHARS; - gt.codepage = 1200; - - length = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)>, 0); - - if(pFr->lCustData == -1) + /* Make sure find field is saved. */ + if (pFr->lpstrFindWhat != custom_data->findBuffer) { - SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&startPos, (LPARAM)&end); - cr.cpMin = startPos; - pFr->lCustData = startPos; - cr.cpMax = length; - if(cr.cpMin == length) - cr.cpMin = 0; - } else - { - startPos = pFr->lCustData; + lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, + sizeof(custom_data->findBuffer)); + pFr->lpstrFindWhat = custom_data->findBuffer; } - if(cr.cpMax > length) - { - startPos = 0; - cr.cpMin = 0; - cr.cpMax = length; + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); + if(custom_data->endPos == -1) { + custom_data->endPos = sel.cpMin; + custom_data->wrapped = FALSE; } - ft.chrg = cr; + flags = FR_DOWN | (pFr->Flags & (FR_MATCHCASE | FR_WHOLEWORD)); ft.lpstrText = pFr->lpstrFindWhat; - if(pFr->Flags & FR_MATCHCASE) - flags |= FR_MATCHCASE; - if(pFr->Flags & FR_WHOLEWORD) - flags |= FR_WHOLEWORD; - - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); - - if(ret == -1) + /* Only replace existing selectino if it is an exact match. */ + if (sel.cpMin != sel.cpMax && + (pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL)) { - if(cr.cpMax == length && cr.cpMax != startPos) - { - ft.chrg.cpMin = cr.cpMin = 0; - ft.chrg.cpMax = cr.cpMax = startPos; - - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); + ft.chrg = sel; + SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ft.chrgText.cpMin == sel.cpMin && ft.chrgText.cpMax == sel.cpMax) { + SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); } } - if(ret == -1) - { - pFr->lCustData = -1; - MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, - MB_OK | MB_ICONASTERISK); - } else - { - end = ret + lstrlenW(pFr->lpstrFindWhat); - cr.cpMin = end; - SendMessageW(hEditorWnd, EM_SETSEL, ret, end); + /* Search from the start of the selection, but exclude the first character + * from search if there is a selection. */ + ft.chrg.cpMin = sel.cpMin; + if (sel.cpMin != sel.cpMax) + ft.chrg.cpMin++; + + /* Search to the end, then wrap around and search from the start. */ + if (!custom_data->wrapped) { + ft.chrg.cpMax = -1; + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ret == -1) { + custom_data->wrapped = TRUE; + ft.chrg.cpMin = 0; + } + } + + if (ret == -1) { + ft.chrg.cpMax = custom_data->endPos + lstrlenW(pFr->lpstrFindWhat) - 1; + if (ft.chrg.cpMax > ft.chrg.cpMin) + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + } + + if (ret == -1) { + custom_data->endPos = -1; + EnableWindow(hMainWnd, FALSE); + MessageBoxWithResStringW(hFindWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), + wszAppTitle, MB_OK | MB_ICONASTERISK | MB_TASKMODAL); + EnableWindow(hMainWnd, TRUE); + } else { + SendMessageW(hEditorWnd, EM_SETSEL, ft.chrgText.cpMin, ft.chrgText.cpMax); SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); - if(pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) - SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); - - if(pFr->Flags & FR_REPLACEALL) - handle_findmsg(pFr); + if (pFr->Flags & FR_REPLACEALL) + return handle_findmsg(pFr); } } @@ -1301,8 +1305,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { - static WCHAR findBuffer[MAX_STRING_LEN]; - static WCHAR replaceBuffer[MAX_STRING_LEN]; + static WCHAR selBuffer[128]; + static WCHAR replaceBuffer[128]; + static FINDREPLACE_custom custom_data; + static const WCHAR endl = '\r'; + FINDTEXTW ft; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1315,10 +1322,28 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->lStructSize = sizeof(FINDREPLACEW); fr->hwndOwner = hMainWnd; fr->Flags = FR_HIDEUPDOWN; - fr->lpstrFindWhat = findBuffer; + /* Find field is filled with the selected text if it is non-empty + * and stays within the same paragraph, otherwise the previous + * find field is used. */ + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&ft.chrg.cpMin, + (LPARAM)&ft.chrg.cpMax); + ft.lpstrText = &endl; + if (ft.chrg.cpMin != ft.chrg.cpMax && + SendMessageW(hEditorWnd, EM_FINDTEXTW, FR_DOWN, (LPARAM)&ft) == -1) + { + /* Use a temporary buffer for the selected text so that the saved + * find field is only overwritten when a find/replace is clicked. */ + GETTEXTEX gt = {sizeof(selBuffer), GT_SELECTION, 1200, NULL, NULL}; + SendMessageW(hEditorWnd, EM_GETTEXTEX, (WPARAM)>, (LPARAM)selBuffer); + fr->lpstrFindWhat = selBuffer; + } else { + fr->lpstrFindWhat = custom_data.findBuffer; + } fr->lpstrReplaceWith = replaceBuffer; - fr->lCustData = -1; - fr->wFindWhatLen = sizeof(findBuffer); + custom_data.endPos = -1; + custom_data.wrapped = FALSE; + fr->lCustData = (LPARAM)&custom_data; + fr->wFindWhatLen = sizeof(custom_data.findBuffer); fr->wReplaceWithLen = sizeof(replaceBuffer); if(replace) @@ -1769,29 +1794,6 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP return FALSE; } -static int context_menu(LPARAM lParam) -{ - int x = (int)(short)LOWORD(lParam); - int y = (int)(short)HIWORD(lParam); - HMENU hPop = GetSubMenu(hPopupMenu, 0); - - if(x == -1) - { - int from = 0, to = 0; - POINTL pt; - SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); - SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, to); - ClientToScreen(hEditorWnd, (POINT*)&pt); - x = pt.x; - y = pt.y; - } - - TrackPopupMenu(hPop, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, - x, y, 0, hMainWnd, 0); - - return 0; -} - static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; @@ -1929,6 +1931,7 @@ static LRESULT OnCreate( HWND hWnd ) } assert(hEditorWnd); + setup_richedit_olecallback(hEditorWnd); SetFocus(hEditorWnd); SendMessageW(hEditorWnd, EM_SETEVENTMASK, 0, ENM_SELCHANGE); @@ -2613,7 +2616,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara } else if(prompt_save_changes()) { registry_set_options(hMainWnd); - registry_set_formatopts_all(barState); + registry_set_formatopts_all(barState, wordWrap); PostQuitMessage(0); } break; @@ -2630,10 +2633,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara return OnSize( hWnd, wParam, lParam ); case WM_CONTEXTMENU: - if((HWND)wParam == hEditorWnd) - return context_menu(lParam); - else - return DefWindowProcW(hWnd, msg, wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); case WM_DROPFILES: { @@ -2675,7 +2675,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hAccel = LoadAcceleratorsW(hInstance, wszAccelTable); wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 4; @@ -2689,7 +2689,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.lpszClassName = wszMainWndClass; RegisterClassExW(&wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = preview_proc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -2697,7 +2697,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.hIcon = NULL; wc.hIconSm = NULL; wc.hCursor = LoadCursor(NULL, IDC_IBEAM); - wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = wszPreviewWndClass; RegisterClassExW(&wc); @@ -2714,7 +2714,6 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar set_caption(NULL); set_bar_states(); set_fileformat(SF_RTF); - hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); hColorPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_COLOR_POPUP)); get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); diff --git a/base/applications/wordpad/wordpad.h b/base/applications/wordpad/wordpad.h index c3c5bc089ba..0cde557117c 100644 --- a/base/applications/wordpad/wordpad.h +++ b/base/applications/wordpad/wordpad.h @@ -237,8 +237,10 @@ #define STRING_PRINTING_NOT_IMPLEMENTED 1711 #define STRING_MAX_TAB_STOPS 1712 +/* wordpad.c */ LPWSTR file_basename(LPWSTR); +/* print.c */ void dialog_printsetup(HWND); void dialog_print(HWND, LPWSTR); void target_device(HWND, DWORD); @@ -255,6 +257,7 @@ void registry_read_previewpages(HKEY hKey); LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM); void redraw_ruler(HWND); +/* registry.c */ int reg_formatindex(WPARAM); void registry_read_filelist(HWND); void registry_read_options(void); @@ -262,5 +265,8 @@ void registry_read_formatopts_all(DWORD[], DWORD[]); void registry_read_winrect(RECT*); void registry_read_maximized(DWORD*); void registry_set_filelist(LPCWSTR, HWND); -void registry_set_formatopts_all(DWORD[]); +void registry_set_formatopts_all(DWORD[], DWORD[]); void registry_set_options(HWND); + +/* olecallback.c */ +HRESULT setup_richedit_olecallback(HWND hEditorWnd); diff --git a/base/applications/wordpad/wordpad.rbuild b/base/applications/wordpad/wordpad.rbuild index 9c21eac69b9..069fb119a0b 100644 --- a/base/applications/wordpad/wordpad.rbuild +++ b/base/applications/wordpad/wordpad.rbuild @@ -4,12 +4,16 @@ . include/reactos/wine + wine comdlg32 + uuid + ole32 shell32 user32 gdi32 advapi32 comctl32 + olecallback.c print.c registry.c wordpad.c diff --git a/boot/freeldr/bootsect/fat.asm b/boot/freeldr/bootsect/fat.asm index d41db93a15a..0e803a58500 100644 --- a/boot/freeldr/bootsect/fat.asm +++ b/boot/freeldr/bootsect/fat.asm @@ -208,11 +208,11 @@ FoundFreeLoader: ; to the helper code. Skip the first three bytes ; because they contain a jump instruction to skip ; over the helper code in the FreeLoader image. - ;jmp 0000:8003h + ;jmp 0000:9003h push 0 ; push segment (0x0000) - mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8003 ; RVA -> VA and skip 3 bytes (jump to fathelper code) - push ax ; push offset + mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax + add bx, 0x8003 ; RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx ; push offset retf ; Transfer control to FreeLoader diff --git a/boot/freeldr/freeldr.rbuild b/boot/freeldr/freeldr.rbuild index 4f4763917aa..0a8b674d38e 100644 --- a/boot/freeldr/freeldr.rbuild +++ b/boot/freeldr/freeldr.rbuild @@ -1,6 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/boot/freeldr/freeldr/arch/i386/fathelp.asm b/boot/freeldr/freeldr/arch/i386/fathelp.asm index d3e09ee13b5..90e42a00475 100644 --- a/boot/freeldr/freeldr/arch/i386/fathelp.asm +++ b/boot/freeldr/freeldr/arch/i386/fathelp.asm @@ -125,10 +125,12 @@ LoadFile5: LoadFile_Done: mov dl,BYTE [BYTE bp+BootDrive] ; Load the boot drive into DL mov dh,[BootPartition] ; Load the boot partition into DH - push WORD 0x0000 - push WORD 0x8000 ; We will do a far return to 0000:8000h - retf ; Transfer control to ROSLDR + push 0 ; push segment (0x0000) + mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax + add bx, 0x8000 ; RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx ; push offset + retf ; Transfer control to FreeLoader ; Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: diff --git a/boot/freeldr/freeldr/freeldr.rbuild b/boot/freeldr/freeldr/freeldr.rbuild index 70974fda396..8e70ac92fd8 100644 --- a/boot/freeldr/freeldr/freeldr.rbuild +++ b/boot/freeldr/freeldr/freeldr.rbuild @@ -1,86 +1,36 @@ - - - - - - - - - freeldr_$(ARCH).lnk - - freeldr_startup - freeldr_base64k - freeldr_base - mini_hal - freeldr_arch - freeldr_main - rossym - cmlib - rtl - libcntpr - - - -nostartfiles - - - - - - - freeldr_arch - freeldr_startup - freeldr_base64k - freeldr_base - freeldr_main - rossym - cmlib - rtl - libcntpr - - -static - -lgcc - - -Wl,--image-base=0x80FFF000 - - - -Wl,--image-base=0x0001F000 - - - - - - - freeldr_startup - freeldr_base64k - freeldr_base - freeldr_arch - freeldr_main - rossym - cmlib - rtl - libcntpr - ppcmmu - - - - - - freeldr_startup - freeldr_base64k - freeldr_base - freeldr_arch - freeldr_main - rossym - cmlib - rtl - libcntpr - - -static - -lgcc - - - - + + + freeldr_startup + freeldr_base64k + freeldr_base + freeldr_arch + freeldr_main + rossym + cmlib + rtl + libcntpr + ppcmmu + + + + + + freeldr_$(ARCH).lnk + + freeldr_startup + freeldr_base64k + freeldr_base + + mini_hal + + freeldr_arch + freeldr_main + rossym + cmlib + rtl + libcntpr + + diff --git a/boot/freeldr/freeldr/setupldr.rbuild b/boot/freeldr/freeldr/setupldr.rbuild index f8c62169b29..6d1c25e550d 100644 --- a/boot/freeldr/freeldr/setupldr.rbuild +++ b/boot/freeldr/freeldr/setupldr.rbuild @@ -1,6 +1,7 @@ - + + freeldr_startup @@ -15,10 +16,4 @@ cmlib rtl libcntpr - - - - - -Tbss 0x50000 - diff --git a/config.template.rbuild b/config.template.rbuild index 077038b30a5..d8a130414d9 100644 --- a/config.template.rbuild +++ b/config.template.rbuild @@ -49,7 +49,7 @@ 4 = -O2 5 = -O3 --> - + @@ -20,7 +22,6 @@ crt_handler.c dllentry.c gccmain.c - getopt.c gs_support.c merr.c mingw_helpers.c @@ -47,7 +48,7 @@ crtexe.c dllargv.c - + include/reactos/mingw-w64 @@ -56,7 +57,7 @@ crtexe.c dllargv.c - + include/reactos/mingw-w64 crtdll.c @@ -66,4 +67,7 @@ + + getopt.c + diff --git a/lib/3rdparty/mingw/reactos.diff b/lib/3rdparty/mingw/reactos.diff index 88d81ed1570..8b7d045d9d1 100644 --- a/lib/3rdparty/mingw/reactos.diff +++ b/lib/3rdparty/mingw/reactos.diff @@ -1,38 +1,3 @@ -Index: CRT_fp10.c -=================================================================== ---- CRT_fp10.c (Revision 43956) -+++ CRT_fp10.c (Arbeitskopie) -@@ -7,6 +7,16 @@ - void _fpreset (void); - - void _fpreset (void) -- { __asm__ ("fninit" ) ;} -+{ -+#ifdef __GNUC__ -+ __asm__ ("fninit" ); -+#else -+ __asm fninit; -+#endif -+} - -+#ifdef __GNUC__ - void __attribute__ ((alias ("_fpreset"))) fpreset(void); -+#else -+void fpreset(void) { _fpreset(); } -+#endif -Index: CRT_fp8.c -=================================================================== ---- CRT_fp8.c (Revision 43956) -+++ CRT_fp8.c (Arbeitskopie) -@@ -14,4 +14,8 @@ - (* __MINGW_IMP_SYMBOL(_fpreset))(); - } - -+#ifdef __GNUC__ - void __attribute__ ((alias ("_fpreset"))) fpreset(void); -+#else -+void fpreset(void) { _fpreset(); } -+#endif Index: crtexe.c =================================================================== --- crtexe.c (Revision 43956) @@ -45,43 +10,3 @@ Index: crtexe.c #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); -@@ -51,7 +52,11 @@ - #define _commode (* __MINGW_IMP_SYMBOL(_commode)) - extern int _dowildcard; - -+#if defined(__GNUC__) - int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; -+#else -+int _MINGW_INSTALL_DEBUG_MATHERR = 0; -+#endif - extern int __defaultmatherr; - extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); - -Index: gs_support.c -=================================================================== ---- gs_support.c (Revision 43956) -+++ gs_support.c (Arbeitskopie) -@@ -112,6 +112,7 @@ - else - #endif - { -+#ifdef __GNUC__ - #ifdef _WIN64 - GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); - GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; -@@ -119,6 +120,15 @@ - GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); - GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; - #endif -+#else -+#ifdef _WIN64 -+ GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); -+ GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); -+#else -+ GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); -+ GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); -+#endif -+#endif - } - - #ifdef _WIN64 diff --git a/lib/pseh/amd64/framebased.S b/lib/pseh/amd64/framebased.S new file mode 100644 index 00000000000..401d9227f31 --- /dev/null +++ b/lib/pseh/amd64/framebased.S @@ -0,0 +1,25 @@ + +.text +.intel_syntax noprefix + +.globl _SEHCleanHandlerEnvironment +_SEHCleanHandlerEnvironment: + ret + +.globl _SEHCurrentRegistration +_SEHCurrentRegistration: + ret + +.globl _SEHRegisterFrame +_SEHRegisterFrame: + ret + +.globl _SEHUnregisterFrame +_SEHUnregisterFrame: + ret + +.globl _SEHGlobalUnwind +_SEHGlobalUnwind: + ret + +// EOF diff --git a/lib/pseh/pseh.rbuild b/lib/pseh/pseh.rbuild index dcbde827368..3d2cbfeef4d 100644 --- a/lib/pseh/pseh.rbuild +++ b/lib/pseh/pseh.rbuild @@ -16,5 +16,10 @@ framebased.S + + + framebased.S + + framebased.c diff --git a/lib/rtl/avlsupp.c b/lib/rtl/avlsupp.c new file mode 100644 index 00000000000..50b96ce2874 --- /dev/null +++ b/lib/rtl/avlsupp.c @@ -0,0 +1,397 @@ +/* + * PROJECT: ReactOS Runtime Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: lib/rtl/avlsupp.c + * PURPOSE: AVL Tree Internal Support Routines/Main Algorithms + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES ******************************************************************/ + +/* Internal header for table entries */ +typedef struct _TABLE_ENTRY_HEADER +{ + RTL_BALANCED_LINKS BalancedLinks; + LIST_ENTRY ListEntry; + LONGLONG UserData; +} TABLE_ENTRY_HEADER, *PTABLE_ENTRY_HEADER; + +typedef enum _RTL_AVL_BALANCE_FACTOR +{ + RtlUnbalancedAvlTree = -2, + RtlLeftHeavyAvlTree, + RtlBalancedAvlTree, + RtlRightHeavyAvlTree, +} RTL_AVL_BALANCE_FACTOR; + +C_ASSERT(RtlBalancedAvlTree == 0); + +/* FUNCTIONS ******************************************************************/ + +TABLE_SEARCH_RESULT +FORCEINLINE +RtlpFindAvlTableNodeOrParent(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + OUT PRTL_BALANCED_LINKS *NodeOrParent) +{ + PRTL_BALANCED_LINKS CurrentNode, ChildNode; + RTL_GENERIC_COMPARE_RESULTS Result; + + /* Quick check to see if the table is empty */ + if (!Table->NumberGenericTableElements) return TableEmptyTree; + + /* Set the current node */ + CurrentNode = RtlRightChildAvl(&Table->BalancedRoot); + + /* Start compare loop */ + while (TRUE) + { + /* Compare which side is greater */ + Result = RtlpAvlCompareRoutine(Table, + Buffer, + &((PTABLE_ENTRY_HEADER)CurrentNode)-> + UserData); + if (Result == GenericLessThan) + { + /* We're less, check if this is the left child */ + ChildNode = RtlLeftChildAvl(CurrentNode); + if (ChildNode) + { + /* Continue searching from this node */ + CurrentNode = ChildNode; + } + else + { + /* Otherwise, the element isn't in this tree */ + *NodeOrParent = CurrentNode; + return TableInsertAsLeft; + } + } + else if (Result == GenericGreaterThan) + { + /* We're more, check if this is the right child */ + ChildNode = RtlRightChildAvl(CurrentNode); + if (ChildNode) + { + /* Continue searching from this node */ + CurrentNode = ChildNode; + } + else + { + /* Otherwise, the element isn't in this tree */ + *NodeOrParent = CurrentNode; + return TableInsertAsRight; + } + } + else + { + /* We should've found the node */ + ASSERT(Result == GenericEqual); + + /* Return node found */ + *NodeOrParent = CurrentNode; + return TableFoundNode; + } + } +} + +VOID +FORCEINLINE +RtlPromoteAvlTreeNode(IN PRTL_BALANCED_LINKS Node) +{ + PRTL_BALANCED_LINKS ParentNode, SuperParentNode; + PRTL_BALANCED_LINKS *SwapNode1, *SwapNode2; + + /* Grab parents up to 2 levels high */ + ParentNode = RtlParentAvl(Node); + SuperParentNode = RtlParentAvl(ParentNode); + + /* Pick which nodes will be rotated */ + SwapNode1 = RtlIsLeftChildAvl(Node) ? &ParentNode->LeftChild : &ParentNode->RightChild; + SwapNode2 = RtlIsLeftChildAvl(Node) ? &Node->RightChild : &Node->LeftChild; + + /* Do the rotate, and update the parent and super-parent as needed */ + *SwapNode1 = *SwapNode2; + if (*SwapNode1) RtlSetParent(*SwapNode1, ParentNode); + *SwapNode2 = ParentNode; + RtlSetParent(ParentNode, Node); + + /* Now update the super-parent child link, and make it parent of the node*/ + SwapNode1 = (RtlLeftChildAvl(SuperParentNode) == ParentNode) ? + &SuperParentNode->LeftChild: &SuperParentNode->RightChild; + *SwapNode1 = Node; + RtlSetParent(Node, SuperParentNode); +} + +BOOLEAN +FORCEINLINE +RtlpRebalanceAvlTreeNode(IN PRTL_BALANCED_LINKS Node) +{ + PRTL_BALANCED_LINKS ChildNode, SubChildNode; + CHAR Balance; + ASSERT(RtlParentAvl(Node) != Node); + + /* Get the balance, and figure out which child node to go down on */ + Balance = RtlBalance(Node); + ChildNode = (Balance == RtlRightHeavyAvlTree) ? + RtlRightChildAvl(Node) : RtlLeftChildAvl(Node); + + /* The child and node have the same balance, promote the child upwards */ + if (RtlBalance(ChildNode) == Balance) + { + /* This performs the rotation described in Knuth A8-A10 for Case 1 */ + RtlPromoteAvlTreeNode(ChildNode); + + /* The nodes are now balanced */ + RtlSetBalance(ChildNode, RtlBalancedAvlTree); + RtlSetBalance(Node, RtlBalancedAvlTree); + return FALSE; + } + + /* The child has the opposite balance, a double promotion of the child's child must happen */ + if (RtlBalance(ChildNode) == -Balance) + { + /* Pick which sub-child to use based on the balance */ + SubChildNode = (Balance == RtlRightHeavyAvlTree) ? + RtlLeftChildAvl(ChildNode) : RtlRightChildAvl(ChildNode); + + /* Do the double-rotation described in Knuth A8-A10 for Case 2 */ + RtlPromoteAvlTreeNode(SubChildNode); + RtlPromoteAvlTreeNode(SubChildNode); + + /* Was the sub-child sharing the same balance as the node? */ + if (RtlBalance(SubChildNode) == Balance) + { + /* Then the subchild is now balanced, and the node's weight is inversed */ + RtlSetBalance(ChildNode, RtlBalancedAvlTree); + RtlSetBalance(Node, -Balance); + } + else if (RtlBalance(SubChildNode) == -Balance) + { + /* + * In this case, the sub-child weight was the inverse of the node, so + * the child now shares the node's balance original weight, while the + * node becomes balanced. + */ + RtlSetBalance(ChildNode, Balance); + RtlSetBalance(Node, RtlBalancedAvlTree); + } + else + { + /* + * Otherwise, the sub-child was unbalanced, so both the child and node + * now become balanced. + */ + RtlSetBalance(ChildNode, RtlBalancedAvlTree); + RtlSetBalance(Node, RtlBalancedAvlTree); + } + + /* In all cases, the sub-child is now balanced */ + RtlSetBalance(SubChildNode, RtlBalancedAvlTree); + return FALSE; + } + + /* + * The case that remains is that the child was already balanced, so this is + * This is the rotation required for Case 3 in Knuth A8-A10 + */ + RtlPromoteAvlTreeNode(ChildNode); + + /* Now the child has the opposite weight of the node */ + RtlSetBalance(ChildNode, -Balance); + + /* This only happens on deletion, so we return TRUE to terminate the delete */ + return TRUE; +} + +VOID +FORCEINLINE +RtlpInsertAvlTreeNode(IN PRTL_AVL_TABLE Table, + IN PRTL_BALANCED_LINKS NewNode, + IN OUT PVOID NodeOrParent, + IN OUT TABLE_SEARCH_RESULT SearchResult) +{ + CHAR Balance; + + /* Initialize the new inserted element */ + MI_ASSERT(SearchResult != TableFoundNode); + NewNode->LeftChild = NewNode->RightChild = NULL; + + /* Increase element count */ + Table->NumberGenericTableElements++; + + /* Check where we should insert the entry */ + if (SearchResult == TableEmptyTree) + { + /* This is the new root node */ + RtlInsertAsRightChildAvl(&Table->BalancedRoot, NewNode); + MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + + /* On AVL trees, we also update the depth */ + ASSERT(Table->DepthOfTree == 0); + Table->DepthOfTree = 1; + return; + } + else if (SearchResult == TableInsertAsLeft) + { + /* Insert it left */ + RtlInsertAsLeftChildAvl(NodeOrParent, NewNode); + } + else + { + /* Right node */ + RtlInsertAsRightChildAvl(NodeOrParent, NewNode); + } + + /* Little cheat to save on loop processing, taken from Timo */ + MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + RtlSetBalance(&Table->BalancedRoot, RtlLeftHeavyAvlTree); + + /* + * This implements A6-A7 from Knuth based on http://coding.derkeiler.com + * /pdf/Archive/C_CPP/comp.lang.c/2004-01/1812.pdf, however the algorithm + * is slightly modified to follow the tree based on the Parent Node such + * as the Windows algorithm does it, instead of following the nodes down. + */ + while (TRUE) + { + /* Calculate which side to balance on */ + Balance = RtlIsLeftChildAvl(NewNode) ? RtlLeftHeavyAvlTree : RtlRightHeavyAvlTree; + + /* Check if the parent node was balanced */ + if (RtlBalance(NodeOrParent) == RtlBalancedAvlTree) + { + /* It's not balanced anymore (heavy on one side) */ + RtlSetBalance(NodeOrParent, Balance); + + /* Move up */ + NewNode = NodeOrParent; + NodeOrParent = RtlParentAvl(NodeOrParent); + } + else if (RtlBalance(NodeOrParent) != Balance) + { + /* The parent's balance is opposite, so the tree is balanced now */ + RtlSetBalance(NodeOrParent, RtlBalancedAvlTree); + + /* Check if this is the root (the cheat applied earlier gets us here) */ + if (RtlBalance(&Table->BalancedRoot) == RtlBalancedAvlTree) + { + /* The depth has thus increased */ + Table->DepthOfTree++; + } + + /* We reached the root or a balanced node, so we're done */ + break; + } + else + { + /* The tree is now unbalanced, so AVL rebalancing must happen */ + RtlpRebalanceAvlTreeNode(NodeOrParent); + break; + } + } +} + +VOID +FORCEINLINE +RtlpDeleteAvlTreeNode(IN PRTL_AVL_TABLE Table, + IN PRTL_BALANCED_LINKS Node) +{ + PRTL_BALANCED_LINKS DeleteNode = NULL, ParentNode; + PRTL_BALANCED_LINKS *Node1, *Node2; + CHAR Balance; + + /* Take one of the children if possible */ + if (!(RtlLeftChildAvl(Node)) || !(RtlRightChildAvl(Node))) DeleteNode = Node; + + /* Otherwise, check if one side is longer */ + if (!(DeleteNode) && (RtlBalance(Node) >= RtlBalancedAvlTree)) + { + /* Pick the successor which will be the longest side in this case */ + DeleteNode = RtlRightChildAvl(Node); + while (RtlLeftChildAvl(DeleteNode)) DeleteNode = RtlLeftChildAvl(DeleteNode); + } + else if (!DeleteNode) + { + /* Pick the predecessor which will be the longest side in this case */ + DeleteNode = RtlLeftChildAvl(Node); + while (RtlRightChildAvl(DeleteNode)) DeleteNode = RtlRightChildAvl(DeleteNode); + } + + /* Get the parent node */ + ParentNode = RtlParentAvl(DeleteNode); + DPRINT("Parent: %p\n", ParentNode); + + /* Pick which now to use based on whether or not we have a left child */ + Node1 = RtlLeftChildAvl(DeleteNode) ? &DeleteNode->LeftChild : &DeleteNode->RightChild; + DPRINT("Node 1: %p %p\n", Node1, *Node1); + + /* Pick which node to swap based on if we're already a left child or not */ + Node2 = RtlIsLeftChildAvl(DeleteNode) ? &ParentNode->LeftChild : &ParentNode->RightChild; + DPRINT("Node 2: %p %p\n", Node2, *Node2); + + /* Pick the correct balance depending on which side will get heavier */ + Balance = RtlIsLeftChildAvl(DeleteNode) ? RtlLeftHeavyAvlTree : RtlRightHeavyAvlTree; + DPRINT("Balance: %lx\n", Balance); + + /* Swap the children nodes, making one side heavier */ + *Node2 = *Node1; + + /* If the node has a child now, update its parent */ + if (*Node1) RtlSetParent(*Node1, ParentNode); + + /* Assume balanced root for loop optimization */ + RtlSetBalance(&Table->BalancedRoot, RtlBalancedAvlTree); + + /* Loop up the tree by parents */ + while (TRUE) + { + /* Check if the tree's balance increased */ + if (RtlBalance(ParentNode) == Balance) + { + /* Now the tree is balanced */ + RtlSetBalance(ParentNode, RtlBalancedAvlTree); + } + else if (RtlBalance(ParentNode) == RtlBalancedAvlTree) + { + /* The tree has now become less balanced, since it was balanced */ + RtlSetBalance(ParentNode, -Balance); + + /* Deal with the loop optimization to detect loss of a tree level */ + if (RtlBalance(&Table->BalancedRoot) != RtlBalancedAvlTree) Table->DepthOfTree--; + break; + } + else + { + /* The tree has become unbalanced, so a rebalance is needed */ + if (RtlpRebalanceAvlTreeNode(ParentNode)) break; + + /* Get the new parent after the balance */ + ParentNode = RtlParentAvl(ParentNode); + } + + /* Choose which balance factor to use based on which side we're on */ + Balance = RtlIsRightChild(ParentNode) ? + RtlRightHeavyAvlTree : RtlLeftHeavyAvlTree; + + /* Iterate up the tree */ + ParentNode = RtlParentAvl(ParentNode); + } + + /* Check if this isn't the node we ended up deleting directly */ + if (Node == DeleteNode) return; + + /* Copy the deleted node itself */ + RtlpCopyAvlNodeData(DeleteNode, Node); + + /* Pick the right node to unlink */ + Node1 = RtlIsLeftChildAvl(Node) ? + &(RtlParentAvl(DeleteNode))->LeftChild : &(RtlParentAvl(DeleteNode))->RightChild; + *Node1 = DeleteNode; + + /* Reparent as appropriate */ + if (RtlLeftChildAvl(DeleteNode)) RtlSetParent(RtlLeftChildAvl(DeleteNode), DeleteNode); + if (RtlRightChildAvl(DeleteNode)) RtlSetParent(RtlRightChildAvl(DeleteNode), DeleteNode); +} + +/* EOF */ diff --git a/lib/rtl/avltable.c b/lib/rtl/avltable.c new file mode 100644 index 00000000000..acfb99d4a64 --- /dev/null +++ b/lib/rtl/avltable.c @@ -0,0 +1,325 @@ +/* +* PROJECT: ReactOS Runtime Library +* LICENSE: BSD - See COPYING.ARM in the top level directory +* FILE: lib/rtl/avltable.c +* PURPOSE: AVL Tree Generic Table Implementation +* PROGRAMMERS: ReactOS Portable Systems Group +*/ + +/* INCLUDES ******************************************************************/ + +#include +#define NDEBUG +#include + +/* Include RTL version of AVL support */ +#include "rtlavl.h" +#include "avlsupp.c" + +/* AVL FUNCTIONS *************************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +RtlInitializeGenericTableAvl(IN OUT PRTL_AVL_TABLE Table, + IN PRTL_AVL_COMPARE_ROUTINE CompareRoutine, + IN PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, + IN PRTL_AVL_FREE_ROUTINE FreeRoutine, + IN PVOID TableContext) +{ + /* Setup the table */ + RtlZeroMemory(Table, sizeof(RTL_AVL_TABLE)); + Table->BalancedRoot.Parent = &Table->BalancedRoot; + Table->CompareRoutine = CompareRoutine; + Table->AllocateRoutine = AllocateRoutine; + Table->FreeRoutine = FreeRoutine; + Table->TableContext = TableContext; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlInsertElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL, + IN OUT PVOID NodeOrParent, + IN OUT TABLE_SEARCH_RESULT SearchResult) +{ + PRTL_BALANCED_LINKS NewNode; + PVOID UserData; + + /* Check if the entry wasn't already found */ + if (SearchResult != TableFoundNode) + { + /* We're doing an allocation, sanity check */ + ASSERT(Table->NumberGenericTableElements != (MAXULONG - 1)); + + /* Allocate a node */ + NewNode = Table->AllocateRoutine(Table, + BufferSize + + FIELD_OFFSET(TABLE_ENTRY_HEADER, + UserData)); + if (!NewNode) + { + /* No memory or other allocation error, fail */ + if (NewElement) *NewElement = FALSE; + return NULL; + } + + /* Data to return to user */ + UserData = &((PTABLE_ENTRY_HEADER)NewNode)->UserData; + + /* Insert the node in the tree */ + RtlpInsertAvlTreeNode(Table, NewNode, NodeOrParent, SearchResult); + + /* Copy user buffer */ + RtlCopyMemory(UserData, Buffer, BufferSize); + } + else + { + /* Return the node we already found */ + NewNode = NodeOrParent; + UserData = &((PTABLE_ENTRY_HEADER)NewNode)->UserData; + } + + /* Return status */ + if (NewElement) *NewElement = (SearchResult == TableFoundNode); + + /* Return pointer to user data */ + return UserData; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlInsertElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL) +{ + PRTL_BALANCED_LINKS NodeOrParent = NULL; + TABLE_SEARCH_RESULT Result; + + /* Get the balanced links and table search result immediately */ + Result = RtlpFindAvlTableNodeOrParent(Table, Buffer, &NodeOrParent); + + /* Now call the routine to do the full insert */ + return RtlInsertElementGenericTableFullAvl(Table, + Buffer, + BufferSize, + NewElement, + NodeOrParent, + Result); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlIsGenericTableEmptyAvl(IN PRTL_AVL_TABLE Table) +{ + /* If there's no elements, the table is empty */ + return Table->NumberGenericTableElements == 0; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlNumberGenericTableElementsAvl(IN PRTL_AVL_TABLE Table) +{ + /* Return the element count */ + return Table->NumberGenericTableElements; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlLookupElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN OUT PVOID *NodeOrParent, + IN OUT TABLE_SEARCH_RESULT *SearchResult) +{ + /* Find the node */ + *SearchResult = RtlpFindAvlTableNodeOrParent(Table, + Buffer, + (PRTL_BALANCED_LINKS*)NodeOrParent); + if (*SearchResult != TableFoundNode) return NULL; + + /* Node found, return the user data */ + return &((PTABLE_ENTRY_HEADER)*NodeOrParent)->UserData; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlLookupElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + PRTL_BALANCED_LINKS NodeOrParent; + TABLE_SEARCH_RESULT Lookup; + + /* Call the full function */ + return RtlLookupElementGenericTableFullAvl(Table, + Buffer, + (PVOID*)&NodeOrParent, + &Lookup); +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN BOOLEAN Restart) +{ + /* Reset the restart key if needed */ + if (Restart) Table->RestartKey = NULL; + + /* Call the full function */ + return RtlEnumerateGenericTableWithoutSplayingAvl(Table, + (PVOID*)&Table->RestartKey); +} + +/* +* @implemented +*/ +PVOID +NTAPI +RtlLookupFirstMatchingElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + OUT PVOID *RestartKey) +{ + PRTL_BALANCED_LINKS Node, PreviousNode; + TABLE_SEARCH_RESULT SearchResult; + RTL_GENERIC_COMPARE_RESULTS Result = GenericEqual; + + /* Assume failure */ + *RestartKey = NULL; + + /* Find the node */ + SearchResult = RtlpFindAvlTableNodeOrParent(Table, Buffer, &Node); + if (SearchResult != TableFoundNode) return NULL; + + /* Scan each predecessor until a match is found */ + PreviousNode = Node; + while (Result == GenericEqual) + { + /* Save the node */ + Node = PreviousNode; + + /* Get the predecessor */ + PreviousNode = RtlRealPredecessorAvl(Node); + if ((!PreviousNode) || (RtlParentAvl(PreviousNode) == PreviousNode)) break; + + /* Check if this node matches */ + Result = RtlpAvlCompareRoutine(Table, + Buffer, + &((PTABLE_ENTRY_HEADER)PreviousNode)-> + UserData); + } + + /* Save the node as the restart key, and return its data */ + *RestartKey = Node; + return &((PTABLE_ENTRY_HEADER)Node)->UserData; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, + IN OUT PVOID *RestartKey) +{ + PRTL_BALANCED_LINKS CurrentNode; + + /* Skip an empty tree */ + if (RtlIsGenericTableEmptyAvl(Table)) return NULL; + + /* Check if we have a starting point */ + if (!*RestartKey) + { + /* We'll have to find it, keep going until the leftmost child */ + for (CurrentNode = RtlRightChildAvl(&Table->BalancedRoot); + RtlLeftChildAvl(CurrentNode); + CurrentNode = RtlLeftChildAvl(CurrentNode)); + + /* Found it */ + *RestartKey = CurrentNode; + } + else + { + /* We already had a child, keep going by getting its successor */ + CurrentNode = RtlRealSuccessorAvl(*RestartKey); + + /* If there was one, update the restart key */ + if (CurrentNode) *RestartKey = CurrentNode; + } + + /* Return the node's data if it was found, otherwise return NULL */ + if (CurrentNode) return &((PTABLE_ENTRY_HEADER)CurrentNode)->UserData; + return NULL; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlGetElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN ULONG I) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlDeleteElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + PRTL_BALANCED_LINKS Node; + TABLE_SEARCH_RESULT SearchResult; + + /* Find the node */ + SearchResult = RtlpFindAvlTableNodeOrParent(Table, Buffer, &Node); + if (SearchResult != TableFoundNode) return FALSE; + + /* If this node was the key, update it */ + if (Node == Table->RestartKey) Table->RestartKey = RtlRealPredecessorAvl(Node); + + /* Do the delete */ + Table->DeleteCount++; + RtlpDeleteAvlTreeNode(Table, Node); + Table->NumberGenericTableElements--; + + /* Reset accounting */ + Table->WhichOrderedElement = 0; + Table->OrderedPointer = NULL; + + /* Free the node's data */ + Table->FreeRoutine(Table, Node); + + /* It's done */ + return TRUE; +} + +/* EOF */ diff --git a/lib/rtl/generictable.c b/lib/rtl/generictable.c index 272182d0ba3..dee9cf18190 100644 --- a/lib/rtl/generictable.c +++ b/lib/rtl/generictable.c @@ -1,16 +1,14 @@ /* -* PROJECT: ReactOS Kernel +* PROJECT: ReactOS Runtime Library * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/rtl/generictable.c -* PURPOSE: Splay Tree and AVL Tree Generic Table Implementation +* PURPOSE: Splay Tree Generic Table Implementation * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) -* Art Yerks (ayerkes@speakeasy.net) */ /* INCLUDES ******************************************************************/ #include -#include "austin/avl.h" #define NDEBUG #include @@ -508,261 +506,4 @@ RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table, ListEntry))->UserData; } -/* AVL FUNCTIONS *************************************************************/ - -/* - * @implemented - */ -PVOID -NTAPI -RtlLookupElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - IN OUT PVOID *NodeOrParent, - IN OUT TABLE_SEARCH_RESULT *SearchResult) -{ - PRTL_BALANCED_LINKS OurNodeOrParent; - TABLE_SEARCH_RESULT OurSearchResult; - - if( !Table->NumberGenericTableElements ) - { - *SearchResult = TableEmptyTree; - *NodeOrParent = NULL; - return NULL; - } - - OurSearchResult = avl_search - (Table, Buffer, - Table->BalancedRoot.LeftChild, &OurNodeOrParent); - - if(SearchResult) *SearchResult = OurSearchResult; - if(NodeOrParent) *NodeOrParent = OurNodeOrParent; - - if(OurSearchResult == TableFoundNode) - return avl_data(OurNodeOrParent); - else - return NULL; -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlLookupElementGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer) -{ - PRTL_BALANCED_LINKS OurNodeOrParent; - TABLE_SEARCH_RESULT OurSearchResult; - return RtlLookupElementGenericTableFullAvl - (Table, Buffer, (PVOID *)&OurNodeOrParent, &OurSearchResult); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlDeleteElementGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer) -{ - TABLE_SEARCH_RESULT Result; - PRTL_BALANCED_LINKS Node; - - RtlLookupElementGenericTableFullAvl - ( Table, Buffer, (PVOID *)&Node, &Result ); - - if( Result == TableFoundNode ) - { - avl_delete_node(Table, Node); - Table->FreeRoutine(Table, Node); - if( Table->NumberGenericTableElements == 0 ) - avl_deinit(Table); - return TRUE; - } - else - { - return FALSE; - } -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlEnumerateGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN BOOLEAN Restart) -{ - if( Table->NumberGenericTableElements == 0 ) - return NULL; - - if( Restart ) - { - Table->RestartKey = avl_first(Table); - } - else - { - Table->RestartKey = avl_next(Table, Table->RestartKey); - } - if( !Table->RestartKey ) - return NULL; - else - return avl_data(Table->RestartKey); -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, - IN OUT PVOID *RestartKey) -{ - /* FIXME! */ - return NULL; -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlGetElementGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN ULONG I) -{ - PRTL_BALANCED_LINKS Node; - - if( I >= Table->NumberGenericTableElements ) return NULL; - else - { - Node = avl_first(Table); - while(I--) Node = avl_next(Table, Node); - return avl_data(Node); - } -} - -/* - * @implemented - */ -VOID -NTAPI -RtlInitializeGenericTableAvl(IN OUT PRTL_AVL_TABLE Table, - IN PRTL_AVL_COMPARE_ROUTINE CompareRoutine, - IN PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, - IN PRTL_AVL_FREE_ROUTINE FreeRoutine, - IN PVOID TableContext) -{ - RtlZeroMemory(Table, sizeof(RTL_AVL_TABLE)); - Table->BalancedRoot.Parent = &Table->BalancedRoot; - Table->CompareRoutine = CompareRoutine; - Table->AllocateRoutine = AllocateRoutine; - Table->FreeRoutine = FreeRoutine; - Table->TableContext = TableContext; -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlInsertElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - IN ULONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL, - IN OUT PVOID *NodeOrParent, - IN OUT TABLE_SEARCH_RESULT *SearchResult) -{ - PRTL_BALANCED_LINKS OurNodeOrParent; - TABLE_SEARCH_RESULT OurSearchResult; - - if(Table->NumberGenericTableElements == 0) { - avl_init(Table); - } - - if(NewElement) - *NewElement = FALSE; - - OurSearchResult = avl_search - (Table, Buffer, - Table->BalancedRoot.LeftChild, &OurNodeOrParent); - - if(NodeOrParent) *NodeOrParent = OurNodeOrParent; - if(SearchResult) *SearchResult = OurSearchResult; - - if(OurSearchResult == TableFoundNode) - { - RtlDeleteElementGenericTableAvl(Table, Buffer); - return RtlInsertElementGenericTableFullAvl - (Table, Buffer, BufferSize, - NewElement, NodeOrParent, SearchResult); - } - else - { - PRTL_BALANCED_LINKS NewNode = - Table->AllocateRoutine - (Table, - BufferSize + sizeof(RTL_BALANCED_LINKS) + BufferSize); - - if( !NewNode ) return NULL; - - NewNode->Balance = 0; - RtlCopyMemory(avl_data(NewNode), Buffer, BufferSize); - - OurNodeOrParent = NewNode; - - avl_insert_node(Table, NewNode); - return avl_data(NewNode); - } -} - -/* - * @implemented - */ -PVOID -NTAPI -RtlInsertElementGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - IN ULONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL) -{ - PVOID NodeOrParent; - TABLE_SEARCH_RESULT SearchResult; - - return RtlInsertElementGenericTableFullAvl - (Table, Buffer, BufferSize, NewElement, &NodeOrParent, &SearchResult); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlIsGenericTableEmptyAvl(PRTL_AVL_TABLE Table) -{ - return Table->NumberGenericTableElements == 0; -} - -/* - * @implemented - */ -ULONG -NTAPI -RtlNumberGenericTableElementsAvl(IN PRTL_AVL_TABLE Table) -{ - return Table->NumberGenericTableElements; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupFirstMatchingElementGenericTableAvl(IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - OUT PVOID *RestartKey) -{ - UNIMPLEMENTED; - return NULL; -} - /* EOF */ diff --git a/lib/rtl/rtl.rbuild b/lib/rtl/rtl.rbuild index 5627f5f9cac..3f58ac020bd 100644 --- a/lib/rtl/rtl.rbuild +++ b/lib/rtl/rtl.rbuild @@ -46,16 +46,12 @@ mem.c memgen.c - - avl.c - tree.c - - access.c acl.c actctx.c assert.c atom.c + avltable.c bitmap.c bootdata.c compress.c diff --git a/lib/rtl/rtlavl.h b/lib/rtl/rtlavl.h new file mode 100644 index 00000000000..7088ce1ecfe --- /dev/null +++ b/lib/rtl/rtlavl.h @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS Runtime Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: lib/rtl/rtlavl.h + * PURPOSE: RTL AVL Glue + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES ******************************************************************/ + +/* + * This is the glue code for the AVL package in the RTL meant for external callers. + * It's not very exciting, it just uses the RTL-defined fields without any magic, + * unlike the Mm version which has special handling for balances and parents, and + * does not implement custom comparison callbacks. + */ +#define MI_ASSERT(x) +#define RtlLeftChildAvl(x) (PRTL_BALANCED_LINKS)(RtlLeftChild(x)) +#define RtlRightChildAvl(x) (PRTL_BALANCED_LINKS)(RtlRightChild(x)) +#define RtlParentAvl(x) (PRTL_BALANCED_LINKS)(RtlParent(x)) +#define RtlRealPredecessorAvl(x) (PRTL_BALANCED_LINKS)(RtlRealPredecessor((PRTL_SPLAY_LINKS)(x))) +#define RtlRealSuccessorAvl(x) (PRTL_BALANCED_LINKS)(RtlRealSuccessor((PRTL_SPLAY_LINKS)(x))) +#define RtlInsertAsRightChildAvl RtlInsertAsRightChild +#define RtlInsertAsLeftChildAvl RtlInsertAsLeftChild +#define RtlIsLeftChildAvl RtlIsLeftChild + +VOID +FORCEINLINE +RtlpCopyAvlNodeData(IN PRTL_BALANCED_LINKS Node1, + IN PRTL_BALANCED_LINKS Node2) +{ + *Node1 = *Node2; +} + +RTL_GENERIC_COMPARE_RESULTS +FORCEINLINE +RtlpAvlCompareRoutine(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN PVOID UserData) +{ + /* Do the compare */ + return Table->CompareRoutine(Table, + Buffer, + UserData); +} + +VOID +FORCEINLINE +RtlSetParent(IN PRTL_BALANCED_LINKS Node, + IN PRTL_BALANCED_LINKS Parent) +{ + Node->Parent = Parent; +} + +VOID +FORCEINLINE +RtlSetBalance(IN PRTL_BALANCED_LINKS Node, + IN CHAR Balance) +{ + Node->Balance = Balance; +} + +CHAR +FORCEINLINE +RtlBalance(IN PRTL_BALANCED_LINKS Node) +{ + return Node->Balance; +} + +/* EOF */ diff --git a/lib/sdk/crt/crt.rbuild b/lib/sdk/crt/crt.rbuild index 9821329f510..a8cbc9020ad 100644 --- a/lib/sdk/crt/crt.rbuild +++ b/lib/sdk/crt/crt.rbuild @@ -113,6 +113,7 @@ adjust.c asin.c cabs.c + cosf.c cosh.c div.c fdivbug.c @@ -123,6 +124,7 @@ modf.c rand.c s_modf.c + sinf.c sinh.c tanh.c pow_asm.c @@ -141,9 +143,11 @@ aullrem_asm.s aullshr_asm.s ceil_asm.s + ceilf.S cos_asm.s fabs_asm.s floor_asm.s + floorf.S ftol_asm.s log_asm.s log10_asm.s @@ -156,7 +160,9 @@ ci.c exp.c fmod.c + fmodf.c ldexp.c + sqrtf.c - - atan2.c - exp.c - fmod.c - ldexp.c + cos.c + sin.c + + alldiv.S + atan.S + atan2.S + ceil.S + ceilf.S + exp.S + fabs.S + floor.S + floorf.S + fmod.S + fmodf.S + ldexp.S + log.S + log10.S + pow.S + sqrt.S + sqrtf.S + tan.S