- langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@8250 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 44 insertions, 26 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 9c72aabe85..e35cfec19b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1059,6 +1059,7 @@
 [Custom status]

 [%s (locked)]

 [Status menu]

+[%s\t%s]

 [Main menu]

 ;file \src\modules\clist\clistsettings.cpp

 [(Unknown contact)]

diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index 0198c5f3a4..db6f2498a1 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -78,6 +78,8 @@
 [Background]

 [Window]

 ;file \plugins\Alarms\src\frame.cpp

+[%dh %dm]

+[%dm]

 [Hide reminders]

 [Show reminders]

 [Frames]

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 7b223bbd72..7f4536ed3c 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -12,6 +12,7 @@
 [&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 b93f2826a5..748698ff78 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -97,6 +97,7 @@
 [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 0225ac6c3c..ce32a4ff80 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -460,6 +460,7 @@
 [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 f43d9d66ce..614179c40d 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -69,6 +69,7 @@
 [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/LangMan.txt b/langpacks/english/Plugins/LangMan.txt
index b658707cbc..8ed2f36bc0 100644
--- a/langpacks/english/Plugins/LangMan.txt
+++ b/langpacks/english/Plugins/LangMan.txt
@@ -18,6 +18,7 @@
 ;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 a364fd517c..4c293f4f14 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -3,7 +3,7 @@
 ;  File: NewAwaySys.dll

 ;  Plugin: New Away System Mod

 ;  Version: 0.4.0.1

-;  Authors: NightFox; Deathdemon; XF007; Goblineye Entertainment

+;  Authors: NightFox, Deathdemon, XF007, Goblineye Entertainment

 ;============================================================

 [New Away System Mod plugin for Miranda NG.]

 ;file \plugins\NewAwaySysMod\res\NewAwaySys.rc

@@ -19,7 +19,7 @@
 [Sec]

 [0 = Default]

 [-1 = Infinite]

-[Colours]

+[Colors]

 [Background]

 [Use default]

 [Text]

@@ -41,11 +41,11 @@
 [Reply only when contact's message window is closed]

 [Send maximum]

 [times (-1=infinite)]

-[Reset this counter also when i just change my status text\n(when status icon remains the same)]

+[Reset this counter also when I just change my status text\n(when status icon remains the same)]

 [Disable autoreply when...]

 [&Invisible]

-[On the &Phone]

-[Out to &Lunch]

+[On the &phone]

+[Out to &lunch]

 [Autoreply format:]

 [OK]

 [&Variables]

@@ -53,8 +53,8 @@
 [Ignore requests]

 [Send an autoreply]

 [&Delete]

-[New &Category]

-[Save As &New]

+[New &category]

+[Save as &new]

 [&Save]

 [Title:]

 [Use this message as default for]

@@ -81,7 +81,7 @@
 [Update status messages for non-ICQ protocols every]

 [seconds]

 [Don't show the message dialog for]

-[%s Message for %s]

+[%s message for %s]

 [Retrieving %s message...]

 [&Cancel]

 [Notify of requests]

@@ -109,7 +109,7 @@
 [You can put your frequently used and favorite messages in this category.]

 [Windows]

 [Miranda]

-[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e. disabled state is more restrictive).]

+[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e., disabled state is more restrictive).]

 [Message]

 [URL]

 [File]

@@ -122,6 +122,7 @@
 [Predefined messages]

 [Recent messages]

 [Gone fragging]

+[Been fragging since %nas_awaysince_time%, i'll msg 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]

@@ -130,17 +131,17 @@
 [Away]

 [Been gone since %nas_awaysince_time%, will be back later.]

 [NA]

-[Give it up, i'm not in!]

+[Give it up, I'm not in!]

 [Occupied]

 [Not right now.]

 [DND]

 [Give a guy some peace, would ya?]

 [Free for chat]

-[i'm a chatbot!]

+[I'm a chatbot!]

 [Invisible]

-[i'm hiding from the mafia.]

+[I'm hiding from the mafia.]

 [On the phone]

-[i've been on the phone since %nas_awaysince_time%, give me a sec!]

+[I've been on the phone since %nas_awaysince_time%, give me a sec!]

 [Out to lunch]

 [Been having ?ifgreater(?ctime(H),2,?ifgreater(?ctime(H),10,?ifgreater(?ctime(H),16,supper,dinner),breakfast),supper) since %nas_awaysince_time%.]

 ;file \plugins\NewAwaySysMod\src\AwaySys.cpp

@@ -149,7 +150,7 @@
 [) read your ]

 [ message:\r\n]

 [Set %s message for the contact]

-[Re&ad %s Message]

+[Re&ad %s message]

 [Toggle autoreply on/off]

 [Toggle autoreply off]

 [Toggle autoreply on]

@@ -163,31 +164,32 @@
 [%d hours]

 [%d minutes]

 [%d seconds]

-[New Away System\t(x)\tAway since time in default format; ?nas_awaysince_time(x) in format x]

-[New Away System\t(x)\tAway since date in default format; ?nas_awaysince_date(x) in format x]

-[New Away System\tStatus description]

-[New Away System\tYour nick for current protocol]

-[New Away System\tNumber of status message requests from the contact]

-[New Away System\tNumber of messages from the contact]

-[New Away System\tTime passed until request]

-[New Away System\t(x)\tReturns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]

-[New Away System\tCurrent protocol name]

+[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]

+[Your nick for current protocol]

+[Number of status message requests from the contact]

+[Number of messages from the contact]

+[Time passed until request]

+[Returns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]

+[Current protocol name]

 [Read status message]

 [Set status message]

 [On]

 [Off]

 [Use the default setting]

 [NewAwaySys: Incoming status message request]

+[`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) read your %nas_statdesc% message:\r\n%extratext%\r\n\r\n]

 ;file \plugins\NewAwaySysMod\src\Common.h

-[Miranda IM autoreply >\r\n%extratext%]

+[Miranda NG autoreply >\r\n%extratext%]

 [extended status]

 [Away System]

 [Status]

 [Popups]

 [Variables plugin is not installed]

 ;file \plugins\NewAwaySysMod\src\MsgTree.cpp

-[You've made changes to multiple Message trees at a time.\r\nDo you want to leave changes in "]

-[" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other Message tree instead.]

+[You've made changes to multiple message trees at a time.\r\nDo you want to leave changes in "]

+[" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other message tree instead.]

 [Do you really want to delete this category with its messages?]

 [Do you really want to delete this message?]

 ;file \plugins\NewAwaySysMod\src\Notification.cpp

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 4bb050dd61..3f7125f279 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -236,6 +236,10 @@
 [Wind:]

 ;file \plugins\TipperYM\src\skin_parser.cpp

 [# Solid color fill]

+;file \plugins\TipperYM\src\subst.cpp

+[%dd %dh %dm]

+[%dh %dm]

+[%dm]

 ;file \plugins\TipperYM\src\tipper.cpp

 [Background]

 [Dividers]

@@ -248,6 +252,8 @@
 ;file \plugins\TipperYM\src\translations.cpp

 [Female]

 [Male]

+[%dy %dd %dh %dm]

+[%dd]

 [[No translation]]

 [WORD to status description]

 [DWORD timestamp to time]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index ed28b13eb4..771e42ad37 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -164,11 +164,13 @@
 [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]

 [%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]

 [%n at %u:	%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]

+[%n   (%u)]

 [%c, %t\nToday:  High %h, Low %l]

 [Temperature: %[Temperature]]

 ;file \plugins\Weather\src\weather_addstn.cpp