diff options
Diffstat (limited to 'plugins/Weather')
30 files changed, 79 insertions, 79 deletions
diff --git a/plugins/Weather/docs/history.txt b/plugins/Weather/docs/history.txt index ff936f56f2..6d815b737a 100644 --- a/plugins/Weather/docs/history.txt +++ b/plugins/Weather/docs/history.txt @@ -1,4 +1,4 @@ -Weather Protocol - Version History
+Weather Protocol - Version History
==================================
Version 0.3.8.19 2011/09/03
- Fixed Brief window update on weather station update
diff --git a/plugins/Weather/docs/license.txt b/plugins/Weather/docs/license.txt index 45645b4b53..75fe0077e7 100644 --- a/plugins/Weather/docs/license.txt +++ b/plugins/Weather/docs/license.txt @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
diff --git a/plugins/Weather/docs/sample_ini.ini b/plugins/Weather/docs/sample_ini.ini index 4790a4051f..f4659654b4 100644 --- a/plugins/Weather/docs/sample_ini.ini +++ b/plugins/Weather/docs/sample_ini.ini @@ -1,4 +1,4 @@ -[Weather 0.3.x Update Data 1.5]
+[Weather 0.3.x Update Data 1.5]
; This file contains the information required for the weather protocol to obtain update.
; For the plugin to function properly, at least one of these file must be present.
diff --git a/plugins/Weather/docs/weather/gismeteo.ini b/plugins/Weather/docs/weather/gismeteo.ini index 9aa99e0089..e9bbbc1ecd 100644 --- a/plugins/Weather/docs/weather/gismeteo.ini +++ b/plugins/Weather/docs/weather/gismeteo.ini @@ -1,32 +1,32 @@ -[Weather 0.3.x Update Data 1.4]
+[Weather 0.3.x Update Data 1.4]
;*********************************************************
;
-; 3 gismeteo.com(ua/ru).
+; Подробный прогноз на 3 дня для НОВОГО gismeteo.com(ua/ru).
;
-; !
-; __ ID , .
+; Поиска по названию города нет и не будет пока не изменится плагин погоды!
+; Искать _только_ по ID города, который предварительно выясняем на сайте гисметео.
;
-;
-; .
-; ( ) " " .
+; Перед использованием желательно удалить старые контакты
+; с погодой и найти нужные города по новой. Первый раз обновиться
+; из меню (правый клик на контакте) через "Удалить данные и обновить" .
;
-;
-; ->->-> "" ( )
-; :
+; Чтобы все было красиво и понятно видно в миранде идем в
+; Параметры->Модули->Погода->Показывать и поле "Кратко" (остальные поля по вкусу)
+; полностью заменяем на:
-; %[CityName] %u
+; Состояние погоды в %[CityName] на %u
; ----------------------------------------------------------------
-; : %c
-; : %t
-; : %p
-; : %m
-; : %i %w
-; : %[TW]
-; : %r, : %y, : %[Day Length], : %[Moon Phase]
+; Условия: %c
+; Температура: %t
+; Давление: %p
+; Влажность: %m
+; Ветер: %i %w
+; Температура воды: %[TW]
+; Восход: %r, Закат: %y, Продолжительность дня: %[Day Length], Фаза Луны: %[Moon Phase]
;
-; (, [], , , , )
+; Прогноз (Дата, Температура [Комфорт], Условия, Ветер, Давление, Влажность)
; -------------------------------------------------------------------------------------------------------
; %[Forecast Day 1]
; %[Forecast Day 2]
@@ -42,10 +42,10 @@ ; %[Forecast Day 12]
-;
+; Решение проблем
; ~~~~~~~~~~~~~~~
-; http://www.gismeteo.xxx
-; xxx - "com" , .. "ru", "ua" .,
+; Если ничего не работет попробуйте исправить в адресе http://www.gismeteo.xxx
+; xxx - на "com" либо вашу страну, т.е. "ru", "ua" и тп., чтобы не происходило редиректа
;
;*********************************************************
@@ -65,8 +65,8 @@ Update URL=http://www.gismeteo.ua/city/daily/%s/ [/Default]
-;------, ,
-;------TODO ...
+;------хз, что делать, когда у них нет текущей погоды
+;------TODO в общем...
;[nodata]
;Start=<div class="nodata">
;End=</div>
@@ -74,8 +74,8 @@ Update URL=http://www.gismeteo.ua/city/daily/%s/ ;-----------------------------------------------------
[CityName]
-Start=
-End=
+Start=Погода в
+End=на
[/CityName]
[Condition]
@@ -94,7 +94,7 @@ Unit=C ;[/Visibility]
[Wind Direction]
-Start=<dl title="
+Start=<dl title="Ветер
End="
[/Wind Direction]
@@ -112,7 +112,7 @@ Unit=mm [/Pressure]
[Humidity]
-Start=<div class="wicon hum" title="">
+Start=<div class="wicon hum" title="Влажность">
End=<span class="unit">
Unit=%
[/Humidity]
@@ -123,7 +123,7 @@ End=" [/Update]
;[Cloudy]
-;Start=
+;Start=Облачность
;End=</b>
;[/Cloudy]
@@ -816,7 +816,7 @@ Set Data=[FD12D] & " : " & [FD12T] & "C [" & [FD12F] & "C]" & ", " & [FD12C] & " ;--------------------------------------------
[TW]
-Start= :
+Start=Температура воды:
End=°
Unit=C
[/TW]
@@ -829,17 +829,17 @@ Unit=C [/Feel]
[Sunrise]
-Start=</strong>
+Start=Восход</strong>
End=</li>
[/Sunrise]
[Sunset]
-Start=</strong>
+Start=Заход</strong>
End=</li>
[/Sunset]
[Day Length]
-Start=</strong>
+Start=Долгота</strong>
End=</li>
[/Day Length]
@@ -868,28 +868,28 @@ Set Data=[MP1] & ", " & [MP2] [Icons]
-Sunny=
-Sunny=
-Partly Cloudy=
-Cloudy=
-Cloudy=
-Rain=
-Rain Shower=
-Rain Shower=
-Snow=
-Snow=
-Snow Shower=
-Snow Shower=
-Snow Shower=
-Ligntning=
-Fog=
+Sunny=ясно
+Sunny=штиль
+Partly Cloudy=малооблачно
+Cloudy=облачно
+Cloudy=пасмурно
+Rain=небольшой дождь
+Rain Shower=дождь
+Rain Shower=ливень
+Snow=снег
+Snow=небольшой снег
+Snow Shower=слабый снег хлопьями
+Snow Shower=снегопад
+Snow Shower=шквал
+Ligntning=гроза
+Fog=туман
[ID Search]
Available=TRUE
Search URL=http://www.gismeteo.ua/city/daily/%s/
Not Found Str=Not Found
-Name Start= .
+Name Start=по г.
Name End=.">
[/ID Search]
diff --git a/plugins/Weather/docs/weather/msn.ini b/plugins/Weather/docs/weather/msn.ini index f78643dff6..acd1e9c50c 100644 --- a/plugins/Weather/docs/weather/msn.ini +++ b/plugins/Weather/docs/weather/msn.ini @@ -1,4 +1,4 @@ -[Weather 0.3.x Update Data 1.5]
+[Weather 0.3.x Update Data 1.5]
[Header]
Name=MSN Weather (New Layout)
Internal Name=msn2014
diff --git a/plugins/Weather/docs/weather/weatherxml.ini b/plugins/Weather/docs/weather/weatherxml.ini index cd1ce3a56d..1ecc79ed26 100644 --- a/plugins/Weather/docs/weather/weatherxml.ini +++ b/plugins/Weather/docs/weather/weatherxml.ini @@ -1,4 +1,4 @@ -[Weather 0.3.x Update Data 1.2]
+[Weather 0.3.x Update Data 1.2]
[Header]
Name=WeatherXML
Internal Name=wxml
@@ -72,7 +72,7 @@ End=< Start=<t>
End=<
[Wind Direction]
-Set Data=[Wind Direction DEG] & " [" & [WindDir] & "]"
+Set Data=[Wind Direction DEG] & "° [" & [WindDir] & "]"
[Humidity]
Start=<hmid>
End=<
diff --git a/plugins/Weather/docs/weather/wundergrnd_intl.ini b/plugins/Weather/docs/weather/wundergrnd_intl.ini index 1893b44303..d5df687e98 100644 --- a/plugins/Weather/docs/weather/wundergrnd_intl.ini +++ b/plugins/Weather/docs/weather/wundergrnd_intl.ini @@ -1,4 +1,4 @@ -[Weather 0.3.x Update Data 1.4]
+[Weather 0.3.x Update Data 1.4]
; Short history:
; 2004/03/22 Initial release
diff --git a/plugins/Weather/docs/weather/wundergrnd_xml.ini b/plugins/Weather/docs/weather/wundergrnd_xml.ini index 2e2db48fa5..b193b79721 100644 --- a/plugins/Weather/docs/weather/wundergrnd_xml.ini +++ b/plugins/Weather/docs/weather/wundergrnd_xml.ini @@ -1,4 +1,4 @@ -[Weather 0.3.x Update Data 1.3]
+[Weather 0.3.x Update Data 1.3]
; Short history:
; 2008/05/19 Initial release
diff --git a/plugins/Weather/proto_weather/res/resource.rc b/plugins/Weather/proto_weather/res/resource.rc index b059c0696d..bf8e0d77d0 100644 --- a/plugins/Weather/proto_weather/res/resource.rc +++ b/plugins/Weather/proto_weather/res/resource.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script.
+//Microsoft Developer Studio generated resource script.
//
#define APSTUDIO_READONLY_SYMBOLS
diff --git a/plugins/Weather/res/Version.rc b/plugins/Weather/res/Version.rc index fdeb14668c..6427dc9522 100644 --- a/plugins/Weather/res/Version.rc +++ b/plugins/Weather/res/Version.rc @@ -1,4 +1,4 @@ -// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index 366d734775..594ab27510 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -1,4 +1,4 @@ -// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
diff --git a/plugins/Weather/src/resource.h b/plugins/Weather/src/resource.h index b03933ad09..8a208dd30a 100644 --- a/plugins/Weather/src/resource.h +++ b/plugins/Weather/src/resource.h @@ -1,4 +1,4 @@ -//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by ..\res\resource.rc
//
diff --git a/plugins/Weather/src/stdafx.cxx b/plugins/Weather/src/stdafx.cxx index b05ed73bc5..bfd519e3dc 100644 --- a/plugins/Weather/src/stdafx.cxx +++ b/plugins/Weather/src/stdafx.cxx @@ -1,4 +1,4 @@ -/*
+/*
Copyright (C) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
diff --git a/plugins/Weather/src/stdafx.h b/plugins/Weather/src/stdafx.h index 6c4a8082bb..3c220dba56 100644 --- a/plugins/Weather/src/stdafx.h +++ b/plugins/Weather/src/stdafx.h @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda NG
Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/version.h b/plugins/Weather/src/version.h index 7562216179..2fcf601034 100644 --- a/plugins/Weather/src/version.h +++ b/plugins/Weather/src/version.h @@ -1,4 +1,4 @@ -#define __MAJOR_VERSION 0
+#define __MAJOR_VERSION 0
#define __MINOR_VERSION 4
#define __RELEASE_NUM 0
#define __BUILD_NUM 3
diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 6739dcf5da..af3e86bc88 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 20b93fcecd..716779fa1b 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 6d8bd85541..a51eea90c5 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp index ab9f85a26f..120174682a 100644 --- a/plugins/Weather/src/weather_conv.cpp +++ b/plugins/Weather/src/weather_conv.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index 5e1a794efa..15482ea8c9 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_http.cpp b/plugins/Weather/src/weather_http.cpp index 8b5995926b..e1f8b412d0 100644 --- a/plugins/Weather/src/weather_http.cpp +++ b/plugins/Weather/src/weather_http.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp index 12f40ebaa3..45c5987597 100644 --- a/plugins/Weather/src/weather_icons.cpp +++ b/plugins/Weather/src/weather_icons.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_info.cpp b/plugins/Weather/src/weather_info.cpp index 6f7ca4c1c7..2790afb577 100644 --- a/plugins/Weather/src/weather_info.cpp +++ b/plugins/Weather/src/weather_info.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index 717e7e1fd3..f5d1dc8a92 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index a87517a9b4..f2d3164d1e 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2006-2009 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index e7b1566672..e32cee2890 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index c48e4c37c3..2f2b9767fb 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2009 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index 58d2dcfca9..7e3d3a2370 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index d64786e53c..676ca8c577 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index cfba17d431..a0b8f42b14 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -1,4 +1,4 @@ -/*
+/*
Weather Protocol plugin for Miranda IM
Copyright (c) 2012 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
|