diff options
Diffstat (limited to 'langpacks')
28 files changed, 50 insertions, 54 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index f43cb4e0b3..8753442693 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -544,7 +544,7 @@ [Limit avatar height to]
[Max Number of Flashes]
[Send Error]
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
[while sending the following message:]
[Try again]
[Message Session]
@@ -1004,7 +1004,7 @@ [Contact started typing]
[Contact stopped typing]
;file \src\core\stdmsg\src\msgtimedout.cpp
-[An unknown error has occured.]
+[An unknown error has occurred.]
;file \src\core\stduihist\history.cpp
[Invalid Message]
[Outgoing Message]
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt index ae647c38ff..ae1aaf6c53 100644 --- a/langpacks/english/Plugins/AIM.txt +++ b/langpacks/english/Plugins/AIM.txt @@ -84,7 +84,7 @@ [Invalid Screen Name or password.]
[Mismatched Screen Name or password.]
[You are connecting too frequently. Try waiting 10 minutes to reconnect.]
-[Unknown error occured when attempting to connect.]
+[Unknown error occurred when attempting to connect.]
[Invalid SNAC header.]
[Server rate limit exceeded.]
[Client rate limit exceeded]
@@ -127,7 +127,7 @@ [Read Only Field.]
[Write Only Field.]
[Unsupported Type.]
-[An Error has occured.]
+[An Error has occurred.]
[Invalid Account.]
[Delete Account.]
[Expired Account.]
diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt index 212e24fde3..3085511c14 100644 --- a/langpacks/english/Plugins/Alarms.txt +++ b/langpacks/english/Plugins/Alarms.txt @@ -50,7 +50,7 @@ [Yearly]
[i'm hiding]
[Date and Time]
-[Disable next occurence]
+[Disable next occurrence]
[Don't trigger on startup]
[No reminder]
[Dismiss]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index 2adbcf24a5..cf905a8e40 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -342,7 +342,7 @@ [Converting to MetaContact (Moving)]
[Do you want contact '%s' to be added to metacontact '%s'?]
[Adding contact to MetaContact]
-[Do you want contact '%s' to be default ?]
+[Do you want contact '%s' to be default?]
[Set default contact]
[Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]
[Changing MetaContacts (Moving)]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 17f8b28910..61ebe78c75 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -9,7 +9,7 @@ ;file \plugins\CmdLine\MimCmd\src\commands.cpp
[No help for '%s'.]
[Available commands: ]
-[Miranda has been closed or an error has occured while waiting for the result, could not process request.]
+[Miranda has been closed or an error has occurred while waiting for the result, could not process request.]
;file \plugins\CmdLine\MimCmd\src\MimCmd.cpp
[%s usage:\n]
[%s <command> [<param> [, <param> ..]]\n]
diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt index 1b9c32cdcc..6fba9bb50d 100644 --- a/langpacks/english/Plugins/Contacts.txt +++ b/langpacks/english/Plugins/Contacts.txt @@ -21,7 +21,7 @@ [&Details]
[Close]
[Contacts send error]
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
[Try again]
[Popup]
[Add to List]
diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt index 31ab6ddcea..4746641c89 100644 --- a/langpacks/english/Plugins/Exchange.txt +++ b/langpacks/english/Plugins/Exchange.txt @@ -32,7 +32,7 @@ [You have %d unread emails ...]
[You have one unread email ...]
[Exchange email]
-[Do you want to see the email headers ?]
+[Do you want to see the email headers?]
;file \plugins\Exchange\src\hooked_events.cpp
[Check exchange mailbox]
[Exchange notify]
diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt index bd34236ce3..674aab854a 100644 --- a/langpacks/english/Plugins/FTPFile.txt +++ b/langpacks/english/Plugins/FTPFile.txt @@ -111,7 +111,7 @@ [WAITING...]
[UNKNOWN]
;file \plugins\FTPFileYM\src\job_packer.cpp
-[Error occured when zipping the file(s).]
+[Error occurred when zipping the file(s).]
[%0.1f kB/s]
[%0.1f%% (%d kB/%d kB)]
[%s (%d kB/%d kB)]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index d628c5601c..4b7283dee7 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -82,9 +82,9 @@ [Only me]
;file \protocols\FacebookRM\src\contacts.cpp
[Contact was removed from your server list.]
-[Error occured when removing contact from server.]
+[Error occurred when removing contact from server.]
[Request for friendship was sent.]
-[Error occured when requesting friendship.]
+[Error occurred when requesting friendship.]
[Request for friendship was canceled.]
[Error occurred when canceling friendship request.]
;file \protocols\FacebookRM\src\dialogs.cpp
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt index 9243544f61..d7d69aa451 100644 --- a/langpacks/english/Plugins/FileAsMessage.txt +++ b/langpacks/english/Plugins/FileAsMessage.txt @@ -36,7 +36,7 @@ [Incoming file request. Do you want to proceed?]
[Cancelled by remote user]
[New incoming file request. Do you want to proceed?]
-[Paused, 'coz connection dropped]
+[Paused, because connection dropped]
[Failed on file initialization]
[Paused...]
[Synchronizing...]
diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt index 4d2229a680..d856cd5606 100644 --- a/langpacks/english/Plugins/Folders.txt +++ b/langpacks/english/Plugins/Folders.txt @@ -16,7 +16,7 @@ [Custom folders variables help]
[Close]
;file \plugins\Folders\src\dlg_handlers.cpp
-[Some changes weren't saved. Apply the changes now ?]
+[Some changes weren't saved. Apply the changes now?]
[Changes not saved]
[Don't forget to click on Apply to save the changes. If you don't then the changes won't]
[be saved to the database, they will only be valid for this session.]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt index f04b579301..4aead67b6d 100644 --- a/langpacks/english/Plugins/GG.txt +++ b/langpacks/english/Plugins/GG.txt @@ -121,8 +121,8 @@ [Popup window]
[Message with [img] BBCode]
[You need to specify your registration e-mail first.]
-[Your password will be sent to your registration e-mail.\nDo you want to continue ?]
-[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now ?]
+[Your password will be sent to your registration e-mail.\nDo you want to continue?]
+[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]
[Allow]
[Ask]
[Ignore]
@@ -149,7 +149,7 @@ ;file \protocols\Gadu-Gadu\src\groupchat.cpp
[Open &conference...]
[&Clear ignored conferences]
-[%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate ?]
+[%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate?]
[%s initiated the conference.]
[This is my own conference.]
[Participants]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index b3fb6eca7d..3ef7d84634 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -198,7 +198,7 @@ [Secure login failed.\nInvalid server response.]
[Secure login failed.\nInvalid key length.]
;file \protocols\IcqOscarJ\src\icqosc_svcs.cpp
-[Are you sure you want to revoke user's authorization (this will remove you from his/her list on some clients) ?]
+[Are you sure you want to revoke user's authorization? (this will remove you from his/her list on some clients)]
[Confirmation]
[** This message was blocked by the ICQ server ** The message was invalid.]
[** This message was blocked by the ICQ server ** The message was too long.]
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt index 9f3356fc39..f94bb20ba8 100644 --- a/langpacks/english/Plugins/IEView.txt +++ b/langpacks/english/Plugins/IEView.txt @@ -53,7 +53,7 @@ [IID_IOleInPlaceObject failed.]
[Failed to Advise]
[C++ Event Sink]
-[Ole Initialize failed.]
+[OleInitialize failed.]
[ERROR]
;file \plugins\IEView\src\MUCCHTMLBuilder.cpp
[%s has joined.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index ed58c67693..1defd67dc9 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -996,7 +996,7 @@ [Protocol is offline or no jid]
;file \protocols\JabberG\src\jabber_rc.cpp
[Command completed successfully]
-[Error occured during processing command]
+[Error occurred during processing command]
[Set status]
[Set options]
[Forward unread messages]
@@ -1024,7 +1024,7 @@ [Mark messages as read]
[%d message(s) forwarded]
[Workstation successfully locked]
-[Error %d occured during workstation lock]
+[Error %d occurred during workstation lock]
[Confirmation needed]
[Please confirm Miranda NG shutdown]
[There is no groupchats to leave]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt index 9fac929e38..e921c8d173 100644 --- a/langpacks/english/Plugins/Msg_Export.txt +++ b/langpacks/english/Plugins/Msg_Export.txt @@ -75,7 +75,7 @@ [Nick]
[Proto]
[UIN]
-[You have unapplyed changes do you wish to apply these first ?]
+[You have unapplyed changes do you wish to apply these first?]
[Executable files]
[All files]
[Failed to get the shells allocator!]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index e55a092454..6216638add 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -119,7 +119,7 @@ [gpg binary does not exists.\nplease choose another location]
[please choose gpg binary location]
[please set keyring's home directory]
-[There is existing key for contact, would you like to replace with new key ?]
+[There is existing key for contact, would you like to replace with new key?]
[New public key was received, do you want to import it?]
[Replace]
[Accept]
@@ -142,18 +142,18 @@ [GPG plugin problems]
[Your secret key whith id: ]
[ for account ]
-[ deleted from gpg secret keyring\nDo you want to set another key ?]
+[ deleted from gpg secret keyring\nDo you want to set another key?]
[Own secret key warning]
-[ expired and will not work\nDo you want to set another key ?]
+[ expired and will not work\nDo you want to set another key?]
[You didn't set a private key.\nWould you like to set it now?]
[Own private key warning]
-[Do you want to load key for all subcontacts ?]
+[Do you want to load key for all subcontacts?]
[Metacontact detected]
;file \plugins\New_GPG\src\messages.cpp
-[We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact ?]
-[Do you want to try to decrypt encrypted message ?]
+[We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact?]
+[Do you want to try to decrypt encrypted message?]
[failed to decrypt message, GPG returned error, turn on debug log for more details]
-[We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?]
+[We're trying to encrypt with untrusted key. Do you want to trust this key permanently?]
[failed o encrypt message, GPG returned error, turn on debug log for more details]
[Something wrong, gpg does not understand us, aborting encryption.]
;file \plugins\New_GPG\src\options.cpp
@@ -165,12 +165,12 @@ [Contact]
[Key ID]
[Protocol]
-[This key is not used by any contact. Do you want to remove it from public keyring ?]
+[This key is not used by any contact. Do you want to remove it from public keyring?]
[Key info]
[we have secret key for this public key, do not removing from GPG keyring]
[info]
[Key removed from GPG keyring]
-[Do you want to remove key from entire metacontact (all subcontacts) ?]
+[Do you want to remove key from entire metacontact (all subcontacts)?]
[Export public key]
[.asc pubkey file]
[Set log file]
@@ -188,8 +188,8 @@ [GPG public key file]
[Where is no public or private key.]
;file \plugins\New_GPG\src\utilities.cpp
-[Do you want to toggle encryption for all subcontacts ?]
-[Target file exists, do you want to replace it ?]
+[Do you want to toggle encryption for all subcontacts?]
+[Target file exists, do you want to replace it?]
[Capability to decrypt file not found on other side\nRecipient may be unable to decrypt file(s)\nDo you want to encrypt file(s) anyway?]
[Filetransfer warning]
[Unable to check encryption support on other side\nRecipient may be unable to decrypt file(s)\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with new_gpg used on other side.\nDo you want to encrypt file(s) anyway?]
diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt index 87a129f146..fa46a3f80e 100644 --- a/langpacks/english/Plugins/PackUpdater.txt +++ b/langpacks/english/Plugins/PackUpdater.txt @@ -49,7 +49,7 @@ [Check for pack updates]
[Pack Updater]
;file \plugins\PackUpdater\Src\Notifications.cpp
-[An error occured while downloading the update.]
+[An error occurred while downloading the update.]
[Component Name]
[Current Version]
[New Version]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt index ed76e59026..bb1d04d365 100644 --- a/langpacks/english/Plugins/PluginUpdater.txt +++ b/langpacks/english/Plugins/PluginUpdater.txt @@ -87,4 +87,4 @@ [Plugin list]
[Plugin Updater HTTP connection]
[Checking new updates...]
-[An error occured while checking new updates.]
+[An error occurred while checking new updates.]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index e17b6c8873..21df7b6aec 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -75,7 +75,7 @@ [Flash in the system tray and in the contact list]
[Show balloon popup]
[Send Error]
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
[while sending the following message:]
[Try again]
[Cancel]
@@ -86,7 +86,7 @@ [&H]
[&Q]
[Send To All Tabs]
-[You are about to send a message to all open tabs.\nAre you sure ?]
+[You are about to send a message to all open tabs.\nAre you sure?]
[Remember my choice for this container]
[Yes]
[No]
@@ -348,7 +348,7 @@ [Contact started typing]
[Contact stopped typing]
;file \plugins\Scriver\src\msgtimedout.cpp
-[An unknown error has occured.]
+[An unknown error has occurred.]
;file \plugins\Scriver\src\msgwindow.cpp
[Always On Top]
;file \plugins\Scriver\src\sendqueue.cpp
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt index cfdd7dbcc4..b4b871dfe4 100644 --- a/langpacks/english/Plugins/SecureIM.txt +++ b/langpacks/english/Plugins/SecureIM.txt @@ -109,7 +109,7 @@ [SecureIM: Error while decrypting the message.]
[SecureIM: Error while decrypting the message, bad message length.]
[SecureIM: Error while decrypting the message, bad message CRC.]
-[User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now ?]
+[User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now?]
[SecureIM not enabled! You Must Enable SecureIM with this user...]
[Can't Send Encrypted Message !\nUser is offline now and his secure key has been expired, Do you want to send your message ?\nIt will be unencrypted !]
[SecureIM won't be loaded because cryptopp.dll is missing or wrong version !]
@@ -166,9 +166,9 @@ [Session closed on timeout]
[Session closed by other side when status "disabled"]
[Session closed on error: %02x]
-[SecureIM received RSA Public Key from "%s"\n\nSHA1: %s\n\nDo you Accept this Key ?]
+[SecureIM received RSA Public Key from "%s"\n\nSHA1: %s\n\nDo you Accept this Key?]
[SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s]
-[SecureIM received NEW RSA Public Key from "%s"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key ?]
+[SecureIM received NEW RSA Public Key from "%s"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key?]
[SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s]
;file \plugins\SecureIM\src\loadicons.cpp
[Contact List]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt index 56ce677576..ef2b3757db 100644 --- a/langpacks/english/Plugins/SendSS.txt +++ b/langpacks/english/Plugins/SendSS.txt @@ -34,7 +34,7 @@ [Target Tool]
;file \plugins\SendScreenshotPlus\src\CSend.cpp
[GCHAT error]
-[An unknown error has occured.]
+[An unknown error has occurred.]
[Error]
;file \plugins\SendScreenshotPlus\src\CSend.h
[Unable to initiate %s.]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt index e540a29234..e22429ba75 100644 --- a/langpacks/english/Plugins/Tlen.txt +++ b/langpacks/english/Plugins/Tlen.txt @@ -1,10 +1,5 @@ #muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen Protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
+;langpack template for Tlen
;file \protocols\Tlen\res\tlen.rc
[Username:]
[Password:]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index 17b1d96dfa..df1ba093d7 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -189,7 +189,7 @@ [Keeps your custom birthday up to date.]
;file \plugins\UserInfoEx\src\classPsTree.cpp
[Due to a parameter error, one of the treeitems can't be added!]
-[An fatal error occured on adding a property sheet page!\nDialog creation aborted!]
+[A fatal error occurred on adding a property sheet page!\nDialog creation aborted!]
[Rename Item]
[Hide Item]
[Show Items:]
diff --git a/langpacks/english/Plugins/VersionInfo.txt b/langpacks/english/Plugins/VersionInfo.txt index 77f9177ef8..41f78947a3 100644 --- a/langpacks/english/Plugins/VersionInfo.txt +++ b/langpacks/english/Plugins/VersionInfo.txt @@ -47,7 +47,7 @@ ;file \plugins\VersionInfo\src\dlgHandlers.cpp
[Customize using folders plugin]
[Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it.]
-[Show plugin UUIDs ?]
+[Show plugin UUIDs?]
;file \plugins\VersionInfo\src\hooked_events.cpp
[VersionInfo]
[Output folder]
diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt index b6780c3422..9255af1e23 100644 --- a/langpacks/english/Plugins/WhenWasIt.txt +++ b/langpacks/english/Plugins/WhenWasIt.txt @@ -59,7 +59,7 @@ [All contacts except hidden ones]
[All contacts except ignored ones]
[All contacts except hidden and ignored ones]
-[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occuring today]]
+[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occurring today]]
[Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]
[Set birthday for %s:]
[%S protocol]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt index 1ce2a31388..7e32a93024 100644 --- a/langpacks/english/Plugins/Xfire.txt +++ b/langpacks/english/Plugins/Xfire.txt @@ -1,10 +1,11 @@ #muuid {9b8e1735-970d-4ce0-930c-a561956bdca2}
;============================================================
; File: Xfire.dll
-; Plugin: Xfire Protocol
+; Plugin: Xfire protocol
; Version: 0.1.8.4
; Authors: dufte
;============================================================
+[Xfire protocol support for Miranda NG.]
;file \protocols\Xfire\res\Kopie von resource.rc
[Password:]
[Loginname:]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index 732471a810..a871b3e897 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -101,7 +101,7 @@ [No new mail message]
;file \plugins\YAMN\src\browser\badconnect.cpp
[%s - connection error]
-[An error occured. Error code: %d]
+[An error occurred. Error code: %d]
[Unknown error]
[ - connection error]
;file \plugins\YAMN\src\browser\mailbrowser.cpp
@@ -138,7 +138,7 @@ [Error reading account file. Account file corrupted.]
[Memory allocation error while data reading]
[Reading file error. File already in use?]
-[Error while copying data to disk occured. File in use?]
+[Error while copying data to disk occurred. Is file in use?]
[POP3 plugin- write file error]
[Connecting to server]
[Entering POP3 account]
|