summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt2
-rw-r--r--langpacks/english/Langpack_english.txt36
-rw-r--r--langpacks/english/Plugins/AddContactPlus.txt2
-rw-r--r--langpacks/english/Plugins/Clist_blind.txt2
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt2
-rw-r--r--langpacks/english/Plugins/Clist_mw.txt2
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt2
-rw-r--r--langpacks/english/Plugins/CyrTranslit.txt2
-rw-r--r--langpacks/english/Plugins/Quotes.txt1
-rw-r--r--langpacks/english/Plugins/SimpleStatusMsg.txt2
-rw-r--r--langpacks/english/Plugins/Skype.txt7
-rw-r--r--langpacks/english/Plugins/WhatsApp.txt12
12 files changed, 24 insertions, 48 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 8c53ff0817..80d9393b85 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -18,7 +18,7 @@
[&Yes]
[&No]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Contact Display Options]
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index ca714a1e90..ef659eeb69 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -19,7 +19,7 @@
[&Yes]
[&No]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Contact Display Options]
@@ -1732,7 +1732,7 @@
; File: AddContactPlus.dll
; Plugin: Add contact+
; Version: 0.9.9.1
-; Authors: Bartosz 'Dezeath' Białek
+; Authors: Bartosz 'Dezeath' BiaŽek
;============================================================
[Provides the ability to quickly add new contacts.]
;file \plugins\AddContactPlus\res\resource.rc
@@ -3275,7 +3275,7 @@
[Yes]
[No]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Hotkeys]
[Show/Hide:]
[Read Message:]
@@ -3517,7 +3517,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Hide offline users]
@@ -4000,7 +4000,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Hide offline users]
@@ -4219,7 +4219,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Contact List]
@@ -5044,7 +5044,7 @@
;============================================================
[Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]
;file \plugins\CyrTranslit\src\MirandaContact.cpp
-[&Transliterate (ФЫВА->FYVA)]
+[&Transliterate]
#muuid {a0138fc6-4c52-4501-af93-7d3e20bcae5b}
;============================================================
; File: DbChecker.dll
@@ -13806,6 +13806,7 @@
[Last Year]
[User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
+;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
[Error occurred during site access.]
@@ -15027,7 +15028,7 @@
; File: SimpleStatusMsg.dll
; Plugin: Simple status message
; Version: 1.9.0.4
-; Authors: Bartosz 'Dezeath' Białek, Harven
+; Authors: Bartosz 'Dezeath' BiaŽek, Harven
;============================================================
[Provides a simple way to set status and away messages.]
;file \plugins\SimpleStatusMsg\res\resource.rc
@@ -15304,7 +15305,7 @@
[Incoming group call finished]
[The password is incorrect]
[Your application to join the conference was denied]
-[Incoming group call received]
+[Incoming group call started]
[You did not select any contact]
[Hi! I'd like to add you to my contact list]
;file \protocols\Skype\src\skype_contacts.cpp
@@ -15347,8 +15348,7 @@
[Grant authorization]
[Revoke authorization]
;file \protocols\Skype\src\skype_messages.cpp
-[Incoming call received]
-[Incoming call from %s. Use offical skype for calling.]
+[Incoming call started]
[Incoming call finished]
;file \protocols\Skype\src\skype_netlib.cpp
[%s connection]
@@ -15367,7 +15367,7 @@
[Password is too simple]
[Value starts with an invalid character]
[Avatars]
-[Command"%s" is unsupported]
+[Command "%s" is unsupported]
#muuid {2925520b-6677-4658-8bad-5661d13e4692}
;============================================================
; File: SkypeStatusChange.dll
@@ -19667,18 +19667,6 @@
; Authors: Uli Hecht
;============================================================
[WhatsApp protocol support for Miranda NG.]
-;file \protocols\WhatsApp\res\whatsapp.rc
-[Phone-Number]
-[Including country code, without '+' or '00']
-[Nickname]
-[Request Code]
-[Register Code]
-[SMS-Code:]
-[Will only be used for registration]
-[Use SSL connection (443 port)]
-[WhatsApp]
-[Cancel]
-[OK]
;file \protocols\WhatsApp\src\connection.cpp
[Please enter a country-code.]
[Please enter a phone-number without country code.]
diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index 04031fbee8..179aa2af6b 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -3,7 +3,7 @@
; File: AddContactPlus.dll
; Plugin: Add contact+
; Version: 0.9.9.1
-; Authors: Bartosz 'Dezeath' Białek
+; Authors: Bartosz 'Dezeath' BiaŽek
;============================================================
[Provides the ability to quickly add new contacts.]
;file \plugins\AddContactPlus\res\resource.rc
diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index e58da61875..21fd24ab3b 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -13,7 +13,7 @@
[Yes]
[No]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Hotkeys]
[Show/Hide:]
[Read Message:]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 5b43c236a3..86e08d6745 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -118,7 +118,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Hide offline users]
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index a1b661b5a6..6d04425f0f 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -30,7 +30,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Hide offline users]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 2351589483..f952057ce3 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -22,7 +22,7 @@
[No]
[Yes]
[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Ignore (expert mode) to unhide contacts.]
+[Use Options->Contacts->Ignore to unhide contacts.]
[Are you sure you want to delete %s?]
[This will erase all history and settings for this contact!]
[Contact List]
diff --git a/langpacks/english/Plugins/CyrTranslit.txt b/langpacks/english/Plugins/CyrTranslit.txt
index cc7062b272..9b2c77c37f 100644
--- a/langpacks/english/Plugins/CyrTranslit.txt
+++ b/langpacks/english/Plugins/CyrTranslit.txt
@@ -7,4 +7,4 @@
;============================================================
[Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]
;file \plugins\CyrTranslit\src\MirandaContact.cpp
-[&Transliterate (ФЫВА->FYVA)]
+[&Transliterate]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index d5edc2fd84..24a01bfb44 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,6 +120,7 @@
[Last Year]
[User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
+;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
[Error occurred during site access.]
diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index bb4049d054..139f5f071d 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -3,7 +3,7 @@
; File: SimpleStatusMsg.dll
; Plugin: Simple status message
; Version: 1.9.0.4
-; Authors: Bartosz 'Dezeath' Białek, Harven
+; Authors: Bartosz 'Dezeath' BiaŽek, Harven
;============================================================
[Provides a simple way to set status and away messages.]
;file \plugins\SimpleStatusMsg\res\resource.rc
diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index d0973a287b..2c600084e7 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -127,7 +127,7 @@
[Incoming group call finished]
[The password is incorrect]
[Your application to join the conference was denied]
-[Incoming group call received]
+[Incoming group call started]
[You did not select any contact]
[Hi! I'd like to add you to my contact list]
;file \protocols\Skype\src\skype_contacts.cpp
@@ -170,8 +170,7 @@
[Grant authorization]
[Revoke authorization]
;file \protocols\Skype\src\skype_messages.cpp
-[Incoming call received]
-[Incoming call from %s. Use offical skype for calling.]
+[Incoming call started]
[Incoming call finished]
;file \protocols\Skype\src\skype_netlib.cpp
[%s connection]
@@ -190,4 +189,4 @@
[Password is too simple]
[Value starts with an invalid character]
[Avatars]
-[Command"%s" is unsupported]
+[Command "%s" is unsupported]
diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index b6047aa602..54f4b17894 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -6,18 +6,6 @@
; Authors: Uli Hecht
;============================================================
[WhatsApp protocol support for Miranda NG.]
-;file \protocols\WhatsApp\res\whatsapp.rc
-[Phone-Number]
-[Including country code, without '+' or '00']
-[Nickname]
-[Request Code]
-[Register Code]
-[SMS-Code:]
-[Will only be used for registration]
-[Use SSL connection (443 port)]
-[WhatsApp]
-[Cancel]
-[OK]
;file \protocols\WhatsApp\src\connection.cpp
[Please enter a country-code.]
[Please enter a phone-number without country code.]