From 79a5720cf40a5568784fa30052bea8d4c20cbbb3 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 6 Jul 2013 15:42:08 +0000 Subject: - translation fixes (patch from dartraiden) git-svn-id: http://svn.miranda-ng.org/main/trunk@5247 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/belarusian/=CORE=.txt | 2 -- langpacks/belarusian/Plugins/Clist_modern.txt | 4 ++-- langpacks/belarusian/Plugins/Clist_nicer.txt | 2 -- langpacks/belarusian/Plugins/CryptoPP.txt | 4 ++-- langpacks/belarusian/Plugins/New_GPG.txt | 2 -- langpacks/belarusian/Plugins/SecureIM.txt | 2 -- langpacks/belarusian/Plugins/SendSS.txt | 2 -- langpacks/belarusian/Plugins/UInfoEx.txt | 6 ++---- langpacks/belarusian/Plugins/tabsrmm.txt | 2 -- langpacks/bulgarian/=DUPES=.txt | 2 -- langpacks/chinese/=DUPES=.txt | 2 -- langpacks/chinese/Plugins/MetaContacts.txt | 2 +- langpacks/czech/=CORE=.txt | 2 -- langpacks/czech/Plugins/Clist_modern.txt | 2 +- langpacks/czech/Plugins/Clist_nicer.txt | 2 -- langpacks/czech/Plugins/CryptoPP.txt | 2 +- langpacks/czech/Plugins/MetaContacts.txt | 4 +--- langpacks/czech/Plugins/New_GPG.txt | 2 -- langpacks/czech/Plugins/SecureIM.txt | 2 -- langpacks/czech/Plugins/SendSS.txt | 2 -- langpacks/czech/Plugins/TabSRMM.txt | 2 -- langpacks/czech/Plugins/UInfoEx.txt | 4 +--- langpacks/estonian/=DUPES=.txt | 2 -- langpacks/french/=CORE=.txt | 2 -- langpacks/french/Plugins/MetaContacts.txt | 2 +- langpacks/german/=CORE=.txt | 2 -- langpacks/german/Plugins/Clist_modern.txt | 4 ++-- langpacks/german/Plugins/Clist_nicer.txt | 2 -- langpacks/german/Plugins/CryptoPP.txt | 4 ++-- langpacks/german/Plugins/MetaContacts.txt | 4 +--- langpacks/german/Plugins/New_GPG.txt | 2 -- langpacks/german/Plugins/SecureIM.txt | 2 -- langpacks/german/Plugins/SendSS.txt | 2 -- langpacks/german/Plugins/TabSRMM.txt | 2 -- langpacks/german/Plugins/UInfoEx.txt | 6 ++---- langpacks/hebrew/Plugins/MetaContacts.txt | 2 +- langpacks/hungarian/=DUPES=.txt | 2 -- langpacks/italian/Plugins/MetaContacts.txt | 2 +- langpacks/japanese/=DUPES=.txt | 2 -- langpacks/norwegian/=DUPES=.txt | 2 -- langpacks/russian/=CORE=.txt | 2 ++ langpacks/spanish/=DUPES=.txt | 2 +- langpacks/spanish/Plugins/MetaContacts.txt | 2 +- langpacks/turkish/=DUPES=.txt | 2 -- plugins/Clist_modern/res/resource.rc | 2 +- plugins/Clist_nicer/res/resource.rc | 4 ++-- plugins/CryptoPP/src/GPGw/gpg.rc | 4 ++-- plugins/MetaContacts/res/MetaContacts.rc | 2 +- plugins/MetaContacts/src/edit.cpp | 2 +- plugins/New_GPG/res/new_gpg.rc | 4 ++-- plugins/SecureIM/res/resource.rc | 2 +- plugins/SendScreenshotPlus/src/mir_icolib.cpp | 2 +- plugins/StatusPlugins/resource.rc | 2 +- plugins/TabSRMM/res/resource.rc | 2 +- plugins/UserInfoEx/res/resource.rc | 10 +++++----- plugins/UserInfoEx/src/mir_icolib.cpp | 2 +- src/resource.rc | 2 +- 57 files changed, 45 insertions(+), 105 deletions(-) diff --git a/langpacks/belarusian/=CORE=.txt b/langpacks/belarusian/=CORE=.txt index 48a0359674..1917e55dfd 100644 --- a/langpacks/belarusian/=CORE=.txt +++ b/langpacks/belarusian/=CORE=.txt @@ -165,8 +165,6 @@ Паказаць гэты дыялог пры запуску Miranda NG [Save as default] Захаваць налады -[Ok] -Ок [SSL Traffic] Трафік SSL [Sounds] diff --git a/langpacks/belarusian/Plugins/Clist_modern.txt b/langpacks/belarusian/Plugins/Clist_modern.txt index 74fd23122c..ba9e45a7a3 100644 --- a/langpacks/belarusian/Plugins/Clist_modern.txt +++ b/langpacks/belarusian/Plugins/Clist_modern.txt @@ -144,8 +144,8 @@ Паказваць кантакты ў групах [Include status modes] Уключыць статусы -[Ok] -Ок +[OK] +ОK [Cancel] Скасаваць [Sticky contacts] diff --git a/langpacks/belarusian/Plugins/Clist_nicer.txt b/langpacks/belarusian/Plugins/Clist_nicer.txt index af0871231b..8cd7b25c7f 100644 --- a/langpacks/belarusian/Plugins/Clist_nicer.txt +++ b/langpacks/belarusian/Plugins/Clist_nicer.txt @@ -328,8 +328,6 @@ Copyright © 2004-2010 Miranda IM, 2012-2013ў рамках праекта Miran Уключыць групы [Include status modes] Уключыць статусы -[Ok] -Ок [Cancel] Скасаваць [Apply] diff --git a/langpacks/belarusian/Plugins/CryptoPP.txt b/langpacks/belarusian/Plugins/CryptoPP.txt index 835332978a..eaa88473ff 100644 --- a/langpacks/belarusian/Plugins/CryptoPP.txt +++ b/langpacks/belarusian/Plugins/CryptoPP.txt @@ -14,8 +14,8 @@ GnuPG плагін - ключ Увядзіце пароль для сакрэтнага ключа для: [User ID] ID карыстача -[Ok] -Ок +[OK] +ОK [Cancel] Скасаваць [GnuPG Plugin - Select public key] diff --git a/langpacks/belarusian/Plugins/New_GPG.txt b/langpacks/belarusian/Plugins/New_GPG.txt index 97e8e3d4b7..bf23cff06b 100644 --- a/langpacks/belarusian/Plugins/New_GPG.txt +++ b/langpacks/belarusian/Plugins/New_GPG.txt @@ -90,8 +90,6 @@ Імпартаваць [Select keyserver for key search:] Выбраць сервер ключоў для пошуку: -[Ok] -Ок [Userlist:] Ліст карыстальнікаў: [Export PubKey] diff --git a/langpacks/belarusian/Plugins/SecureIM.txt b/langpacks/belarusian/Plugins/SecureIM.txt index f74bde195a..55a50ae149 100644 --- a/langpacks/belarusian/Plugins/SecureIM.txt +++ b/langpacks/belarusian/Plugins/SecureIM.txt @@ -128,8 +128,6 @@ Модуль SecureIM. Фраза-пароль для прыватнага ключа [Enter passphrase for the secret key:] Увядзіце фразу-пароль для сакрэтнага ключа: -[Ok] -Ок [Mode] Рэжым [Native SecureIM] diff --git a/langpacks/belarusian/Plugins/SendSS.txt b/langpacks/belarusian/Plugins/SendSS.txt index e3cd716adb..8d01425265 100644 --- a/langpacks/belarusian/Plugins/SendSS.txt +++ b/langpacks/belarusian/Plugins/SendSS.txt @@ -96,8 +96,6 @@ Наперад [Update] Абнавіць -[Ok] -Ок [Apply] Ужыць [Down arrow] diff --git a/langpacks/belarusian/Plugins/UInfoEx.txt b/langpacks/belarusian/Plugins/UInfoEx.txt index 13a99192aa..1946e8fcd3 100644 --- a/langpacks/belarusian/Plugins/UInfoEx.txt +++ b/langpacks/belarusian/Plugins/UInfoEx.txt @@ -14,8 +14,8 @@ &Абнаўленне [Updating] Абнаўленне -[Ok] -Ок +[OK] +ОК [Cancel] Скасаваць [Apply] @@ -242,8 +242,6 @@ Імпартаваць [Dialog] Гутарка -[OK] -ОК [All] Усё [None] diff --git a/langpacks/belarusian/Plugins/tabsrmm.txt b/langpacks/belarusian/Plugins/tabsrmm.txt index 2e369e6d06..522e495108 100644 --- a/langpacks/belarusian/Plugins/tabsrmm.txt +++ b/langpacks/belarusian/Plugins/tabsrmm.txt @@ -585,8 +585,6 @@ Cтатусы для аўтаматычнага стварэння ўклада Экспартаваць... [Import from a file...] Імпартаваць... -[Ok] -Ок [Icons] Абразкі [Event type icons in the message log] diff --git a/langpacks/bulgarian/=DUPES=.txt b/langpacks/bulgarian/=DUPES=.txt index 5a4faf8204..91083c9a95 100644 --- a/langpacks/bulgarian/=DUPES=.txt +++ b/langpacks/bulgarian/=DUPES=.txt @@ -97,8 +97,6 @@ Показване [File] Файл -[Ok] -ОК [Sounds] Звук [&Preview] diff --git a/langpacks/chinese/=DUPES=.txt b/langpacks/chinese/=DUPES=.txt index 44156a1267..d27acea277 100644 --- a/langpacks/chinese/=DUPES=.txt +++ b/langpacks/chinese/=DUPES=.txt @@ -103,8 +103,6 @@ Miranda NG 目录下有包含新数据库设置的文件. 状态不同时显示 [File] 文件 -[Ok] -确定 [Sounds] 声音 [&Preview] diff --git a/langpacks/chinese/Plugins/MetaContacts.txt b/langpacks/chinese/Plugins/MetaContacts.txt index 8e44ec37ef..b5efca4d38 100644 --- a/langpacks/chinese/Plugins/MetaContacts.txt +++ b/langpacks/chinese/Plugins/MetaContacts.txt @@ -10,7 +10,7 @@ 加至已存在中继联系人 [Please select a MetaContact:] 请选择一位中继联系人: -[&Ok] +[&OK] 确定(&O) [Sort Alphabetically] 按字母顺序排序 diff --git a/langpacks/czech/=CORE=.txt b/langpacks/czech/=CORE=.txt index 2620e29b98..4f58db7f43 100644 --- a/langpacks/czech/=CORE=.txt +++ b/langpacks/czech/=CORE=.txt @@ -165,8 +165,6 @@ Spustit Zobrazit toto okno při spuštění Mirandy [Save as default] Uložit jako výchozí -[Ok] -OK [SSL Traffic] Včetně dat SSL [Sounds] diff --git a/langpacks/czech/Plugins/Clist_modern.txt b/langpacks/czech/Plugins/Clist_modern.txt index 5c375cc377..ab9c532738 100644 --- a/langpacks/czech/Plugins/Clist_modern.txt +++ b/langpacks/czech/Plugins/Clist_modern.txt @@ -144,7 +144,7 @@ Včetně skupin Zobrazit kontakty ve skupinách [Include status modes] Včetně stavu -[Ok] +[OK] OK [Cancel] Zrušit diff --git a/langpacks/czech/Plugins/Clist_nicer.txt b/langpacks/czech/Plugins/Clist_nicer.txt index f7d19d8530..1dc1b517eb 100644 --- a/langpacks/czech/Plugins/Clist_nicer.txt +++ b/langpacks/czech/Plugins/Clist_nicer.txt @@ -330,8 +330,6 @@ Nový Včetně skupin [Include status modes] Včetně stavu -[Ok] -OK [Cancel] Zrušit [Apply] diff --git a/langpacks/czech/Plugins/CryptoPP.txt b/langpacks/czech/Plugins/CryptoPP.txt index 28f1e7731e..bf45905183 100644 --- a/langpacks/czech/Plugins/CryptoPP.txt +++ b/langpacks/czech/Plugins/CryptoPP.txt @@ -14,7 +14,7 @@ Doplněk GnuPG - heslo Zadejte heslo pro privatní klíč uživatele [User ID] Identifikátor -[Ok] +[OK] OK [Cancel] Zrušit diff --git a/langpacks/czech/Plugins/MetaContacts.txt b/langpacks/czech/Plugins/MetaContacts.txt index c026b2d05b..dc1f603d61 100644 --- a/langpacks/czech/Plugins/MetaContacts.txt +++ b/langpacks/czech/Plugins/MetaContacts.txt @@ -12,7 +12,7 @@ Přidat k existujícímu metakontaktu [Please select a MetaContact:] Prosím vyberte metakontakt: -[&Ok] +[&OK] &OK [&Cancel] &Zrušit @@ -20,8 +20,6 @@ Prosím vyberte metakontakt: Seřadit abecedně [Editing] Úprava -[&OK] -&OK [Name:] Název: [Information] diff --git a/langpacks/czech/Plugins/New_GPG.txt b/langpacks/czech/Plugins/New_GPG.txt index 9dc15a03f5..9f7215312e 100644 --- a/langpacks/czech/Plugins/New_GPG.txt +++ b/langpacks/czech/Plugins/New_GPG.txt @@ -114,8 +114,6 @@ Importovat [Choose which keys to export] -[Ok] -OK [Export public keys (only set for contacts)] [Export all private keys] diff --git a/langpacks/czech/Plugins/SecureIM.txt b/langpacks/czech/Plugins/SecureIM.txt index 5d6a0f4997..24a1bcd6e3 100644 --- a/langpacks/czech/Plugins/SecureIM.txt +++ b/langpacks/czech/Plugins/SecureIM.txt @@ -138,8 +138,6 @@ Zrušit [Enter passphrase for the secret key:] -[Ok] -OK [Mode] Mód [Native SecureIM] diff --git a/langpacks/czech/Plugins/SendSS.txt b/langpacks/czech/Plugins/SendSS.txt index 6547f0a94f..640fb89c2f 100644 --- a/langpacks/czech/Plugins/SendSS.txt +++ b/langpacks/czech/Plugins/SendSS.txt @@ -180,8 +180,6 @@ Předchozí Další [Update] Aktualizovat -[Ok] -OK [Apply] Použít [Down arrow] diff --git a/langpacks/czech/Plugins/TabSRMM.txt b/langpacks/czech/Plugins/TabSRMM.txt index bc13777bf6..0c14c89e08 100644 --- a/langpacks/czech/Plugins/TabSRMM.txt +++ b/langpacks/czech/Plugins/TabSRMM.txt @@ -593,8 +593,6 @@ Zde můžete exportovat či nahrát všechna vaše nastavení barev a písem. Um Exportovat do souboru... [Import from a file...] Importovat ze souboru... -[Ok] -OK [Icons] Ikony [Event type icons in the message log] diff --git a/langpacks/czech/Plugins/UInfoEx.txt b/langpacks/czech/Plugins/UInfoEx.txt index 0279960f70..9ee51e1ce9 100644 --- a/langpacks/czech/Plugins/UInfoEx.txt +++ b/langpacks/czech/Plugins/UInfoEx.txt @@ -18,7 +18,7 @@ Původ Akt&ualizovat [Updating] Aktualizace -[Ok] +[OK] OK [Cancel] Zrušit @@ -254,8 +254,6 @@ Importovat [Dialog] Dialog -[OK] -OK [All] všechno [None] diff --git a/langpacks/estonian/=DUPES=.txt b/langpacks/estonian/=DUPES=.txt index baba29b0a8..9726fe5521 100644 --- a/langpacks/estonian/=DUPES=.txt +++ b/langpacks/estonian/=DUPES=.txt @@ -51,8 +51,6 @@ Lahku Kuva [File] Fail -[Ok] -Ok [Sounds] Helid [Name:] diff --git a/langpacks/french/=CORE=.txt b/langpacks/french/=CORE=.txt index 26b6db8154..b71498cb0f 100644 --- a/langpacks/french/=CORE=.txt +++ b/langpacks/french/=CORE=.txt @@ -147,8 +147,6 @@ Lancer... Toujours afficher au démarrage de Miranda NG [Save as default] Enregistrer par défaut -[Ok] -OK [Sounds] Sons [&Change...] diff --git a/langpacks/french/Plugins/MetaContacts.txt b/langpacks/french/Plugins/MetaContacts.txt index d6a47a87c3..211393d586 100644 --- a/langpacks/french/Plugins/MetaContacts.txt +++ b/langpacks/french/Plugins/MetaContacts.txt @@ -10,7 +10,7 @@ Ajouter à un MetaContact existant [Please select a MetaContact:] Veuillez choisir un MetaContact : -[&Ok] +[&OK] OK [Sort Alphabetically] Trier alphabétiquement diff --git a/langpacks/german/=CORE=.txt b/langpacks/german/=CORE=.txt index 32ece7bcd3..0f349df09b 100644 --- a/langpacks/german/=CORE=.txt +++ b/langpacks/german/=CORE=.txt @@ -165,8 +165,6 @@ Starten Diesen Dialog zeigen, wenn Miranda NG startet [Save as default] Als Standard speichern -[Ok] -Ok [SSL Traffic] SSL-Verkehr [Sounds] diff --git a/langpacks/german/Plugins/Clist_modern.txt b/langpacks/german/Plugins/Clist_modern.txt index 06606c3596..6bc32b7c92 100644 --- a/langpacks/german/Plugins/Clist_modern.txt +++ b/langpacks/german/Plugins/Clist_modern.txt @@ -144,8 +144,8 @@ Gruppen auswählen Kontakte gruppiert anzeigen [Include status modes] Statusmodus auswählen -[Ok] -ok +[OK] +OK [Cancel] Abbrechen [Sticky contacts] diff --git a/langpacks/german/Plugins/Clist_nicer.txt b/langpacks/german/Plugins/Clist_nicer.txt index d530be5adf..1e229ad78c 100644 --- a/langpacks/german/Plugins/Clist_nicer.txt +++ b/langpacks/german/Plugins/Clist_nicer.txt @@ -330,8 +330,6 @@ Neu Gruppen auswählen [Include status modes] Statusmodus auswählen -[Ok] -Ok [Cancel] Abbrechen [Apply] diff --git a/langpacks/german/Plugins/CryptoPP.txt b/langpacks/german/Plugins/CryptoPP.txt index e6ebb5eec3..ee5f4a4fa0 100644 --- a/langpacks/german/Plugins/CryptoPP.txt +++ b/langpacks/german/Plugins/CryptoPP.txt @@ -14,8 +14,8 @@ Crypto++ Bibliothek für SecureIM. Passwort des geheimen Schlüssels des Users eingeben: [User ID] Nutzer-ID -[Ok] -Ok +[OK] +OK [Cancel] Abbrechen [GnuPG Plugin - Select public key] diff --git a/langpacks/german/Plugins/MetaContacts.txt b/langpacks/german/Plugins/MetaContacts.txt index d6db991e4a..5a99515f7b 100644 --- a/langpacks/german/Plugins/MetaContacts.txt +++ b/langpacks/german/Plugins/MetaContacts.txt @@ -12,7 +12,7 @@ Fügt mehrer Kontakte zu einem zusammen. Zu Metakontakt hinzufügen [Please select a MetaContact:] Bitte einen Metakontakt wählen: -[&Ok] +[&OK] &OK [&Cancel] Abbre&chen @@ -20,8 +20,6 @@ Abbre&chen Alphabetisch sortieren [Editing] Bearbeiten -[&OK] -&OK [Name:] Name: [Information] diff --git a/langpacks/german/Plugins/New_GPG.txt b/langpacks/german/Plugins/New_GPG.txt index 4cf5672c5a..29b40a9a39 100644 --- a/langpacks/german/Plugins/New_GPG.txt +++ b/langpacks/german/Plugins/New_GPG.txt @@ -114,8 +114,6 @@ Wählen Sie den Keyserver für die Schlüsselsuche aus: [Choose which keys to export] -[Ok] -Ok [Export public keys (only set for contacts)] [Export all private keys] diff --git a/langpacks/german/Plugins/SecureIM.txt b/langpacks/german/Plugins/SecureIM.txt index fc6dbcd030..fdad2603f1 100644 --- a/langpacks/german/Plugins/SecureIM.txt +++ b/langpacks/german/Plugins/SecureIM.txt @@ -138,8 +138,6 @@ Abbrechen SecureIM: Passphrase des privaten Schlüssels [Enter passphrase for the secret key:] 'Passphrase' für den geheimen Schlüssel eingeben: -[Ok] -Ok [Mode] Modus [Native SecureIM] diff --git a/langpacks/german/Plugins/SendSS.txt b/langpacks/german/Plugins/SendSS.txt index c8f051a2fa..5aa9291265 100644 --- a/langpacks/german/Plugins/SendSS.txt +++ b/langpacks/german/Plugins/SendSS.txt @@ -180,8 +180,6 @@ Zurück Weiter [Update] Aktualisieren -[Ok] -Ok [Apply] Übernehmen [Down arrow] diff --git a/langpacks/german/Plugins/TabSRMM.txt b/langpacks/german/Plugins/TabSRMM.txt index dee0144c96..567b15f5bc 100644 --- a/langpacks/german/Plugins/TabSRMM.txt +++ b/langpacks/german/Plugins/TabSRMM.txt @@ -591,8 +591,6 @@ Sie können alle Ihre Farben sowie die Schriftart-Einstellungen exportieren und Exportiere in eine Datei ... [Import from a file...] Importiere aus einer Datei ... -[Ok] -Ok [Icons] Icons [Event type icons in the message log] diff --git a/langpacks/german/Plugins/UInfoEx.txt b/langpacks/german/Plugins/UInfoEx.txt index 7098848edc..36ec3de35a 100644 --- a/langpacks/german/Plugins/UInfoEx.txt +++ b/langpacks/german/Plugins/UInfoEx.txt @@ -18,8 +18,8 @@ Herkunft Akt&ualisieren [Updating] Aktualisieren -[Ok] -Ok +[OK] +OK [Cancel] Abbrechen [Apply] @@ -256,8 +256,6 @@ Fortschritt1 [Dialog] -[OK] -OK [All] Alle [None] diff --git a/langpacks/hebrew/Plugins/MetaContacts.txt b/langpacks/hebrew/Plugins/MetaContacts.txt index d8e32042c3..74bb8cb3f3 100644 --- a/langpacks/hebrew/Plugins/MetaContacts.txt +++ b/langpacks/hebrew/Plugins/MetaContacts.txt @@ -6,7 +6,7 @@ ; Authors: J. Schaal & S. Ellis ;============================================================ ;file \plugins\MetaContacts\res\MetaContacts.rc -[&Ok] +[&OK] &אישור [Contact Labels] תווית תוכן diff --git a/langpacks/hungarian/=DUPES=.txt b/langpacks/hungarian/=DUPES=.txt index 30c0ce4e86..61d3f1d860 100644 --- a/langpacks/hungarian/=DUPES=.txt +++ b/langpacks/hungarian/=DUPES=.txt @@ -99,8 +99,6 @@ Mozgat/átnevez Mutat [File] Fájl -[Ok] -Ok [Sounds] Hangok [&Preview] diff --git a/langpacks/italian/Plugins/MetaContacts.txt b/langpacks/italian/Plugins/MetaContacts.txt index f2970aec5d..7e8b741da6 100644 --- a/langpacks/italian/Plugins/MetaContacts.txt +++ b/langpacks/italian/Plugins/MetaContacts.txt @@ -6,7 +6,7 @@ ; Authors: J. Schaal & S. Ellis ;============================================================ ;file \plugins\MetaContacts\res\MetaContacts.rc -[&Ok] +[&OK] &OK [Function] Funzione diff --git a/langpacks/japanese/=DUPES=.txt b/langpacks/japanese/=DUPES=.txt index 461a4363df..406f4a51a9 100644 --- a/langpacks/japanese/=DUPES=.txt +++ b/langpacks/japanese/=DUPES=.txt @@ -101,8 +101,6 @@ Cancel(&C) 表示 [File] ファイル -[Ok] -Ok [Sounds] 音声 [&Preview] diff --git a/langpacks/norwegian/=DUPES=.txt b/langpacks/norwegian/=DUPES=.txt index 8942b5e5af..f1f8a68b42 100644 --- a/langpacks/norwegian/=DUPES=.txt +++ b/langpacks/norwegian/=DUPES=.txt @@ -103,8 +103,6 @@ Hva ønsker du å gjøre med filen nå? Vis [File] Fil -[Ok] -OK [Sounds] Lyder [&Preview] diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index 17e5bc5b12..d66fe535ed 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -2125,6 +2125,8 @@ Miranda пытается обновить вашу структуру хране Текстовые файлы [Sound Files] Звуковые файлы +[WAV Files] +Файлы WAV [Miranda NG is being restarted.\nPlease wait...] Miranda NG перезапускается.\nПожалуйста, подождите... [Open Logging Options] diff --git a/langpacks/spanish/=DUPES=.txt b/langpacks/spanish/=DUPES=.txt index 1c1ad1c02d..47ef0d1fdd 100644 --- a/langpacks/spanish/=DUPES=.txt +++ b/langpacks/spanish/=DUPES=.txt @@ -1,6 +1,6 @@ [OK] -Ok +OK [Cancel] Cancelar [Cancel] diff --git a/langpacks/spanish/Plugins/MetaContacts.txt b/langpacks/spanish/Plugins/MetaContacts.txt index 2b509a35a8..bddf4e22a5 100644 --- a/langpacks/spanish/Plugins/MetaContacts.txt +++ b/langpacks/spanish/Plugins/MetaContacts.txt @@ -6,7 +6,7 @@ ; Authors: J. Schaal & S. Ellis ;============================================================ ;file \plugins\MetaContacts\res\MetaContacts.rc -[&Ok] +[&OK] &OK [Function] Función diff --git a/langpacks/turkish/=DUPES=.txt b/langpacks/turkish/=DUPES=.txt index e4879d0605..789dc798d6 100644 --- a/langpacks/turkish/=DUPES=.txt +++ b/langpacks/turkish/=DUPES=.txt @@ -107,8 +107,6 @@ Ayrı&l Göster [File] Dosya -[Ok] -Tamam [Sounds] Sesler [&Preview] diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index db176538f0..9a92d07b1c 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -240,7 +240,7 @@ BEGIN CONTROL "Show contacts in groups",IDC_USEGROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,12,178,122,11 GROUPBOX "Include status modes",IDC_STATIC4,171,105,130,89,0,WS_EX_TRANSPARENT CONTROL "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,175,116,121,73 - PUSHBUTTON "Ok",IDOK,106,275,62,16 + PUSHBUTTON "OK",IDOK,106,275,62,16 PUSHBUTTON "Cancel",IDCANCEL,172,275,62,16 PUSHBUTTON "Apply",IDC_APPLY,242,275,62,16 CONTROL "",IDC_CLIST,"CListControl",0x24a,12,31,286,199,WS_EX_CLIENTEDGE diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index dbc176531f..a5526d7de8 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -385,7 +385,7 @@ BEGIN CONTROL "",IDC_GROUPS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,116,122,73 GROUPBOX "Include status modes",IDC_STATIC4,171,105,130,89,0,WS_EX_TRANSPARENT CONTROL "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,175,116,121,73 - PUSHBUTTON "Ok",IDOK,106,275,62,16 + PUSHBUTTON "OK",IDOK,106,275,62,16 PUSHBUTTON "Cancel",IDCANCEL,172,275,62,16 PUSHBUTTON "Apply",IDC_APPLY,242,275,62,16 CONTROL "",IDC_CLIST,"CListControl",0x24a,12,31,286,199,WS_EX_CLIENTEDGE @@ -490,7 +490,7 @@ BEGIN LTEXT "Show 2nd line:",IDC_STATIC,225,54,94,11 COMBOBOX IDC_SECONDLINEMODE,219,64,127,56,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_IGN_ADDPERMANENTLY,"MButtonClass",WS_TABSTOP,95,202,106,15,WS_EX_NOACTIVATE | 0x10000000L - PUSHBUTTON "Ok",IDOK,211,228,65,14 + PUSHBUTTON "OK",IDOK,211,228,65,14 PUSHBUTTON "Cancel",IDCANCEL,284,228,65,14 CONTROL "Draw overlay icon on avatar",IDC_OVERLAYICON,"Button",BS_AUTO3STATE | WS_TABSTOP,219,82,127,10 CONTROL "Show local time",IDC_SHOWLOCALTIME1,"Button",BS_AUTO3STATE | WS_TABSTOP,219,94,127,10 diff --git a/plugins/CryptoPP/src/GPGw/gpg.rc b/plugins/CryptoPP/src/GPGw/gpg.rc index 313dad2701..95791b28b9 100644 --- a/plugins/CryptoPP/src/GPGw/gpg.rc +++ b/plugins/CryptoPP/src/GPGw/gpg.rc @@ -34,7 +34,7 @@ BEGIN LTEXT "Enter passphrase for the secret key of user:", IDC_STATIC,6,4,168,8 LTEXT "User ID",IDC_USERID,6,14,168,8 EDITTEXT IDC_PASSPHRASE,6,24,168,12,ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ok",IDOK,181,7,50,14 + DEFPUSHBUTTON "OK",IDOK,181,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,181,24,50,14 END @@ -46,7 +46,7 @@ BEGIN CONTROL "",IDC_KEYLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,258,174 PUSHBUTTON "Refresh",IDC_REFRESH,7,187,50,14 - DEFPUSHBUTTON "Ok",IDOK,154,187,50,14 + DEFPUSHBUTTON "OK",IDOK,154,187,50,14 PUSHBUTTON "Cancel",IDCANCEL,215,187,50,14 END diff --git a/plugins/MetaContacts/res/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc index e463679067..3b8c65ca91 100644 --- a/plugins/MetaContacts/res/MetaContacts.rc +++ b/plugins/MetaContacts/res/MetaContacts.rc @@ -101,7 +101,7 @@ CAPTION "Add to Existing MetaContact" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CTEXT "Please select a MetaContact:",IDC_STATIC,27,11,201,14 - DEFPUSHBUTTON "&Ok",IDOK,73,238,48,14 + DEFPUSHBUTTON "&OK",IDOK,73,238,48,14 PUSHBUTTON "&Cancel",IDCANCEL,133,238,48,14 LISTBOX IDC_METALIST,44,28,168,168,LBS_NOINTEGRALHEIGHT | WS_VSCROLL CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,78,210,124,13 diff --git a/plugins/MetaContacts/src/edit.cpp b/plugins/MetaContacts/src/edit.cpp index a826e0f046..f3f23c39b9 100644 --- a/plugins/MetaContacts/src/edit.cpp +++ b/plugins/MetaContacts/src/edit.cpp @@ -320,7 +320,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: switch(HIWORD(wParam)) { - case BN_CLICKED: // A button ('Remove', 'Ok', 'Cancel' or 'Apply', normally) has been clicked + case BN_CLICKED: // A button ('Remove', 'OK', 'Cancel' or 'Apply', normally) has been clicked switch(LOWORD(wParam)) { case IDC_VALIDATE: // Apply changes, if there is still one contact attached to the metacontact. if (changes.num_contacts == 0) { // Otherwise, delete the metacontact. diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index 452c9aff7a..82f733c77f 100644 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -192,7 +192,7 @@ CAPTION "Choose which keys to export" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Static",IDC_STATIC,7,7,267,63 - PUSHBUTTON "Ok",IDC_OK,7,71,50,14 + PUSHBUTTON "OK",IDC_OK,7,71,50,14 PUSHBUTTON "Cancel",IDC_CANCEL,224,71,50,14 CONTROL "Export public keys (only set for contacts)",IDC_PUBLIC, "Button",BS_AUTORADIOBUTTON,15,23,248,10 @@ -210,7 +210,7 @@ BEGIN EDITTEXT IDC_NEW_PASSWD2,81,50,157,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Current password:",IDC_STATIC,7,17,61,8 LTEXT "New password twice:",IDC_STATIC,7,32,69,8 - PUSHBUTTON "Ok",IDC_OK,7,55,50,14 + PUSHBUTTON "OK",IDC_OK,7,55,50,14 END IDD_OPT_GPG DIALOGEX 0, 0, 286, 214 diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc index fd8239eac8..546e489903 100644 --- a/plugins/SecureIM/res/resource.rc +++ b/plugins/SecureIM/res/resource.rc @@ -192,7 +192,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Enter passphrase for the secret key:",IDC_STATIC,8,8,168,8 EDITTEXT IDC_PASSPHRASE,6,24,168,12,ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ok",IDOK,181,7,50,14 + DEFPUSHBUTTON "OK",IDOK,181,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,181,24,50,14 END diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 8ac3c67e8c..2523aa196c 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -63,7 +63,7 @@ static ICODESC icoDesc[] = { ICO_PLUG_ARROWR, LPGEN("Next"), SECT_BUTTONS, IDI_PLUG_ARROWR, 0 }, { ICO_PLUG_UPDATE, LPGEN("Update"), SECT_BUTTONS, IDI_PLUG_UPDATE, 0 }, - { ICO_PLUG_OK, LPGEN("Ok"), SECT_BUTTONS, IDI_PLUG_OK, 0 }, + { ICO_PLUG_OK, LPGEN("OK"), SECT_BUTTONS, IDI_PLUG_OK, 0 }, { ICO_PLUG_CANCEL, LPGEN("Cancel"), SECT_BUTTONS, IDI_PLUG_CLOSE, 0 }, { ICO_PLUG_APPLY, LPGEN("Apply"), SECT_BUTTONS, IDI_PLUG_APPLY, 0 }, { ICO_PLUG_EDIT, LPGEN("Edit"), SECT_BUTTONS, IDI_PLUG_EDIT, 0 }, diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc index e6f02e5283..7d87659a3e 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/plugins/StatusPlugins/resource.rc @@ -161,7 +161,7 @@ BEGIN LTEXT "ms",IDC_STATIC,88,37,13,8 LTEXT "Set after",IDC_STATIC,26,37,28,8 EDITTEXT IDC_DLGTIMEOUT,57,86,28,14,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Timeout",IDC_STATIC,26,89,26,8 + LTEXT "Timeout",IDC_STATIC,26,89,30,8 LTEXT "s",IDC_STATIC,88,89,12,8 CONTROL "Set window location",IDC_SETWINLOCATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,82,80,10 EDITTEXT IDC_XPOS,209,94,30,14,ES_AUTOHSCROLL | ES_NUMBER diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 4ccd20ab10..97fde999a7 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -574,7 +574,7 @@ CAPTION "Dialog" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",0x0,2,5,323,284 - PUSHBUTTON "Ok",IDOK,124,296,71,16 + PUSHBUTTON "OK",IDOK,124,296,71,16 PUSHBUTTON "Cancel",IDCANCEL,201,296,71,16 END diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 16c5d416a7..afba0e9cb3 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -37,7 +37,7 @@ BEGIN CONTROL "",STATIC_TREE,"SysTreeView32",TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_NOTOOLTIPS | TVS_FULLROWSELECT | NOT WS_VISIBLE | WS_HSCROLL | WS_TABSTOP,0,25,100,189 CONTROL "&Update",BTN_UPDATE,"UInfoButtonClass",WS_DISABLED | WS_TABSTOP,4,220,65,14,WS_EX_NOACTIVATE | 0x10000000L CTEXT "Updating",TXT_UPDATING,114,222,95,8,SS_NOPREFIX | SS_CENTERIMAGE | NOT WS_VISIBLE - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,213,220,52,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,213,220,52,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,269,220,60,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Apply",IDAPPLY,"UInfoButtonClass",WS_DISABLED | WS_TABSTOP,333,220,64,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "",STATIC_LINE2,"Static",SS_ETCHEDHORZ,0,214,408,1 @@ -156,7 +156,7 @@ BEGIN "Static",SS_SIMPLE | WS_GROUP,5,86,200,9 EDITTEXT EDIT_PHONE,21,96,215,12,ES_AUTOHSCROLL CONTROL "Phone can receive SMS text messages",CHECK_SMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,112,200,10,WS_EX_TRANSPARENT - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,105,132,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,105,132,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,175,132,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -173,7 +173,7 @@ BEGIN EDITTEXT EDIT_CATEGORY,9,42,190,13,ES_AUTOHSCROLL CONTROL "Enter the e-mail address here.",IDC_STATIC,"Static",SS_SIMPLE | WS_GROUP,3,64,203,8 EDITTEXT EDIT_EMAIL,9,75,190,13,ES_AUTOHSCROLL - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,72,101,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,72,101,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,141,101,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -291,7 +291,7 @@ BEGIN CONTROL "Enter a name for the anniversary here please:",IDC_STATIC, "Static",SS_SIMPLE | WS_GROUP,3,31,178,8 EDITTEXT EDIT_CATEGORY,26,44,133,12,ES_AUTOHSCROLL - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,47,69,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,47,69,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,117,69,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -517,7 +517,7 @@ BEGIN CONTROL "Contact Information",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,33,140,10 CONTROL "Contact History",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,48,140,10 CONTROL "",STATIC_LINE2,"Static",SS_ETCHEDHORZ,0,64,160,1 - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,16,70,65,14 + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,16,70,65,14 CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,87,70,66,14 END diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index 5b81b5071e..5ad36cfeba 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -78,7 +78,7 @@ static ICODESC icoDesc[] = { ICO_BTN_UPDATE, LPGEN("Update"), SECT_BUTTONS, IDI_BTN_UPDATE, 0 }, { ICO_BTN_IMPORT, LPGEN("Import"), SECT_BUTTONS, IDI_IMPORT, 0 }, { ICO_BTN_EXPORT, LPGEN("Export"), SECT_BUTTONS, IDI_EXPORT, 0 }, - { ICO_BTN_OK, LPGEN("Ok"), SECT_BUTTONS, IDI_BTN_OK, 0 }, + { ICO_BTN_OK, LPGEN("OK"), SECT_BUTTONS, IDI_BTN_OK, 0 }, { ICO_BTN_CANCEL, LPGEN("Cancel"), SECT_BUTTONS, IDI_BTN_CLOSE, 0 }, { ICO_BTN_APPLY, LPGEN("Apply"), SECT_BUTTONS, IDI_BTN_APPLY, 0 }, { ICO_BTN_GOTO, LPGEN("Goto"), SECT_BUTTONS, IDI_BTN_GOTO, 0 }, diff --git a/src/resource.rc b/src/resource.rc index 543ed27077..1f0414355d 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -252,7 +252,7 @@ BEGIN CONTROL "Show this dialog box when Miranda NG starts",IDC_SHOWTHISDLGATSTART, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,226,294,10 PUSHBUTTON "Save as default",IDC_SAVE,6,241,79,14 - DEFPUSHBUTTON "Ok",IDOK,173,241,54,14 + DEFPUSHBUTTON "OK",IDOK,173,241,54,14 PUSHBUTTON "Cancel",IDCANCEL,249,241,54,14 CONTROL "SSL Traffic",IDC_DUMPSSL,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,181,56,122,10 END -- cgit v1.2.3