diff options
26 files changed, 78 insertions, 70 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index b21a2eab8e..d121dc0c0c 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -869,7 +869,7 @@ [%s: Message Session]
[%s: Message Session (%u users)]
[Nick name]
-[Unique id]
+[Unique ID]
;file \src\core\stdclist\src\clcfonts.cpp
[Standard contacts]
[Online contacts to whom you have a different visibility]
@@ -1090,7 +1090,7 @@ [Rename Group]
[This group]
;file \src\modules\clist\keyboard.cpp
-[Show Hide Contact List]
+[Show/Hide Contact List]
[Read Message]
[Open Options Page]
[Open Logging Options]
@@ -1284,7 +1284,7 @@ [ANSI plugin]
[Running plugin]
[Unloaded plugin]
-[ShowHide]
+[Show/Hide]
[Exit]
[Main Menu]
[Leave chat]
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt index 4f5177e419..feb754bfcb 100644 --- a/langpacks/english/Plugins/AIM.txt +++ b/langpacks/english/Plugins/AIM.txt @@ -157,7 +157,7 @@ [No information has been provided by the server.]
[Item you want to delete not found in list.]
[Failed to add buddy to list: Item already exist.]
-[Error adding buddy(invalid id?, already in list?)]
+[Error adding buddy(invalid ID or already in list?)]
[Cannot add buddy. Limit for this type of item exceeded.]
[Error? Attempting to add ICQ contact to an AIM list.]
[Cannot add this buddy because it requires authorization.]
diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt index 452be2289a..5f16f0375e 100644 --- a/langpacks/english/Plugins/BossKey.txt +++ b/langpacks/english/Plugins/BossKey.txt @@ -5,7 +5,7 @@ ; Version: 0.5.0.3
; Authors: Goblineye Entertainment, Billy_Bons
;============================================================
-[Anti-Boss plugin.]
+[Anti-Boss plugin. Makes your Miranda NG hidden or password-protected.]
;file \plugins\BossKeyPlus\res\BossKey.rc
[BossKey]
[Go to Customize -> Hotkeys to change the hotkey]
diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt index 911f287cb5..d36c277083 100644 --- a/langpacks/english/Plugins/BuddyExpectator.txt +++ b/langpacks/english/Plugins/BuddyExpectator.txt @@ -42,7 +42,7 @@ [Enabled]
[Disabled]
[Hide]
-[NeverHide]
+[Never hide]
[Hiding %s (%S)]
[%d days since last message]
[Disable Miss You]
diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt index 76f5d52e8c..4bb52d7b9e 100644 --- a/langpacks/english/Plugins/ClientChangeNotify.txt +++ b/langpacks/english/Plugins/ClientChangeNotify.txt @@ -46,7 +46,7 @@ [Popups]
[ClientChangeNotify: Client changed]
[ClientChangeNotify]
-[`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]
+[`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,ID)) changed client to %extratext%]
;file \plugins\ClientChangeNotify\src\Misc.h
[Error #%d]
[Can't open log file ]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 61ebe78c75..aee2713b09 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -35,7 +35,7 @@ [Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>. The command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format:<name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE:The message string cannot exceed 512 characters.]
[Allows you to manage database settings.\nUsage:\n db set <module> <name> (b|i|d|s|w)<value>\n db delete <module> <name>\n db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.]
[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n <setting> is one of the following settings:\n status (disable | enable | toggle).\n server <proxy type> <server> <port>]
-[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain id use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain id use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]
+[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]
[Shows history or unread messages for a contact.\nUsage:\n history <command> <contact>.\n <command> is one of the following commands:\n unread - show unread messages for that contact.\n show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number + 1 (so the last event for a contact is -1).]
[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage:\n version. The command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
[Changes the user's nickname on the given protocol to the new name.\nUsage:\n setnickname <protocol> new_nickname]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt index 3331dc8f23..bd77c4b98b 100644 --- a/langpacks/english/Plugins/Db_autobackups.txt +++ b/langpacks/english/Plugins/Db_autobackups.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Db_autobackups.dll
; Plugin: Db autobackuper
-; Version: 0.0.0.8
+; Version: 0.0.0.9
; Authors: chaos.persei, sje, Kildor, Billy_Bons
;============================================================
[Db autobackuper plugin.]
@@ -22,20 +22,22 @@ [Disable progress bar]
[Disable Popups]
;file \plugins\Db_autobackups\src\backup.cpp
-[Miranda Databases]
+[Miranda databases]
[All Files]
-[Backup in Progress]
+[Backup in progress]
[Rotating backup files...]
[Copying database file...]
-[Database backuped]
+[Database backed up]
;file \plugins\Db_autobackups\src\main.cpp
+[Backup profile]
+[Save profile as...]
+[Database backups]
+[Backup folder]
+[Database]
[Backup Profile]
[Save Profile As...]
-[Database Backups]
-[Backup Folder]
-[Database]
;file \plugins\Db_autobackups\src\options.cpp
-[path to root miranda folder]
+[path to Miranda root folder]
[path to current miranda profile]
[name of current miranda profile (filename, without extension)]
[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt index 4cf8f8d946..09e1de8946 100644 --- a/langpacks/english/Plugins/FavContacts.txt +++ b/langpacks/english/Plugins/FavContacts.txt @@ -30,6 +30,8 @@ ;file \plugins\FavContacts\src\main.cpp
[Favorite Contact]
[Regular Contact]
+[<No group>]
+[Favourite Contacts]
[Contact name]
[Second line]
[Selected contact name (color)]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt index 87f6b25b3c..0e1942a593 100644 --- a/langpacks/english/Plugins/IRC.txt +++ b/langpacks/english/Plugins/IRC.txt @@ -305,7 +305,7 @@ [Please enter your password]
[Please enter your new password]
[Set new password]
-[Please enter desired languageID (numeric value, depends on server)]
+[Please enter desired language ID (numeric value, depends on server)]
[Change language of NickServ messages]
[Please enter URL that will be linked to your nick]
[Set URL, linked to nick]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 02d783b748..731e11386f 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -198,7 +198,7 @@ [Register account now]
[Jabber Account Information:]
[Member Information]
-[Member Information\n<user id>]
+[Member Information\n<user ID>]
[Role:]
[Set role]
[Affiliation:]
@@ -975,7 +975,7 @@ [outgoing presences]
[queries]
[Else ]
-[If jabber id is ']
+[If Jabber ID is ']
[ (nickname: ]
[If group is ']
[If subscription is ']
@@ -992,7 +992,7 @@ [List Editor...]
;file \protocols\JabberG\src\jabber_proto.cpp
[No compatible file transfer machanism exist]
-[Protocol is offline or no jid]
+[Protocol is offline or no JID]
;file \protocols\JabberG\src\jabber_rc.cpp
[Command completed successfully]
[Error occurred during processing command]
diff --git a/langpacks/english/Plugins/MetaContacts.txt b/langpacks/english/Plugins/MetaContacts.txt index 05c6576bb3..9e5d388fb6 100644 --- a/langpacks/english/Plugins/MetaContacts.txt +++ b/langpacks/english/Plugins/MetaContacts.txt @@ -28,7 +28,7 @@ [Options]
[Suppress status notification for subcontacts]
[Context Menu]
-[Use contact's unique id]
+[Use contact's unique ID]
[Use contact's display name]
[Contact Labels]
[Function]
@@ -76,7 +76,7 @@ [Yes]
[No]
[Contact]
-[Id]
+[ID]
[Protocol]
[Send Offline]
[Delete MetaContact?]
@@ -117,22 +117,22 @@ [History]
;file \plugins\MetaContacts\src\meta_utils.cpp
[Sender]
-[Could not get MetaContact id]
-[Assignment Error]
+[Could not get MetaContact ID]
+[Assignment error]
[Could not retreive MetaContact contact count]
[Could not retreive contact protocol]
-[Could not get unique id of contact]
+[Could not get unique ID of contact]
[Contact is 'Not on List' - please add the contact to your contact list before assigning.]
[MetaContact is full]
[Could not write contact protocol to MetaContact]
-[Could not write unique id of contact to MetaContact]
+[Could not write unique ID of contact to MetaContact]
[Could not write nickname of contact to MetaContact]
[Subcontact contact number < 0 - deleting MetaContact]
[Subcontact contact number (%d) > meta num contacts (%d) - deleting MetaContact]
[Subcontact's MetaContact not found - deleting MetaContact data]
[MetaContact number of contacts < 0 - deleting MetaContact]
[MetaContact default contact number out of range - deleting MetaContact]
-[MetaId: ]
+[Meta ID: ]
[MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact.]
[The 'MetaContacts Hidden Group' has been added to your contact list.\nThis is most likely due to server-side contact information. To fix this, so that\nMetaContacts continues to function correctly, you should:\n - disable MetaContacts using the 'Toggle MetaContacts Off' main menu item\n - move all contacts out of this group\n - synchronize your contacts with the server\n - re-enable MetaContacts]
[MetaContacts Warning]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt index 23f300f766..ddf182abdc 100644 --- a/langpacks/english/Plugins/NewXstatusNotify.txt +++ b/langpacks/english/Plugins/NewXstatusNotify.txt @@ -66,6 +66,7 @@ [On right click]
[Show status description]
[Ignore empty status and xStatus messages]
+[Connection timeout]
[Notification]
[Disable for extra status 'Music']
[Truncate message length to:]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index 19d867f267..7512980b40 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -21,7 +21,7 @@ [Delete key]
[Generate and use random key]
[Account:]
-[Key id:]
+[Key ID:]
[Copy public key]
[Export private key]
[Change password]
@@ -101,9 +101,9 @@ [Key length]
[Accounts]
[Default]
-[key id]
+[key ID]
[not set]
-[Default private key id]
+[Default private key ID]
[Failed to open file]
[Error]
[Generating new random key, please wait]
@@ -132,15 +132,15 @@ [Invalid Email]
[Generating new key, please wait...]
[Failed to export public key.]
-[GPG binary is set and valid (This is good).\n]
-[GPG binary unset or invalid (Plugin will not work).\n]
-[Home dir write access granted (This is good).\n]
-[Home dir has no write access (Plugin most probably will not work).\n]
-[Temp dir write access granted (This is good).\n]
-[Temp dir has no write access (Plugin should work, but may have some problems, file transfers will not work).]
+[GPG binary is set and valid (this is good).\n]
+[GPG binary unset or invalid (plugin will not work).\n]
+[Home dir write access granted (this is good).\n]
+[Home dir has no write access (plugin most probably will not work).\n]
+[Temp dir write access granted (this is good).\n]
+[Temp dir has no write access (plugin should work, but may have some problems, file transfers will not work).]
[\nGPG will be disabled until you solve these problems]
[GPG plugin problems]
-[Your secret key with id: ]
+[Your secret key with ID: ]
[ for account ]
[ deleted from GPG secret keyring.\nDo you want to set another key?]
[Own secret key warning]
diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt index f240efcd47..69330951c7 100644 --- a/langpacks/english/Plugins/NotifyAnything.txt +++ b/langpacks/english/Plugins/NotifyAnything.txt @@ -29,7 +29,7 @@ [Application launching is disabled.]
[Unterminated option.]
[No argument given to msg option.]
-[Id is required for replacement.]
+[ID is required for replacement.]
[Invalid argument for replace option: ]
[Empty message ignored.]
[Failed to write to log file.]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt index 1b4b07ac20..66675469cf 100644 --- a/langpacks/english/Plugins/Popup.txt +++ b/langpacks/english/Plugins/Popup.txt @@ -66,9 +66,9 @@ [Icons aligned to the right]
[Show Actions: (requires apply)]
[Mouse Actions Overwrite]
-[LeftButton]
-[MiddleButton]
-[RightButton]
+[Left Button]
+[Middle Button]
+[Right Button]
[Notifications]
[General options]
[Enable this notification]
diff --git a/langpacks/english/Plugins/Rate.txt b/langpacks/english/Plugins/Rate.txt index 5ed993b928..6a02c88db6 100644 --- a/langpacks/english/Plugins/Rate.txt +++ b/langpacks/english/Plugins/Rate.txt @@ -10,5 +10,4 @@ [Rate high]
[Rate medium]
[Rate low]
-[Contact Rate]
[Contact rate]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 088c1aa3a2..9070f91f4a 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -435,7 +435,7 @@ [Icons to display in the tray]
[nick of current contact (if defined)]
[protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
-[UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
+[User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
[path to root miranda folder]
[path to current miranda profile]
[name of current miranda profile (filename, without extension)]
@@ -506,7 +506,7 @@ [Control this room (CTRL+O)]
[Enable/disable the event filter (CTRL+F)]
[Nick name]
-[Unique id]
+[Unique ID]
[Status]
[%s: Chat Room (%u user)]
[%s: Chat Room (%u users)]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt index d474ba1bd0..c7b726463b 100644 --- a/langpacks/english/Plugins/SeenPlugin.txt +++ b/langpacks/english/Plugins/SeenPlugin.txt @@ -63,7 +63,7 @@ ;file \plugins\SeenPlugin\src\seen.h
[%n is %s (%u)]
[%i(%r)%bWas %o]
-[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClientID: %t%C%b%bStatus Message:%t%T]
+[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]
[-- Date --]
[year (4 digits)]
[year (2 digits)]
diff --git a/langpacks/english/Plugins/SkypeClassic.txt b/langpacks/english/Plugins/SkypeClassic.txt index cc4864837b..e438d1a6b4 100644 --- a/langpacks/english/Plugins/SkypeClassic.txt +++ b/langpacks/english/Plugins/SkypeClassic.txt @@ -3,22 +3,22 @@ ; File: SkypeClassic.dll
; Plugin: Skype Protocol (Classic)
; Version: 0.0.0.54
-; Authors: leecher - tweety - jls17
+; Authors: leecher, tweety, jls17
;============================================================
-[Skype protocol support for Miranda NG. Classic implemetation which requires running original Skype client.]
+[Skype protocol support for Miranda NG. Classic implementation which requires running original Skype client.]
;file \protocols\SkypeClassic\res\Resource.rc
[Set]
[Delete]
-[Start Skype with Miranda IM if not running using the following command line options:]
+[Start Skype with Miranda NG if not running using the following command line options:]
[/NOSPLASH - Don't show splash screen on startup]
[/MINIMIZED - Start Skype minimized]
-[/NOTRAY - Skype tray icon becomes grey and is therefore "invisible"]
-[/REMOVEABLE - For running portable skype]
+[/NOTRAY - Skype tray icon becomes gray and is therefore "invisible"]
+[/REMOVEABLE - For running portable Skype]
[/SECONDARY - This is the second instance]
[/DATAPATH - Specify Skype data folder*]
[Use custom Skype executable*]
-[* Relative path root is Miranda IM folder]
-[Shutdown Skype when you close Miranda IM]
+[* Relative path root is Miranda NG folder]
+[Shutdown Skype when you close Miranda NG]
[Unload Skype when you change to Offline status]
[Try at least]
[times to connect to Skype API before giving up]
@@ -36,7 +36,7 @@ [Use Skype proxy connection over network instead of local Skype API]
[Host:]
[Port:]
-[* You must restart Miranda IM in order to let the settings take effect]
+[* You must restart Miranda NG in order to let the settings take effect]
[This Skype proxy requires password authentication:]
[Name:]
[Birthday:]
@@ -56,7 +56,7 @@ [Keep requested online status on startup under every circumstance]
[Use time zone patch]
[Ignore time zones]
-[Show default skype avatar for contacts]
+[Show default Skype avatar for contacts]
[Suppress call summary chat message]
[Disable support for N/A and SkypeMe status (for Skype 4+)]
[Show full name in contact list instead of nickname]
@@ -95,11 +95,11 @@ ;file \protocols\SkypeClassic\src\skype.cpp
[Do a SkypeOut-call]
[invited ]
-[Phonecall]
+[Phone call]
[Incoming Skype Call]
[Incoming call from %s]
[Connection to Skype lost]
-[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda-Profile? (If you chose NO, you can always enable it in the plugin options later.]
+[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? (If you chose NO, you can always enable it in the plugin options later.]
;file \protocols\SkypeClassic\src\skypeopt.cpp
[Preview Error Message]
[Skype default]
diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt index af87edf5a6..7cb1abafe3 100644 --- a/langpacks/english/Plugins/StartupSilence.txt +++ b/langpacks/english/Plugins/StartupSilence.txt @@ -2,7 +2,7 @@ ;============================================================
; File: StartupSilence.dll
; Plugin: StartupSilence
-; Version: 0.1.0.0
+; Version: 0.2.0.0
; Authors: Vladimir Lyubimov
;============================================================
[Disables ALL popups and sounds for 10-300 sec at Miranda startup and enables them always for Miranda NG (Automatically per computer settings).]
@@ -19,8 +19,13 @@ [Main Menu Item (plugin reload or Miranda restart required)]
[TopToolBar button (Miranda restart required)]
[Reset to default\r\n(for this computer)]
-[You need configure it once for each computer, where you run your Miranda NG.]
+[You need to configure it once for each computer, where you run your Miranda NG.]
[No Apply button required.]
+[After startup set:]
+[Filtered popups only (leave uncheck to no popups)]
+[Enable sounds]
+[Allow to set sounds and filtered popups only after startup (uncheck for all popups and sounds)]
+[Allow mRadio or Weather popups, etc...]
;file \plugins\StartupSilence\src\main.cpp
[Events]
;file \plugins\StartupSilence\src\StartupSilence.h
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 602cbf93e2..0c584b3907 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -7,7 +7,7 @@ ;============================================================
[IM and group chat module for Miranda NG.]
;file \plugins\TabSRMM\res\chat.rc
-[You can add the user by user name or his id. Wildcards are allowed and recommended.]
+[You can add the user by user name or his ID. Wildcards are allowed and recommended.]
[OK]
[Cancel]
[Show these events]
@@ -1104,7 +1104,7 @@ [Userlist background]
[nick of current contact (if defined)]
[protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
-[UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
+[User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
[path to root miranda folder]
[path to current miranda profile]
[name of current miranda profile (filename, without extension)]
@@ -1166,9 +1166,8 @@ [Edit Highlight List...]
;file \plugins\TabSRMM\src\chat\window.cpp
[Nick name]
-[Unique Id]
+[Unique ID]
[Nick]
-[Unique id]
[%s: Chat Room (%u user%s)]
[%s: Chat Room (%u users%s)]
[, event filter active]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index df1ba093d7..b96a7973b0 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -596,7 +596,7 @@ [Anniversary Reminder]
;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp
[contact identificaion]
-[The contact %s(%s) has no unique id in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?]
+[The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?]
;file \plugins\UserInfoEx\src\ex_import\classExImContactXML.cpp
[Importing a new contact was aborted!]
[You aborted import of a new contact.\nSome information may be missing for this contact.\n\nDo you want to delete the incomplete contact?]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt index a958d2daf6..0926d354dd 100644 --- a/langpacks/english/Plugins/Variables.txt +++ b/langpacks/english/Plugins/Variables.txt @@ -30,7 +30,7 @@ [Variables...]
;file \plugins\Variables\src\help.cpp
[Token]
-[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique id (UIN for ICQ, email for MSN) or, a protocol id followed by a unique id in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, id or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]
+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]
[Tokens]
[Input]
[Cancel]
@@ -119,7 +119,7 @@ [get last seen status of contact x]
[path to the Miranda NG executable]
[current status description of protocol x (without x, the global status is retrieved)]
-[info property y of protocol id x]
+[info property y of protocol ID x]
[retrieves the subject, depending on situation]
[translates x]
[get the version of Miranda]
diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt index f703ffe3ed..9b56a446bf 100644 --- a/langpacks/english/Plugins/WebView.txt +++ b/langpacks/english/Plugins/WebView.txt @@ -100,7 +100,7 @@ [Auto update disabled]
[Auto update enabled]
[Update all Webview sites]
-[Mark all Webview sites read]
+[Mark all Webview sites as read]
[Open cache folder]
[%d minutes to update]
[Open/Close window]
diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt index 665ac0c548..7667929fbb 100644 --- a/langpacks/english/Plugins/YAPP.txt +++ b/langpacks/english/Plugins/YAPP.txt @@ -16,7 +16,7 @@ [Width:]
[Maximum height:]
[Options]
-[Opacity(%):]
+[Opacity (%):]
[Border]
[Round corners (window)]
[Preview]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index c95f237202..c935b98aec 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -91,7 +91,7 @@ [New E-mail available in Inbox]
[%s plugin connections]
[ID]
-[Please enter your yahoo id in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options/Network/Yahoo]
[Please enter your yahoo password in Options/Network/Yahoo]
[Yahoo Login Error]
;file \protocols\Yahoo\src\services.cpp
@@ -111,8 +111,8 @@ [Calendar Reminder]
[%s has rejected your request and sent the following message:]
[Invalid Contact]
-[The id you tried to add is invalid.]
-[Unknown Error??.]
+[The ID you tried to add is invalid.]
+[Unknown Error.]
[New Mail]
[You Have %i unread msgs]
[New Mail (%i msgs)]
|