- langpacks/english: updated

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

1 files changed, 40 insertions, 19 deletions

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 982789ee68..a2761678d0 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -96,7 +96,6 @@
 [Append protocol name]

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

 [Tipper smileys]

-[...]

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

 [sys:status_msg]

 [Last message: (%sys:last_msg_reltime% ago)]

@@ -168,10 +167,7 @@
 [Copy avatar]

 [<No Label>: ]

 [<No Value>]

-[\r\n]

-[(%d/%d)]

 [Fav. contacts]

-[%s (%s)]

 [Other]

 [Miranda uptime:]

 ;file \plugins\TipperYM\src\popwin.h

@@ -186,7 +182,6 @@
 [Email:]

 [%raw:/e-mail%]

 [Gender:]

-[%gender%]

 [Homepage]

 [Homepage:]

 [%raw:/Homepage%]

@@ -197,10 +192,8 @@
 [Idle:]

 [%idle% (%idle_diff% ago)]

 [IP:]

-[%ip%]

 [IP internal]

 [IP internal:]

-[%ip_internal%]

 [Last message]

 [%raw:/ListeningTo%]

 [Name]

@@ -212,50 +205,63 @@
 [Number of sended messages]

 [Number of msg [OUT]:]

 [%sys:msg_count_out%]

-[%Status%]

 [Contact time]

 [Time:]

 [%sys:time%]

 [XStatus title]

 [XStatus title:]

-[%xsname%]

 [XStatus text]

 [XStatus text:]

 [%raw:/XStatusMsg%]

+[[jabber.dll] Activity title]

 [Activity title:]

 [%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%]

+[[jabber.dll] Activity text]

 [Activity text:]

 [%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%]

+[[menuex.dll] Logon time]

 [Logon time:]

-[%logon_date% @ %logon_time% (%logon_ago%)]

+[[menuex.dll] Logoff time]

 [Logoff time:]

-[%logoff_date% @ %logoff_time% (%logoff_ago%)]

+[[seenplugin.dll] Last seen time]

 [Last seen time:]

-[%lastseen_date% @ %lastseen_time%]

+[[seenplugin.dll] Last seen status]

 [Last seen status:]

 [%lastseen_status% (%lastseen_ago% ago)]

+[[weather.dll] Condition]

 [Condition:]

 [%raw:Current/Condition%]

+[[weather.dll] Humidity]

 [Humidity:]

 [%raw:Current/Humidity%]

+[[weather.dll] Max/Min temperature]

 [Max/Min:]

 [%raw:Current/High%/%raw:Current/Low%]

+[[weather.dll] Moon]

 [Moon:]

 [%raw:Current/Moon%]

+[[weather.dll] Pressure]

 [Pressure:]

 [%raw:Current/Pressure% (%raw:Current/Pressure Tendency%)]

+[[weather.dll] Sunrise]

 [Sunrise:]

 [%raw:Current/Sunrise%]

+[[weather.dll] Sunset]

 [Sunset:]

 [%raw:Current/Sunset%]

+[[weather.dll] Temperature]

 [Temperature:]

 [%raw:Current/Temperature%]

+[[weather.dll] Update time]

 [Update time:]

 [%raw:Current/Update%]

+[[weather.dll] UV Index]

 [UV Index:]

 [%raw:Current/UV% - %raw:Current/UVI%]

+[[weather.dll] Visibility]

 [Visibility:]

 [%raw:Current/Visibility%]

+[[weather.dll] Wind]

 [Wind:]

 [%raw:Current/Wind Direction% (%raw:Current/Wind Direction DEG%)/%raw:Current/Wind Speed%]

 [gender]

@@ -277,7 +283,6 @@
 [logoff_time]

 [logoff_ago]

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

-[*.*]

 [author]

 [preview]

 [image]

@@ -308,6 +313,12 @@
 [opacity]

 [enable-coloring]

 [false]

+[[about]]

+[[other]]

+[[background]]

+[[sidebar]]

+[[fonts]]

+[[appearance]]

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

 [uid]

 [proto]

@@ -322,9 +333,6 @@
 [last_msg_time]

 [last_msg_date]

 [last_msg_reltime]

-[%dd %dh %dm]

-[%dh %dm]

-[%dm]

 [msg_count_all]

 [msg_count_out]

 [msg_count_in]

@@ -339,19 +347,32 @@
 [Values]

 [Tray title]

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

+[[No translation]]

 [Yes]

 [Female]

 [Male]

-[%u.%u.%u.%u]

-[%dy %dd %dh %dm]

-[%dd]

+[WORD to status description]

+[DWORD timestamp to time]

+[DWORD timestamp to time difference]

+[BYTE to Yes/No]

+[BYTE to Male/Female (ICQ)]

+[WORD to country name]

+[DWORD to ip address]

 [<prefix>Day|Month|Year to date]

 [<prefix>Day|Month|Year to age]

 [<prefix>Hours|Minutes|Seconds to time]

 [<prefix>Day|Month|Year|Hours|Minutes|Seconds to time difference]

 [<prefix>Day|Month to days to next birthday]

+[DWORD timestamp to time (no seconds)]

 [<prefix>Hours|Minutes to time]

+[DWORD timestamp to date (short)]

+[DWORD timestamp to date (long)]

 [xStatus: empty xStatus name to default name]

+[DWORD seconds to time difference]

+[BYTE timezone to time]

+[WORD to name of a day (0..6, 0 is Sunday)]

+[WORD to name of a month (1..12, 1 is January)]

+[BYTE to language (ICQ)]

 ;file \plugins\TipperYM\src\translations.h

 [Afrikaans]

 [Albanian]