summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-02-27 11:42:54 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-02-27 11:42:54 +0000
commit122e8eefe2aa6a93a2ee27c66b39ea52658bbfee (patch)
tree8812372902d1fa50015a0f5bb1e01dd69d258cb7 /langpacks/english
parent3e7ae9b675187052136075ea8ebfbad98673210b (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@8285 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt122
-rw-r--r--langpacks/english/Plugins/AssocMgr.txt1
-rw-r--r--langpacks/english/Plugins/BasicHistory.txt1
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt1
-rw-r--r--langpacks/english/Plugins/CmdLine.txt1
-rw-r--r--langpacks/english/Plugins/Dbx_mmap.txt2
-rw-r--r--langpacks/english/Plugins/Dropbox.txt37
-rw-r--r--langpacks/english/Plugins/LangMan.txt1
-rw-r--r--langpacks/english/Plugins/NewAwaySys.txt20
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt2
-rw-r--r--langpacks/english/Plugins/Variables.txt4
-rw-r--r--langpacks/english/Plugins/Weather.txt1
12 files changed, 167 insertions, 26 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index e35cfec19b..d3f5e93fc3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -225,6 +225,52 @@
[Select the extra icons to be shown in the contact list:]
[*only the first %d icons will be shown]
[You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)]
+[Add to Existing MetaContact]
+[Please select a MetaContact:]
+[&OK]
+[Sort Alphabetically]
+[Editing]
+[Information]
+[Contacts]
+[&Remove]
+[&Set as Default]
+[Move &Up]
+[Move &Down]
+[Force use of default for sending (even if offline)]
+[Send &Offline]
+[Set default contact on receipt of message]
+[Always send to default contact if not offline]
+[Suppress status notification for subcontacts]
+[Context Menu]
+[Use contact's unique ID]
+[Use contact's display name]
+[Contact Labels]
+[Function]
+[Set default and open message window]
+[Show subcontact context menu]
+[Show user information]
+[Contact List]
+[Display subcontact nickname]
+[Display subcontact display name]
+[Use subcontact message windows]
+[Copy subcontact data]
+[Lock name to first contact]
+[but only for the current conversation]
+[History Copy]
+[Please wait while the contact's history is copied.]
+[History Remove]
+[Please wait while the contact's history is removed.]
+[Subcontact Priorities]
+[Rank:]
+[Status:]
+[Protocol:]
+[Reset All]
+[(Lower ranks are preferred)]
+[Copy subcontact history to MetaContact when creating or adding]
+[Number of days to copy (0=all):]
+[Keep MetaContact history synchronized with subcontacts]
+[Keep subcontact history synchronized with MetaContact]
+[History (** beware - change at your own risk **)]
[Tray]
[&Hide/Show]
[E&xit]
@@ -294,7 +340,6 @@
[Users leaving]
[Topic changes]
[Status changes]
-[Information]
[Disconnects]
[User kicks]
[Notices]
@@ -1059,7 +1104,6 @@
[Custom status]
[%s (locked)]
[Status menu]
-[%s\t%s]
[Main menu]
;file \src\modules\clist\clistsettings.cpp
[(Unknown contact)]
@@ -1187,7 +1231,76 @@
[Icon sets]
;file \src\modules\ignore\ignore.cpp
[** All contacts **]
-[Contacts]
+;file \src\modules\metacontacts\metacontacts.h
+[You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?]
+;file \src\modules\metacontacts\meta_addto.cpp
+[Either there is no MetaContact in the database (in this case you should first convert a contact into one)\nor there is none that can host this contact.\nAnother solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?]
+[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]
+[MetaContact Conflict]
+[This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts.]
+[Multiple MetaContacts]
+[No suitable MetaContact found]
+[a contact]
+[Adding %s...]
+[Please select a MetaContact]
+[No MetaContact selected]
+[Assignment to the MetaContact failed.]
+[Assignment failure]
+;file \src\modules\metacontacts\meta_edit.cpp
+[(Unknown Contact)]
+[ID]
+[Protocol]
+[Send Offline]
+[Delete MetaContact?]
+;file \src\modules\metacontacts\meta_main.cpp
+[Toggle Off]
+[Toggle On]
+[Convert to MetaContact]
+[Add to Existing]
+[Edit]
+[Set to Default]
+[Error - Database corruption.\nPlugin disabled.]
+[MetaContacts]
+;file \src\modules\metacontacts\meta_menu.cpp
+[There was a problem in assigning the contact to the MetaContact]
+[This will remove the MetaContact permanently.\n\nProceed Anyway?]
+[Are you sure?]
+[Remove from MetaContact]
+[Toggle MetaContacts On]
+[Toggle MetaContacts Off]
+[Add to existing MetaContact...]
+[Edit MetaContact...]
+[Set as MetaContact default]
+[Delete MetaContact]
+[Context]
+;file \src\modules\metacontacts\meta_options.cpp
+[<default>]
+;file \src\modules\metacontacts\meta_services.cpp
+[Meta ID]
+[No online contacts found.]
+[Priorities]
+[History]
+;file \src\modules\metacontacts\meta_utils.cpp
+[Sender]
+[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]
+[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 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]
+[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]
;file \src\modules\netlib\netliblog.cpp
[No times]
[Standard hh:mm:ss times]
@@ -1236,11 +1349,9 @@
[Account error]
[Account is disabled. Please activate it to access options.]
[New account]
-[Edit]
[Remove account]
[Configure...]
[Upgrade account]
-[Protocol]
[Account ID]
[<unknown>]
[Protocol is not loaded.]
@@ -1272,7 +1383,6 @@
[Group (closed)]
[Connecting]
[User details]
-[History]
[Down arrow]
[Find user]
[SMS]
diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 7f4536ed3c..7b223bbd72 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -12,7 +12,6 @@
[&Start Miranda NG automatically when the computer starts (using current profile)]
[Only associate with Miranda NG while it is &running]
;file \plugins\AssocMgr\src\assoclist.cpp
-[%hs:]
[%hs files]
[Type]
[Description]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 748698ff78..b93f2826a5 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -97,7 +97,6 @@
[Invalid Message]
;file \plugins\BasicHistory\src\ExportManager.cpp
[%s Files (*.%s)]
-[*.%s]
[Import]
[Export]
[File does not contain selected contact]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index ce32a4ff80..0225ac6c3c 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -460,7 +460,6 @@
[Empty %s cell]
[column]
[line]
-[%s]
[columns]
[lines]
[%s, contain %s]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 614179c40d..f43d9d66ce 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -69,7 +69,6 @@
[Could not find contact handle for contact '%s'.]
[Setting '%s/%s' deleted.]
[Wrote '%s:%s' to database entry '%s/%s'.]
-['%s/%s' - %s.]
[Could not retrieve setting '%s/%s': %s.]
[Setting '%s/%s' was not found.]
['%s' proxy was disabled.]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 0b06c6b131..c9cebf4cd0 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Dbx_mmap.dll
; Plugin: Miranda NG mmap database driver
-; Version: 0.95.0.2
+; Version: 0.95.0.3
; Authors: Miranda-NG project
;============================================================
[Provides Miranda database support: global settings, contacts, history, settings per contact.]
diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
new file mode 100644
index 0000000000..d5103ae32c
--- /dev/null
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -0,0 +1,37 @@
+#muuid {b908773a-86f7-4a91-8674-6a20ba0e67d1}
+;============================================================
+; File: Dropbox.dll
+; Plugin: Dropbox
+; Version: 0.11.0.1
+; Authors: unsane
+;============================================================
+[Provides ability to upload files on Dropbox.]
+;file \plugins\Dropbox\src\dropbox.cpp
+[grant_type=authorization_code&code=%s]
+[You have been authorized]
+[Are you sure you want to request athorization?]
+[Request athorization]
+;file \plugins\Dropbox\src\dropbox_events.cpp
+[Send files to Dropbox]
+[Network]
+[Dropbox]
+;file \plugins\Dropbox\src\dropbox_icons.cpp
+[Protocols]
+[Protocol icon]
+;file \plugins\Dropbox\src\dropbox_menus.cpp
+[Request Authorization]
+;file \plugins\Dropbox\src\dropbox_transfers.cpp
+[Server does not respond]
+[Link to download file "%s": %s]
+[Link to download folder "%s": %s]
+;file \plugins\Dropbox\src\dropbox_utils.cpp
+[Ok]
+[Bad input parameter. Error message should indicate which one and why]
+[Bad or expired token. This can happen if the user or Dropbox revoked or expired an access token. To fix, you should re-authenticate the user]
+[Bad OAuth request (wrong consumer key, bad nonce, expired timestamp...). Unfortunately, re-authenticating the user won't help here]
+[File or folder not found at the specified path]
+[Request method not expected (generally should be GET or POST)]
+[Your app is making too many requests and is being rate limited. 429s can trigger on a per-app or per-user basis]
+[If the response includes the Retry-After header, this means your OAuth 1.0 app is being rate limited. Otherwise, this indicates a transient server error, and your app should retry its request.]
+[User is over Dropbox storage quota]
+[Unknown]
diff --git a/langpacks/english/Plugins/LangMan.txt b/langpacks/english/Plugins/LangMan.txt
index 8ed2f36bc0..b658707cbc 100644
--- a/langpacks/english/Plugins/LangMan.txt
+++ b/langpacks/english/Plugins/LangMan.txt
@@ -18,7 +18,6 @@
;file \plugins\LangMan\src\main.cpp
[Reload langpack]
;file \plugins\LangMan\src\options.cpp
-[%hs (%s)]
[All installed plugins are included.]
[(incompatible)]
[Unknown]
diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 4c293f4f14..df310cf0c7 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -2,7 +2,7 @@
;============================================================
; File: NewAwaySys.dll
; Plugin: New Away System Mod
-; Version: 0.4.0.1
+; Version: 0.4.0.2
; Authors: NightFox, Deathdemon, XF007, Goblineye Entertainment
;============================================================
[New Away System Mod plugin for Miranda NG.]
@@ -35,7 +35,7 @@
[Enable autoreply]
[On event...]
[Don't reply to ICQ contacts]
-[Don't reply when i'm invisible to the contact]
+[Don't reply when I'm invisible to the contact]
[Save autoreply to the history]
[Reply only when Idle]
[Reply only when contact's message window is closed]
@@ -61,7 +61,7 @@
[New message]
[New category]
[Delete]
-[Statuses messages:]
+[Status messages:]
[Configure autoaway]
[Wait]
[seconds before closing the status message dialog (-1=don't close)]
@@ -115,19 +115,19 @@
[File]
[** All contacts **]
[** Not-on-list contacts **]
-[Statuses messages]
+[Status messages]
[Main options]
[Autoreply]
[Contacts]
[Predefined messages]
[Recent messages]
[Gone fragging]
-[Been fragging since %nas_awaysince_time%, i'll msg you later when the adrenaline wears off.]
+[Been fragging since %nas_awaysince_time%, I'll message you later when the adrenaline wears off.]
[Creepy]
[Your master, %nas_mynick%, has been %nas_statdesc% since the day that is only known as ?nas_awaysince_date(dddd)... When he gets back, i'll tell him you dropped by...]
[Default messages]
[Online]
-[Yep, i'm here.]
+[Yep, I'm here.]
[Away]
[Been gone since %nas_awaysince_time%, will be back later.]
[NA]
@@ -160,10 +160,6 @@
[Don't send status message when you are %s]
[Ignore status message requests from this contact and don't send an autoreply.\r\n"Store contact autoreply/ignore settings for each status separately" is enabled, so this setting is per-contact AND per-status.]
[Ignore status message requests from this contact and don't send an autoreply]
-[Stranger]
-[%d hours]
-[%d minutes]
-[%d seconds]
[Away since time in default format; ?nas_awaysince_time(x) in format x]
[Away since date in default format; ?nas_awaysince_date(x) in format x]
[Status description]
@@ -173,6 +169,10 @@
[Time passed until request]
[Returns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]
[Current protocol name]
+[Stranger]
+[%d hours]
+[%d minutes]
+[%d seconds]
[Read status message]
[Set status message]
[On]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 1498f5baf7..b83c4e0536 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -2,7 +2,7 @@
;============================================================
; File: StartupStatus.dll
; Plugin: StartupStatus
-; Version: 0.8.0.46
+; Version: 0.8.0.47
; Authors: P Boon
;============================================================
[StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index b2660098a1..8f4fb43c60 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -111,7 +111,7 @@
[info property y of contact x]
[database profile name]
[database profile path]
-[database setting z of module y of contact x and return w if z isn't exist (w is optional)]
+[database setting z of module y of contact x and return w if z doesn't exist (w is optional)]
[get event for contact x (optional), according to y,z,w, see documentation]
[get last seen time of contact x in format y (y is optional)]
[get last seen date of contact x in format y (y is optional)]
@@ -181,7 +181,7 @@
[TRUE if directory x exists]
[TRUE if file x exists]
[window title of first window of class x]
-[shows files and directories of directory z, with filter y, separated by z (y and z optional)]
+[shows files and directories of directory x, with filter y, separated by z (y and z optional)]
[TRUE if process x is running]
[value y from registry key x (REG_SZ (string) values only)]
[formats timestamp x (seconds since 1/1/1970) in date format y]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 771e42ad37..2690fd69dc 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -164,7 +164,6 @@
[HTTP Error: Bad gateway (502)]
[HTTP Error: Service unavailable (503)]
[HTTP Error: Gateway timeout (504)]
-[%n [%t, %c]]
[%c\nTemperature: %t\nFeel-Like: %f\nPressure: %p\nWind: %i %w\nHumidity: %m\nDew Point: %e\nVisibility: %v\n\nSun Rise: %r\nSun Set: %y\n\n5 Days Forecast:\n%[Forecast Day 1]\n%[Forecast Day 2]\n%[Forecast Day 3]\n%[Forecast Day 4]\n%[Forecast Day 5]]
[Feel-Like: %f\nPressure: %p\nWind: %i %w\nHumidity: %m\nDew Point: %e\nVisibility: %v\n\nSun Rise: %r\nSun Set: %y\n\n5 Days Forecast:\n%[Forecast Day 1]\n%[Forecast Day 2]\n%[Forecast Day 3]\n%[Forecast Day 4]\n%[Forecast Day 5]]
[Weather Condition for %n as of %u]