summaryrefslogtreecommitdiff
path: root/plugins/ImportTXT
diff options
context:
space:
mode:
authorKirill Volinsky <Mataes2007@gmail.com>2017-12-06 14:15:09 +0300
committerKirill Volinsky <Mataes2007@gmail.com>2017-12-06 14:15:09 +0300
commita27079fe5c4a210664515c47767c00112c435d65 (patch)
tree39e36b58b4138af46e2f10661de352482b89399d /plugins/ImportTXT
parent87c39b86cfeb0dedf94f9bf04af30de2daf368bc (diff)
convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744)
Diffstat (limited to 'plugins/ImportTXT')
-rw-r--r--plugins/ImportTXT/doc/changelog_ru.txt2
-rw-r--r--plugins/ImportTXT/doc/examples_ru.txt2
-rw-r--r--plugins/ImportTXT/doc/pattern_cfg_ru.txt2
-rw-r--r--plugins/ImportTXT/doc/readme_ru.txt2
-rw-r--r--plugins/ImportTXT/importtxt/ICQ5_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/ICQ6_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/MAgent_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/QHF_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/SEmidprms_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/bayanICQ_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/dichat_p.ini4
-rw-r--r--plugins/ImportTXT/importtxt/historypp_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/jasmine.ini2
-rw-r--r--plugins/ImportTXT/importtxt/jimm_p.ini4
-rw-r--r--plugins/ImportTXT/importtxt/jimmws2_p.ini4
-rw-r--r--plugins/ImportTXT/importtxt/jimmws_p.ini4
-rw-r--r--plugins/ImportTXT/importtxt/mContact_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/msgexport_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/nokmidprms_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/pigeon_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/qip_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/rnq_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/smaper_p.ini2
-rw-r--r--plugins/ImportTXT/importtxt/smapern_p.ini2
24 files changed, 28 insertions, 28 deletions
diff --git a/plugins/ImportTXT/doc/changelog_ru.txt b/plugins/ImportTXT/doc/changelog_ru.txt
index 6174069d0f..434eb38ca7 100644
--- a/plugins/ImportTXT/doc/changelog_ru.txt
+++ b/plugins/ImportTXT/doc/changelog_ru.txt
@@ -1,4 +1,4 @@
-v. 0.0.1.9
+v. 0.0.1.9
* исправлено дублирование сообщения, если оно совпадает с первым в базе
* поддержка исправленного xml_api и поддержка плагина XML Driver (для седьмой ветки)
diff --git a/plugins/ImportTXT/doc/examples_ru.txt b/plugins/ImportTXT/doc/examples_ru.txt
index 17bd817429..9c71639cf4 100644
--- a/plugins/ImportTXT/doc/examples_ru.txt
+++ b/plugins/ImportTXT/doc/examples_ru.txt
@@ -1,4 +1,4 @@
-
+
Пример файла:
************
diff --git a/plugins/ImportTXT/doc/pattern_cfg_ru.txt b/plugins/ImportTXT/doc/pattern_cfg_ru.txt
index eb51389352..28518d8b77 100644
--- a/plugins/ImportTXT/doc/pattern_cfg_ru.txt
+++ b/plugins/ImportTXT/doc/pattern_cfg_ru.txt
@@ -1,4 +1,4 @@
-Структура файла шаблона плагина importtxt начиная с версии 0.0.1.2
+Структура файла шаблона плагина importtxt начиная с версии 0.0.1.2
Расширение файла .ini
[General]* Общие параметры
diff --git a/plugins/ImportTXT/doc/readme_ru.txt b/plugins/ImportTXT/doc/readme_ru.txt
index ce30c88056..36ced8f7d8 100644
--- a/plugins/ImportTXT/doc/readme_ru.txt
+++ b/plugins/ImportTXT/doc/readme_ru.txt
@@ -1,4 +1,4 @@
-Import TXT plugin for Miranda IM
+Import TXT plugin for Miranda IM
================================
Плагин предоставляет возможность импортировать историю контактов
из других клиентов, хранящуюся в текстовых файлах.
diff --git a/plugins/ImportTXT/importtxt/ICQ5_p.ini b/plugins/ImportTXT/importtxt/ICQ5_p.ini
index c864ca9f46..d2f468af7d 100644
--- a/plugins/ImportTXT/importtxt/ICQ5_p.ini
+++ b/plugins/ImportTXT/importtxt/ICQ5_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=ICQ5 xml files import
Type=2
BinProcedure=4
diff --git a/plugins/ImportTXT/importtxt/ICQ6_p.ini b/plugins/ImportTXT/importtxt/ICQ6_p.ini
index 2a328f9463..1d9984962a 100644
--- a/plugins/ImportTXT/importtxt/ICQ6_p.ini
+++ b/plugins/ImportTXT/importtxt/ICQ6_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=ICQ6 database
Type=2
BinProcedure=3
diff --git a/plugins/ImportTXT/importtxt/MAgent_p.ini b/plugins/ImportTXT/importtxt/MAgent_p.ini
index 20612a35a5..6b54883d78 100644
--- a/plugins/ImportTXT/importtxt/MAgent_p.ini
+++ b/plugins/ImportTXT/importtxt/MAgent_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=MobileAgent import pattern
Type=1
Charset=UCS2
diff --git a/plugins/ImportTXT/importtxt/QHF_p.ini b/plugins/ImportTXT/importtxt/QHF_p.ini
index a5f341d649..b6eb687502 100644
--- a/plugins/ImportTXT/importtxt/QHF_p.ini
+++ b/plugins/ImportTXT/importtxt/QHF_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=QHF files import pattern (QIP PDA and Infinum)
Type=2
BinProcedure=2
diff --git a/plugins/ImportTXT/importtxt/SEmidprms_p.ini b/plugins/ImportTXT/importtxt/SEmidprms_p.ini
index 02a27bd721..ca0637d8f6 100644
--- a/plugins/ImportTXT/importtxt/SEmidprms_p.ini
+++ b/plugins/ImportTXT/importtxt/SEmidprms_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jimm midp-rms SonyEricsson
Type=2
BinProcedure=5
diff --git a/plugins/ImportTXT/importtxt/bayanICQ_p.ini b/plugins/ImportTXT/importtxt/bayanICQ_p.ini
index fb742cc2b0..f85bb397e5 100644
--- a/plugins/ImportTXT/importtxt/bayanICQ_p.ini
+++ b/plugins/ImportTXT/importtxt/bayanICQ_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=bayanICQ import pattern
Type=2
BinProcedure=6
diff --git a/plugins/ImportTXT/importtxt/dichat_p.ini b/plugins/ImportTXT/importtxt/dichat_p.ini
index 6d86fcfd1e..3fd5c6a25e 100644
--- a/plugins/ImportTXT/importtxt/dichat_p.ini
+++ b/plugins/ImportTXT/importtxt/dichat_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=D[i]Chat import pattern
Type=1
Charset=ANSI
@@ -19,6 +19,6 @@ Seconds=8
PreRN=1
AfterRN=2
[Header]
-Pattern=^\t»стори¤ сообщений с ([^\r\n]+?)\s\((\d{5,})\)\r\n\t—охранено из D\[i\]Chat\s[^\r\n]+?\r\n
+Pattern=^\t ([^\r\n]+?)\s\((\d{5,})\)\r\n\t D\[i\]Chat\s[^\r\n]+?\r\n
InNick=1
InUID=2 \ No newline at end of file
diff --git a/plugins/ImportTXT/importtxt/historypp_p.ini b/plugins/ImportTXT/importtxt/historypp_p.ini
index f812e13171..7d5e353e48 100644
--- a/plugins/ImportTXT/importtxt/historypp_p.ini
+++ b/plugins/ImportTXT/importtxt/historypp_p.ini
@@ -1 +1 @@
-[General] Name=History++ pattern Type=1 Charset=UCS2 UseHeader=3 UsePreMsg=1 [Message] Pattern=^\[(\d\d?)\.(\d\d?)\.(\d\d\d?\d?)\s(\d\d?):(\d\d?):(\d\d?)\]\s([^\r\n]+?):$ Direction=7 Day=1 Month=2 Year=3 Hours=4 Minutes=5 Seconds=6 [Header] Pattern=^###\r\n###\s[^\r\n]+?\r\n###\s([^\r\n]+?)\s\([^\r\n]+?:\s([^\r\n]+?)\)\s-\s([^\r\n]+?)\s\([^\r\n]+?:\s([^\r\n]+?)\)\r\n###\s[^\r\n]+?\r\n###\r\n In=3 Out=1 InNick=3 OutNick=1 InUID=4 OutUID=2 [PreMessage] PreRN=1 AfterRN=2 \ No newline at end of file
+[General] Name=History++ pattern Type=1 Charset=UCS2 UseHeader=3 UsePreMsg=1 [Message] Pattern=^\[(\d\d?)\.(\d\d?)\.(\d\d\d?\d?)\s(\d\d?):(\d\d?):(\d\d?)\]\s([^\r\n]+?):$ Direction=7 Day=1 Month=2 Year=3 Hours=4 Minutes=5 Seconds=6 [Header] Pattern=^###\r\n###\s[^\r\n]+?\r\n###\s([^\r\n]+?)\s\([^\r\n]+?:\s([^\r\n]+?)\)\s-\s([^\r\n]+?)\s\([^\r\n]+?:\s([^\r\n]+?)\)\r\n###\s[^\r\n]+?\r\n###\r\n In=3 Out=1 InNick=3 OutNick=1 InUID=4 OutUID=2 [PreMessage] PreRN=1 AfterRN=2 \ No newline at end of file
diff --git a/plugins/ImportTXT/importtxt/jasmine.ini b/plugins/ImportTXT/importtxt/jasmine.ini
index 68c21fb170..0f79cafb31 100644
--- a/plugins/ImportTXT/importtxt/jasmine.ini
+++ b/plugins/ImportTXT/importtxt/jasmine.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jasmine IM import pattern
Type=1
Charset=UCS2
diff --git a/plugins/ImportTXT/importtxt/jimm_p.ini b/plugins/ImportTXT/importtxt/jimm_p.ini
index 7b7ae009d3..10d9ab2100 100644
--- a/plugins/ImportTXT/importtxt/jimm_p.ini
+++ b/plugins/ImportTXT/importtxt/jimm_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jimm import pattern
Type=1
Charset=ANSI
@@ -19,6 +19,6 @@ Seconds=8
PreRN=1
AfterRN=2
[Header]
-Pattern=^\r\n\t»стори¤ сообщений с ([^\r\n]+?)\s\((\d{5,})\)\r\n\t—охранено из Jimm\s[^\r\n]+?\r\n
+Pattern=^\r\n\t ([^\r\n]+?)\s\((\d{5,})\)\r\n\t Jimm\s[^\r\n]+?\r\n
InNick=1
InUID=2
diff --git a/plugins/ImportTXT/importtxt/jimmws2_p.ini b/plugins/ImportTXT/importtxt/jimmws2_p.ini
index 2e297eb8a8..8f0baa9b1f 100644
--- a/plugins/ImportTXT/importtxt/jimmws2_p.ini
+++ b/plugins/ImportTXT/importtxt/jimmws2_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jimm import pattern(without seconds) modified
Type=1
Charset=ANSI
@@ -16,7 +16,7 @@ Minutes=6
PreRN=1
AfterRN=2
[Header]
-Pattern=^\r\n\t»стори¤ сообщений с ([^\r\n]+?)\s\((\d{5,})\)\r\n\t—охранено из Jimm\s[^\r\n]+?\r\n
+Pattern=^\r\n\t ([^\r\n]+?)\s\((\d{5,})\)\r\n\t Jimm\s[^\r\n]+?\r\n
In=1
InNick=1
InUID=2
diff --git a/plugins/ImportTXT/importtxt/jimmws_p.ini b/plugins/ImportTXT/importtxt/jimmws_p.ini
index d39933d611..59c609fd50 100644
--- a/plugins/ImportTXT/importtxt/jimmws_p.ini
+++ b/plugins/ImportTXT/importtxt/jimmws_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jimm import pattern(without seconds)
Type=1
Charset=ANSI
@@ -18,6 +18,6 @@ Minutes=7
PreRN=1
AfterRN=2
[Header]
-Pattern=^\r\n\t»стори¤ сообщений с ([^\r\n]+?)\s\((\d{5,})\)\r\n\t—охранено из Jimm\s[^\r\n]+?\r\n
+Pattern=^\r\n\t ([^\r\n]+?)\s\((\d{5,})\)\r\n\t Jimm\s[^\r\n]+?\r\n
InNick=1
InUID=2
diff --git a/plugins/ImportTXT/importtxt/mContact_p.ini b/plugins/ImportTXT/importtxt/mContact_p.ini
index c0adad0f73..925c712330 100644
--- a/plugins/ImportTXT/importtxt/mContact_p.ini
+++ b/plugins/ImportTXT/importtxt/mContact_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=mContact import pattern
Type=2
BinProcedure=1
diff --git a/plugins/ImportTXT/importtxt/msgexport_p.ini b/plugins/ImportTXT/importtxt/msgexport_p.ini
index 45febcb41a..933df10808 100644
--- a/plugins/ImportTXT/importtxt/msgexport_p.ini
+++ b/plugins/ImportTXT/importtxt/msgexport_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Message export import pattern
Type=1
Charset=UTF8
diff --git a/plugins/ImportTXT/importtxt/nokmidprms_p.ini b/plugins/ImportTXT/importtxt/nokmidprms_p.ini
index 676b4d2313..d743b1a9df 100644
--- a/plugins/ImportTXT/importtxt/nokmidprms_p.ini
+++ b/plugins/ImportTXT/importtxt/nokmidprms_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Jimm midp-rms Nokia
Type=2
BinProcedure=5
diff --git a/plugins/ImportTXT/importtxt/pigeon_p.ini b/plugins/ImportTXT/importtxt/pigeon_p.ini
index 25be365ad5..7487075089 100644
--- a/plugins/ImportTXT/importtxt/pigeon_p.ini
+++ b/plugins/ImportTXT/importtxt/pigeon_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Pigeon import pattern
Type=1
Charset=ANSI
diff --git a/plugins/ImportTXT/importtxt/qip_p.ini b/plugins/ImportTXT/importtxt/qip_p.ini
index 9d51aeb8eb..ddb112f8f5 100644
--- a/plugins/ImportTXT/importtxt/qip_p.ini
+++ b/plugins/ImportTXT/importtxt/qip_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=QIP import pattern
Type=1
Charset=ANSI
diff --git a/plugins/ImportTXT/importtxt/rnq_p.ini b/plugins/ImportTXT/importtxt/rnq_p.ini
index 975ac96a78..1fe75ad7d6 100644
--- a/plugins/ImportTXT/importtxt/rnq_p.ini
+++ b/plugins/ImportTXT/importtxt/rnq_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=RnQ pattern
Type=1
Charset=ANSI
diff --git a/plugins/ImportTXT/importtxt/smaper_p.ini b/plugins/ImportTXT/importtxt/smaper_p.ini
index 5f08604328..d02eedae78 100644
--- a/plugins/ImportTXT/importtxt/smaper_p.ini
+++ b/plugins/ImportTXT/importtxt/smaper_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Smaper(vmICQ) import pattern
Type=1
Charset=UCS2
diff --git a/plugins/ImportTXT/importtxt/smapern_p.ini b/plugins/ImportTXT/importtxt/smapern_p.ini
index ffb1114855..cce53f048c 100644
--- a/plugins/ImportTXT/importtxt/smapern_p.ini
+++ b/plugins/ImportTXT/importtxt/smapern_p.ini
@@ -1,4 +1,4 @@
-[General]
+[General]
Name=Smaper (with Nick) import pattern
Type=1
Charset=UCS2