summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-07-19 17:50:17 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-07-19 17:50:17 +0000
commit836c30ef1b2d7a7a28f96825c3502b57b8173018 (patch)
tree5ab06ac6ab3c930c1bdf88137ebc7be6080f7a1b
parente9162bed54828c3a440359d0e23e6ff93771634a (diff)
- langpacks/english: updated
git-svn-id: http://svn.miranda-ng.org/main/trunk@5421 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/Langpack_english.txt47
-rw-r--r--langpacks/english/Plugins/NewsAggregator.txt32
-rw-r--r--langpacks/english/Plugins/Quotes.txt15
3 files changed, 46 insertions, 48 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index c3c12a3b29..73e2a8a990 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -11897,15 +11897,27 @@
[aaaa]
[This feed seems to need authentication. Please fill username and password fields:]
[Username]
-[&Export]
-[&Close]
[Available feeds:]
-[Export to file:]
[Feeds to be exported:]
-[Load]
-[&Import]
+[&Export]
+[&Close]
[Import from:]
+[Load]
[Feeds to be imported:]
+[&Import]
+;file \plugins\NewsAggregator\Src\Authentication.cpp
+[Enter your username]
+[Error]
+[Enter your password]
+;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+[%s\nis a valid feed's address.]
+[News Aggregator]
+[%s\nis not a valid feed's address.]
+[New Aggregator]
+[empty]
+;file \plugins\NewsAggregator\Src\ExportImport.cpp
+[OPML files]
+[Not valid import file.]
;file \plugins\NewsAggregator\Src\Icons.cpp
[Protocol icon]
[Check All Feeds]
@@ -11914,13 +11926,11 @@
[Export Feeds]
[Auto Update Enabled]
[Auto Update Disabled]
-[News Aggregator]
;file \plugins\NewsAggregator\Src\Menus.cpp
[Check feed]
[Change feed]
;file \plugins\NewsAggregator\Src\Options.cpp
[Enter Feed name]
-[Error]
[Enter Feed URL]
[Enter checking interval]
[Enter message format]
@@ -11943,15 +11953,7 @@
[Enable/disable auto update]
;file \plugins\NewsAggregator\Src\Utils.cpp
[NewsAggregator HTTP connection]
-[Enter your username]
-[Enter your password]
[Feed]
-[%s\nis a valid feed's address.]
-[%s\nis not a valid feed's address.]
-[New Aggregator]
-[empty]
-[OPML files]
-[Not valid import file.]
#muuid {ebf19652-e434-4d79-9897-91a0ff226f51}
;============================================================
; File: NewXstatusNotify.dll
@@ -13788,9 +13790,12 @@
[User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderBase.cpp
-[Window]
-[Contact List]
-[Status Bar]
+[Log Files (*.txt,*.log)]
+[Enter integer value]
+[Enter log file name.]
+[Enter log file format.]
+[Enter history format.]
+[Enter popup window format.]
;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
@@ -13820,12 +13825,6 @@
[Previous Close]
[Change]
;file \plugins\Quotes\src\SettingsDlg.cpp
-[Log Files (*.txt,*.log)]
-[Enter integer value]
-[Enter log file name.]
-[Enter log file format.]
-[Enter history format.]
-[Enter popup window format.]
#muuid {45230488-977b-405b-856d-ea276d7083b7}
;============================================================
; File: Rate.dll
diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 5403f6d5fa..e01caa3a9d 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -33,15 +33,27 @@
[aaaa]
[This feed seems to need authentication. Please fill username and password fields:]
[Username]
-[&Export]
-[&Close]
[Available feeds:]
-[Export to file:]
[Feeds to be exported:]
-[Load]
-[&Import]
+[&Export]
+[&Close]
[Import from:]
+[Load]
[Feeds to be imported:]
+[&Import]
+;file \plugins\NewsAggregator\Src\Authentication.cpp
+[Enter your username]
+[Error]
+[Enter your password]
+;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+[%s\nis a valid feed's address.]
+[News Aggregator]
+[%s\nis not a valid feed's address.]
+[New Aggregator]
+[empty]
+;file \plugins\NewsAggregator\Src\ExportImport.cpp
+[OPML files]
+[Not valid import file.]
;file \plugins\NewsAggregator\Src\Icons.cpp
[Protocol icon]
[Check All Feeds]
@@ -50,13 +62,11 @@
[Export Feeds]
[Auto Update Enabled]
[Auto Update Disabled]
-[News Aggregator]
;file \plugins\NewsAggregator\Src\Menus.cpp
[Check feed]
[Change feed]
;file \plugins\NewsAggregator\Src\Options.cpp
[Enter Feed name]
-[Error]
[Enter Feed URL]
[Enter checking interval]
[Enter message format]
@@ -79,12 +89,4 @@
[Enable/disable auto update]
;file \plugins\NewsAggregator\Src\Utils.cpp
[NewsAggregator HTTP connection]
-[Enter your username]
-[Enter your password]
[Feed]
-[%s\nis a valid feed's address.]
-[%s\nis not a valid feed's address.]
-[New Aggregator]
-[empty]
-[OPML files]
-[Not valid import file.]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index e0fe707a82..6478a658c8 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -121,9 +121,12 @@
[User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderBase.cpp
-[Window]
-[Contact List]
-[Status Bar]
+[Log Files (*.txt,*.log)]
+[Enter integer value]
+[Enter log file name.]
+[Enter log file format.]
+[Enter history format.]
+[Enter popup window format.]
;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
@@ -153,9 +156,3 @@
[Previous Close]
[Change]
;file \plugins\Quotes\src\SettingsDlg.cpp
-[Log Files (*.txt,*.log)]
-[Enter integer value]
-[Enter log file name.]
-[Enter log file format.]
-[Enter history format.]
-[Enter popup window format.]