From 6612e80e4d91179b9a315cf0c81a20cf96c9b415 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 30 Apr 2015 06:04:15 +0000 Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@13271 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/Facebook.txt | 3 +- langpacks/english/Plugins/ICQ.txt | 180 ++++++++-------- langpacks/english/Plugins/Jabber.txt | 298 +++++++++++++------------- langpacks/english/Plugins/SkypeWeb.txt | 4 + langpacks/english/Plugins/Twitter.txt | 2 +- langpacks/english/Plugins/VKontakte.txt | 2 +- langpacks/russian/Untranslated/SkypeWeb.txt | 3 + langpacks/russian/Untranslated/weatherxml.txt | 27 +++ 8 files changed, 275 insertions(+), 244 deletions(-) create mode 100644 langpacks/russian/Untranslated/SkypeWeb.txt create mode 100644 langpacks/russian/Untranslated/weatherxml.txt diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index 97b33368fa..6facf6508d 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Facebook.dll ; Plugin: Facebook RM -; Version: 0.2.10.6 +; Version: 0.2.10.8 ; Authors: Michal Zelinka, Robert Pösel ;============================================================ [Facebook protocol support for Miranda NG.] @@ -78,6 +78,7 @@ [Login error, probably bad login credentials.] [Could not load communication token. You should report this and wait for plugin update.] [Could not load all required data. Plugin may still work correctly, but you should report this and wait for plugin update.] +[Contact doesn't have required data in database.] [Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!] [User cancel captcha challenge.] [Timeout when sending message.] diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index 1f66ef9c90..9ef86ec007 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -140,6 +140,8 @@ [Confirm Password Change] [Please re-type your new password:] [Enter your current password:] +;file \protocols\IcqOscarJ\src\askauthentication.cpp +[Please authorize me to add you to my contact list.] ;file \protocols\IcqOscarJ\src\chan_04close.cpp [Unable to connect to migrated ICQ communication server] [Unable to connect to ICQ communication server] @@ -156,6 +158,88 @@ [Connection failed.\nUnknown error during sign on: 0x%02x] [You have been disconnected from the ICQ network because you logged on from another location using the same ICQ number.] [Unknown runtime error: 0x%02x] +;file \protocols\IcqOscarJ\src\constants.cpp +[January] +[February] +[March] +[April] +[May] +[June] +[July] +[August] +[September] +[October] +[November] +[December] +[Personal] +[Nickname] +[First name] +[Last name] +[Gender] +[About] +[Password] +[Contact] +[Primary e-mail] +[Secondary e-mail] +[Tertiary e-mail] +[Street] +[City] +[State] +[ZIP/postcode] +[Country] +[Phone number] +[Fax number] +[Cellular number] +[Personal Detail] +[Timezone] +[Year of birth] +[Month of birth] +[Day of birth] +[Marital Status] +[Spoken language 1] +[Spoken language 2] +[Spoken language 3] +[Originally from] +[Education] +[Level] +[Institute] +[Degree] +[Graduation Year] +[Company name] +[Company homepage] +[Company street] +[Company city] +[Company state] +[Company phone] +[Company fax] +[Company ZIP/postcode] +[Company country] +[Company department] +[Company position] +[Company industry] +[Personal Interests] +[Interest category 1] +[Interest areas 1] +[Interest category 2] +[Interest areas 2] +[Interest category 3] +[Interest areas 3] +[Interest category 4] +[Interest areas 4] +;file \protocols\IcqOscarJ\src\db.cpp +[The password does not match your current password. Check Caps Lock and try again.] +[Change ICQ Details] +[The password does not match the password you originally entered. Check Caps Lock and try again.] +[The ICQ server does not support passwords longer than 8 characters. Please use a shorter password.] +;file \protocols\IcqOscarJ\src\dlgproc.cpp +[] +[] +[Unknown value] +[You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?] +[Upload in progress...] +[Upload in progress...%d%%] +[Upload complete] +[Upload FAILED] ;file \protocols\IcqOscarJ\src\fam_01service.cpp [A server migration has failed because the server returned invalid data. You must reconnect manually.] [Failed to request offline messages. They may be received next time you log in.] @@ -597,7 +681,6 @@ [Construction] [Consumer Goods] [Corporate Services] -[Education] [Finance] [High Tech] [Legal] @@ -838,6 +921,8 @@ [Your proxy rejected the user name and password that you provided. Please check them in M->Options->Network.] [The server to which you are trying to connect does not exist. Check your spelling in M->Options->Network->ICQ.] [error] +;file \protocols\IcqOscarJ\src\loginpassword.cpp +[Enter a password for UIN %u:] ;file \protocols\IcqOscarJ\src\oscar_filetransfer.cpp [%d Files] [The file transfer was aborted by the other user.] @@ -851,98 +936,13 @@ [File transfer negotiation failed for unknown reason.] [The checksum of file "%s" does not match, the file is probably damaged.] [Your file transfer has been aborted (error=%d), because one of the files that you selected to send is no longer readable from the disk. You may have deleted or moved it.] -;file \protocols\IcqOscarJ\src\utilities.cpp -[] -;file \protocols\IcqOscarJ\src\changeinfo\constants.cpp -[January] -[February] -[March] -[April] -[May] -[June] -[July] -[August] -[September] -[October] -[November] -[December] -[Personal] -[Nickname] -[First name] -[Last name] -[Gender] -[About] -[Password] -[Contact] -[Primary e-mail] -[Secondary e-mail] -[Tertiary e-mail] -[Street] -[City] -[State] -[ZIP/postcode] -[Country] -[Phone number] -[Fax number] -[Cellular number] -[Personal Detail] -[Timezone] -[Year of birth] -[Month of birth] -[Day of birth] -[Marital Status] -[Spoken language 1] -[Spoken language 2] -[Spoken language 3] -[Originally from] -[Level] -[Institute] -[Degree] -[Graduation Year] -[Company name] -[Company homepage] -[Company street] -[Company city] -[Company state] -[Company phone] -[Company fax] -[Company ZIP/postcode] -[Company country] -[Company department] -[Company position] -[Company industry] -[Personal Interests] -[Interest category 1] -[Interest areas 1] -[Interest category 2] -[Interest areas 2] -[Interest category 3] -[Interest areas 3] -[Interest category 4] -[Interest areas 4] -;file \protocols\IcqOscarJ\src\changeinfo\db.cpp -[The password does not match your current password. Check Caps Lock and try again.] -[Change ICQ Details] -[The password does not match the password you originally entered. Check Caps Lock and try again.] -[The ICQ server does not support passwords longer than 8 characters. Please use a shorter password.] -;file \protocols\IcqOscarJ\src\changeinfo\dlgproc.cpp -[] -[] -[Unknown value] -[You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?] -[Upload in progress...] -[Upload in progress...%d%%] -[Upload complete] -[Upload FAILED] -;file \protocols\IcqOscarJ\src\changeinfo\upload.cpp +;file \protocols\IcqOscarJ\src\upload.cpp [You are not currently connected to the ICQ network. You must be online in order to update your information on the server.] -;file \protocols\IcqOscarJ\src\UI\askauthentication.cpp -[Please authorize me to add you to my contact list.] -;file \protocols\IcqOscarJ\src\UI\loginpassword.cpp -[Enter a password for UIN %u:] -;file \protocols\IcqOscarJ\src\UI\userinfotab.cpp +;file \protocols\IcqOscarJ\src\userinfotab.cpp [ (DC Established)] [ScreenName:] [] [Member since:] [%s Details] +;file \protocols\IcqOscarJ\src\utilities.cpp +[] diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index cadbeec848..7fef740dcb 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -116,14 +116,12 @@ [JID List] [Apply Filter] [Reset Filter] -[Invite Users to ] -[Send group chat invitation.] +[Send group chat invitation] [Other JID:] [Add] [Invitation reason:] [&Invite] -[Group chat invitation to ] -[Incoming group chat invitation.] +[Incoming group chat invitation] [You are invited to conference room by] [with following reason:] [&Accept] @@ -177,7 +175,6 @@ [Register account now] [Jabber Account Information:] [Member Information] -[] [Role:] [Set role] [Affiliation:] @@ -211,9 +208,6 @@ [Fatal error, image services not found. Jabber Protocol will be disabled.] [Jabber Activity] [Jabber Mood] -;file \protocols\JabberG\src\jabber.h -[I'm happy Miranda NG user. Get it at http://miranda-ng.org/.] -[/me slaps %s around a bit with a large trout] ;file \protocols\JabberG\src\jabber_adhoc.cpp [Error %s %s] [Select Command] @@ -352,10 +346,9 @@ [Copy real &JID] [Copy in-room JID] [Real &JID: %s] -[Invite Users to %s] +[Invite Users to\n%s] [%s (not on roster)] -[Member Info: %s] -[from %s] +[%s from\n%s] [Real JID not available] [Reason to kick %s] [Reason to ban %s] @@ -404,145 +397,6 @@ [Items request error] ;file \protocols\JabberG\src\jabber_filterlist.cpp [Set filter...] -;file \protocols\JabberG\src\jabber_form2.cpp -[One or more addresses for communication related to abusive traffic] -[One or more addresses for customer feedback] -[One or more addresses for communication related to sales and marketing] -[One or more addresses for communication related to security concerns] -[One or more addresses for customer support] -[The Jabber ID of a single entity to which an operation applies] -[The Jabber ID of one or more entities to which an operation applies] -[The Jabber IDs associated with active sessions] -[The number of online entities that are active] -[A list of entities with administrative privileges] -[The text of an announcement to be sent to active users or all users] -[A list of entities with whom communication is blocked] -[The number of seconds to delay before applying a change] -[The Jabber IDs that have been disabled] -[The number of disabled entities] -[The email address for a user] -[The given (first) name of a user] -[The number of online entities that are idle] -[The IP addresses of an account's online sessions] -[The last login time (per XEP-0082) of a user] -[The number of logins per minute for an account] -[The maximum number of items associated with a search or list] -[The text of a message of the day] -[The names of an account's online sessions] -[The Jabber IDs associated with online users] -[The number of online entities] -[The password for an account] -[Password verification] -[A list of registered entities] -[The number of registered entities] -[Number of roster items for an account] -[The number of stanzas being sent per second by an account] -[The family (last) name of a user] -[The text of a welcome message] -[A list of entities with whom communication is allowed] -[First Name] -[Last Name] -[Desired Nickname] -[Your URL] -[Email Address] -[FAQ Entry] -[Whether to allow occupants to invite others] -[Whether to allow occupants to change subject] -[Whether to enable logging of room conversations] -[Natural language for room discussions] -[Maximum number of room occupants] -[Whether to make room members-only] -[Whether to make room moderated] -[Whether a password is required to enter] -[Whether to make room persistent] -[Roles for which presence is broadcast] -[Whether to allow public searching for room] -[Full list of room admins] -[Short description of room] -[Natural-language room name] -[Full list of room owners] -[The room password] -[Affiliations that may discover real JIDs of occupants] -[Precondition: node configuration with the specified access model] -[Whether to allow the subscription] -[The SubID of the subscription] -[The NodeID of the relevant node] -[The address (JID) of the subscriber] -[Whether an entity wants to receive or disable notifications] -[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually] -[The minimum number of milliseconds between sending any two notification digests] -[The date and time at which a leased subscription will end or has ended] -[Whether an entity wants to receive an XMPP message body in addition to the payload format] -[The presence states for which an entity wants to receive notifications] -[Who may subscribe and retrieve items] -[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.] -[The collection with which a node is affiliated] -[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine] -[Whether to deliver payloads with event notifications] -[Whether owners or publisher should receive replies to items] -[Who may associate leaf nodes with a collection] -[The list of JIDs that may associated leaf nodes with a collection] -[The child nodes (leaf or collection) associated with a collection] -[The maximum number of child nodes that can be associated with a collection] -[The maximum number of items to persist] -[The maximum payload size in bytes] -[Whether the node is a leaf (default) or a collection] -[Whether to notify subscribers when the node configuration changes] -[Whether to notify subscribers when the node is deleted] -[Whether to notify subscribers when items are removed from the node] -[Whether to persist items to storage] -[Whether to deliver notifications to available users only] -[The publisher model] -[The specific multi-user chat rooms to specify for replyroom] -[The specific JID(s) to specify for replyto] -[The roster group(s) allowed to subscribe and retrieve items] -[Whether to send items to new subscribers] -[Whether to allow subscriptions] -[A friendly name for the node] -[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single] -[The JIDs of those to contact with questions] -[The date and time when the node was created] -[The JID of the node creator] -[A description of the node] -[The default language of the node] -[The number of subscribers to the node] -[The JIDs of those with an affiliation of owner] -[The JIDs of those with an affiliation of publisher] -[The name of the node] -[Payload type] -[Whether to automatically authorize subscription requests] -[Whether to automatically accept file transfers] -[Whether to automatically open new messages] -[Whether to automatically go offline when idle] -[Whether to play sounds] -[A list of pending file transfers] -[A list of joined group chat rooms] -[A presence or availability status] -[The status message text] -[The new priority for the client] -[Account name associated with the user] -[Familiar name of the user] -[Password or secret for the user] -[Full name of the user] -[First name or given name of the user] -[Last name, surname, or family name of the user] -[Email address of the user] -[Street portion of a physical or mailing address] -[Locality portion of a physical or mailing address] -[Region portion of a physical or mailing address] -[Postal code portion of a physical or mailing address] -[Family Name] -[Whether to accept the invitation] -[Another resource with which to continue the session] -[Disclosure of content, decryption keys or identities] -[Whether may send Chat State Notifications per XEP-0085] -[Whether allowed to use XHTML-IM formatting per XEP-0071] -[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)] -[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)] -[Whether to renegotiate the session] -[Minimum security level] -[Whether to terminate the session] -[Whether to enable Message Receipts per XEP-0184] ;file \protocols\JabberG\src\jabber_groupchat.cpp [Failed to retrieve room list from server.] [No rooms available on server.] @@ -554,7 +408,7 @@ [Bookmarks...] [Change nickname in <%s>] [has set the subject to:] -[Group chat invitation to %s] +[Group chat invitation to\n%s] ;file \protocols\JabberG\src\jabber_icolib.cpp [Status icons] [transport] @@ -1286,3 +1140,145 @@ [Listening To] [Moods] [Activities] +;file \protocols\JabberG\src\stdafx.h +[I'm happy Miranda NG user. Get it at http://miranda-ng.org/.] +[/me slaps %s around a bit with a large trout] +;file \protocols\JabberG\src\obsoleted\jabber_form2.cpp +[One or more addresses for communication related to abusive traffic] +[One or more addresses for customer feedback] +[One or more addresses for communication related to sales and marketing] +[One or more addresses for communication related to security concerns] +[One or more addresses for customer support] +[The Jabber ID of a single entity to which an operation applies] +[The Jabber ID of one or more entities to which an operation applies] +[The Jabber IDs associated with active sessions] +[The number of online entities that are active] +[A list of entities with administrative privileges] +[The text of an announcement to be sent to active users or all users] +[A list of entities with whom communication is blocked] +[The number of seconds to delay before applying a change] +[The Jabber IDs that have been disabled] +[The number of disabled entities] +[The email address for a user] +[The given (first) name of a user] +[The number of online entities that are idle] +[The IP addresses of an account's online sessions] +[The last login time (per XEP-0082) of a user] +[The number of logins per minute for an account] +[The maximum number of items associated with a search or list] +[The text of a message of the day] +[The names of an account's online sessions] +[The Jabber IDs associated with online users] +[The number of online entities] +[The password for an account] +[Password verification] +[A list of registered entities] +[The number of registered entities] +[Number of roster items for an account] +[The number of stanzas being sent per second by an account] +[The family (last) name of a user] +[The text of a welcome message] +[A list of entities with whom communication is allowed] +[First Name] +[Last Name] +[Desired Nickname] +[Your URL] +[Email Address] +[FAQ Entry] +[Whether to allow occupants to invite others] +[Whether to allow occupants to change subject] +[Whether to enable logging of room conversations] +[Natural language for room discussions] +[Maximum number of room occupants] +[Whether to make room members-only] +[Whether to make room moderated] +[Whether a password is required to enter] +[Whether to make room persistent] +[Roles for which presence is broadcast] +[Whether to allow public searching for room] +[Full list of room admins] +[Short description of room] +[Natural-language room name] +[Full list of room owners] +[The room password] +[Affiliations that may discover real JIDs of occupants] +[Precondition: node configuration with the specified access model] +[Whether to allow the subscription] +[The SubID of the subscription] +[The NodeID of the relevant node] +[The address (JID) of the subscriber] +[Whether an entity wants to receive or disable notifications] +[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually] +[The minimum number of milliseconds between sending any two notification digests] +[The date and time at which a leased subscription will end or has ended] +[Whether an entity wants to receive an XMPP message body in addition to the payload format] +[The presence states for which an entity wants to receive notifications] +[Who may subscribe and retrieve items] +[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.] +[The collection with which a node is affiliated] +[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine] +[Whether to deliver payloads with event notifications] +[Whether owners or publisher should receive replies to items] +[Who may associate leaf nodes with a collection] +[The list of JIDs that may associated leaf nodes with a collection] +[The child nodes (leaf or collection) associated with a collection] +[The maximum number of child nodes that can be associated with a collection] +[The maximum number of items to persist] +[The maximum payload size in bytes] +[Whether the node is a leaf (default) or a collection] +[Whether to notify subscribers when the node configuration changes] +[Whether to notify subscribers when the node is deleted] +[Whether to notify subscribers when items are removed from the node] +[Whether to persist items to storage] +[Whether to deliver notifications to available users only] +[The publisher model] +[The specific multi-user chat rooms to specify for replyroom] +[The specific JID(s) to specify for replyto] +[The roster group(s) allowed to subscribe and retrieve items] +[Whether to send items to new subscribers] +[Whether to allow subscriptions] +[A friendly name for the node] +[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single] +[The JIDs of those to contact with questions] +[The date and time when the node was created] +[The JID of the node creator] +[A description of the node] +[The default language of the node] +[The number of subscribers to the node] +[The JIDs of those with an affiliation of owner] +[The JIDs of those with an affiliation of publisher] +[The name of the node] +[Payload type] +[Whether to automatically authorize subscription requests] +[Whether to automatically accept file transfers] +[Whether to automatically open new messages] +[Whether to automatically go offline when idle] +[Whether to play sounds] +[A list of pending file transfers] +[A list of joined group chat rooms] +[A presence or availability status] +[The status message text] +[The new priority for the client] +[Account name associated with the user] +[Familiar name of the user] +[Password or secret for the user] +[Full name of the user] +[First name or given name of the user] +[Last name, surname, or family name of the user] +[Email address of the user] +[Street portion of a physical or mailing address] +[Locality portion of a physical or mailing address] +[Region portion of a physical or mailing address] +[Postal code portion of a physical or mailing address] +[Family Name] +[Whether to accept the invitation] +[Another resource with which to continue the session] +[Disclosure of content, decryption keys or identities] +[Whether may send Chat State Notifications per XEP-0085] +[Whether allowed to use XHTML-IM formatting per XEP-0071] +[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)] +[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)] +[Whether to renegotiate the session] +[Minimum security level] +[Whether to terminate the session] +[Whether to enable Message Receipts per XEP-0184] diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt index 78393398c9..3337ca459e 100644 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ b/langpacks/english/Plugins/SkypeWeb.txt @@ -56,6 +56,8 @@ [Protocol icon] [Create new chat icon] [Sync history icon] +[Block user icon] +[Unblock user icon] [Protocols] ;file \protocols\SkypeWeb\src\skype_menus.cpp [Request authorization] @@ -70,3 +72,5 @@ ;file \protocols\SkypeWeb\src\skype_proto.cpp [%s connection] [Action] +;file \protocols\SkypeWeb\src\skype_trouter.cpp +[Incoming call] diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt index cf8c44c750..987f5aa869 100644 --- a/langpacks/english/Plugins/Twitter.txt +++ b/langpacks/english/Plugins/Twitter.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Twitter.dll ; Plugin: Twitter protocol -; Version: 1.2.0.1 +; Version: 1.3.0.1 ; Authors: dentist, omniwolf, Thief ;============================================================ [Twitter protocol support for Miranda NG.] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index e467888c82..868158debf 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: VKontakte.dll ; Plugin: VKontakte protocol -; Version: 0.1.1.0 +; Version: 0.1.1.1 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] diff --git a/langpacks/russian/Untranslated/SkypeWeb.txt b/langpacks/russian/Untranslated/SkypeWeb.txt new file mode 100644 index 0000000000..a99a34ac22 --- /dev/null +++ b/langpacks/russian/Untranslated/SkypeWeb.txt @@ -0,0 +1,3 @@ +[Block user icon] +[Unblock user icon] +[Incoming call] diff --git a/langpacks/russian/Untranslated/weatherxml.txt b/langpacks/russian/Untranslated/weatherxml.txt new file mode 100644 index 0000000000..e8c78b75a5 --- /dev/null +++ b/langpacks/russian/Untranslated/weatherxml.txt @@ -0,0 +1,27 @@ +[Pm Rain / Wind] +[Rain / Wind Early] +[Rain / Freezing Rain / Wind] +[Snow / Wind Early] +[Sunny / Wind] +[Heavy Rain] +[Rain Late] +[Light Rain / Wind Early] +[Heavy Rain / Wind] +[Cloudy / Windy] +[Wintry Mix / Wind] +[Rain Shower] +[Light Freezing Rain / Windy] +[Light Freezing Rain / Fog] +[Snow / Windy] +[Fog / Windy] +[Partly Cloudy / Windy] +[Sunny / Windy] +[Am Snow] +[Rain / Snow Late] +[Am Rain / Snow] +[Partly Cloudy / Wind] +[Mostly Sunny / Wind] +[Isolated T-Storms / Wind] +[T-Storms Late] +[Scattered T-Storms / Wind] +[Snow To Wintry Mix] -- cgit v1.2.3