summaryrefslogtreecommitdiff
path: root/plugins/Weather
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Weather')
-rw-r--r--plugins/Weather/docs/history.txt2
-rw-r--r--plugins/Weather/docs/license.txt2
-rw-r--r--plugins/Weather/docs/sample_ini.ini2
-rw-r--r--plugins/Weather/docs/weather/gismeteo.ini98
-rw-r--r--plugins/Weather/docs/weather/msn.ini2
-rw-r--r--plugins/Weather/docs/weather/weatherxml.ini4
-rw-r--r--plugins/Weather/docs/weather/wundergrnd_intl.ini2
-rw-r--r--plugins/Weather/docs/weather/wundergrnd_xml.ini2
-rw-r--r--plugins/Weather/src/resource.h2
-rw-r--r--plugins/Weather/src/stdafx.cxx2
-rw-r--r--plugins/Weather/src/stdafx.h2
-rw-r--r--plugins/Weather/src/version.h2
-rw-r--r--plugins/Weather/src/weather.cpp2
-rw-r--r--plugins/Weather/src/weather_addstn.cpp2
-rw-r--r--plugins/Weather/src/weather_contacts.cpp2
-rw-r--r--plugins/Weather/src/weather_conv.cpp2
-rw-r--r--plugins/Weather/src/weather_data.cpp2
-rw-r--r--plugins/Weather/src/weather_http.cpp2
-rw-r--r--plugins/Weather/src/weather_icons.cpp2
-rw-r--r--plugins/Weather/src/weather_info.cpp2
-rw-r--r--plugins/Weather/src/weather_ini.cpp2
-rw-r--r--plugins/Weather/src/weather_mwin.cpp2
-rw-r--r--plugins/Weather/src/weather_opt.cpp2
-rw-r--r--plugins/Weather/src/weather_popup.cpp2
-rw-r--r--plugins/Weather/src/weather_svcs.cpp2
-rw-r--r--plugins/Weather/src/weather_update.cpp2
-rw-r--r--plugins/Weather/src/weather_userinfo.cpp2
27 files changed, 76 insertions, 76 deletions
diff --git a/plugins/Weather/docs/history.txt b/plugins/Weather/docs/history.txt
index 6d815b737a..ff936f56f2 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 75fe0077e7..45645b4b53 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 f4659654b4..4790a4051f 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 e9bbbc1ecd..9aa99e0089 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=&deg
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 acd1e9c50c..f78643dff6 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 1ecc79ed26..cd1ce3a56d 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 d5df687e98..1893b44303 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 b193b79721..2e2db48fa5 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/src/resource.h b/plugins/Weather/src/resource.h
index 8a208dd30a..b03933ad09 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 bfd519e3dc..b05ed73bc5 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 3c220dba56..6c4a8082bb 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 2fcf601034..7562216179 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 af3e86bc88..6739dcf5da 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 716779fa1b..20b93fcecd 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 a51eea90c5..6d8bd85541 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 120174682a..ab9f85a26f 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 15482ea8c9..5e1a794efa 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 e1f8b412d0..8b5995926b 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 45c5987597..12f40ebaa3 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 2790afb577..6f7ca4c1c7 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 f5d1dc8a92..717e7e1fd3 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 f2d3164d1e..a87517a9b4 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 e32cee2890..e7b1566672 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 2f2b9767fb..c48e4c37c3 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 7e3d3a2370..58d2dcfca9 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 676ca8c577..d64786e53c 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 a0b8f42b14..cfba17d431 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