- langpack_english updated

- languages folders renamed

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

15 files changed, 208 insertions, 30 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index f4f3f47b77..b39550268b 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -1,10 +1,11 @@
 #muuid {3750a5a3-bf0d-490e-b65d-41ac4d29aeb3}

 ;============================================================

 ;  File: AIM.dll

-;  Plugin: AIM

-;  Version: x.x.x.x

-;  Authors: 

+;  Plugin: AIM protocol

+;  Version: 0.11.0.1

+;  Authors: Boris Krasnovskiy, Aaron Myles Landwehr

 ;============================================================

+[Provides support for AOL Instant Messenger (AIM) protocol.]

 ;file \protocols\AimOscar\res\aim.rc

 [AIM User Details]

 [Screen Name:]

diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index 4c3f5b35d9..88029c8c07 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -1,7 +1,7 @@
 #muuid {6471d451-2fe0-4ee2-850e-9f84f3c0d187}

 ;============================================================

 ;  File: AddContactPlus.dll

-;  Plugin: AddContact+

+;  Plugin: Add contact+

 ;  Version: 0.9.9.1

 ;  Authors: Bartosz 'Dezeath' Białek

 ;============================================================

@@ -23,10 +23,10 @@
 [Please authorize my request and add me to your contact list.]

 [None]

 [The contact cannot be added to your contact list. Please make sure the contact ID is entered correctly.]

-[Add Contact]

+[Add contact]

 [The contact cannot be added to your contact list. If you are not logged into the selected account, please try to do so. Also, make sure the contact ID is entered correctly.]

 ;file \plugins\AddContactPlus\src\main.cpp

-[&Add Contact...]

-[Open Add Contact Dialog]

+[&Add contact...]

+[Open add contact dialog]

 [Main]

 [AddContact+]

diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 0b85a7839d..30630896ff 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -1,7 +1,7 @@
 #muuid {dace7d41-dfa9-4772-89ae-a59a6153e6b2}

 ;============================================================

 ;  File: AuthState.dll

-;  Plugin: Authorization State

+;  Plugin: Authorization state

 ;  Version: 0.0.2.0

 ;  Authors: Thief, idea by snwbrdr

 ;============================================================

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index d564d1e30d..deee998958 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -1,7 +1,7 @@
 #muuid {2f07ea05-05b5-4ff0-875d-c590da2ddac1}

 ;============================================================

 ;  File: BASS_interface.dll

-;  Plugin: BASS_interface

+;  Plugin: BASS interface

 ;  Version: 0.0.0.13

 ;  Authors: tico-tico

 ;============================================================

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
new file mode 100644
index 0000000000..c4b2b7b6df
--- /dev/null
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -0,0 +1,135 @@
+#muuid {53e095a3-2695-490a-9dad-d20479093831}

+;langpack template for Clist_blind

+;file \plugins\Clist_blind\res\resource.rc

+[Are you sure you want to delete %s?]

+[This will erase all history and settings for this contact!]

+[Yes]

+[No]

+[Hide from list only, in order to keep their history and ignore/visibility settings]

+[Use Options->Ignore (expert mode) to unhide contacts.]

+[Hotkeys]

+[Show/Hide:]

+[HotKey1]

+[Read Message:]

+[Web Search:]

+[URL:]

+[Open in new browser window]

+[Show Options]

+[Hide offline users]

+[Hide empty groups]

+[Disable groups]

+[Ask before deleting contacts]

+[Sort contacts by name]

+[Sort contacts by status]

+[Sort contacts by protocol]

+[Single click interface]

+[Always show status in tooltip]

+[Disable icon blinking]

+[ms delay]

+[Show]

+[icon when statuses differ]

+[Cycle icons every]

+[seconds, when statuses differ]

+[Show multiple icons]

+[Only when statuses differ]

+[Contact List]

+[System tray icon]

+[System tray icon when using multiple protocols]

+[Contact List Sorting]

+[Window]

+[Always on top]

+[Tool style main window]

+[Minimize to tray]

+[Hide contact list after it has been idle for]

+[seconds]

+[Automatically resize window to height of list]

+[maximum]

+[% of screen]

+[Size upwards]

+[Title bar text:]

+[Translucency options (Windows 2000/XP only)]

+[Fade contact list in/out]

+[Transparent contact list]

+[Inactive opacity:]

+[Active opacity:]

+[000%]

+[Show menu bar]

+[Easy move]

+[Show title bar]

+[If window is partially covered, bring to front instead of hiding]

+[Show drop shadow (restart required)]

+[Pin to desktop]

+[Items]

+['Hide Offline' means to hide:]

+[Groups]

+[Show counts of number of contacts in a group]

+[Hide group counts when there are none online]

+[Sort groups alphabetically]

+[Quicksearch in open groups only]

+[Templates]

+[Contact:]

+[Group:]

+[Divider:]

+[Info:]

+[Status Bar]

+[Show status bar]

+[Show icons]

+[Show protocol names]

+[Show status text]

+[Right click opens status menu]

+[Right click opens Miranda IM menu]

+[Make sections equal width]

+[Show bevels on panels]

+[Show resize grip indicator]

+[E&xit]

+[&Offline\tCtrl+0]

+[On&line\tCtrl+1]

+[&Away\tCtrl+2]

+[&NA\tCtrl+3]

+[Occ&upied\tCtrl+4]

+[&DND\tCtrl+5]

+[&Free for chat\tCtrl+6]

+[&Invisible\tCtrl+7]

+[On the &Phone\tCtrl+8]

+[Out to &Lunch\tCtrl+9]

+[&Hide/Show]

+[&New Group]

+[&Hide Offline Users]

+[Hide &Offline Users out here]

+[Hide &Empty Groups]

+[Disable &Groups]

+[Hide Miranda]

+[&New Subgroup]

+[&Hide Offline Users in here]

+[&Rename Group]

+[&Delete Group]

+;file \plugins\Clist_blind\src\clcopts.cpp

+[Not focused]

+[Offline]

+[Online]

+[Away]

+[Occupied]

+[DND]

+[Free for chat]

+[Invisible]

+[Out to lunch]

+[On the phone]

+[%name% [%status% %protocol%] %status_message%]

+[Group: %name% %count% [%mode%]]

+[Divider: %s]

+[Info: %s]

+[List]

+;file \plugins\Clist_blind\src\clistopts.cpp

+[Global]

+;file \plugins\Clist_blind\src\cluiopts.cpp

+;file \plugins\Clist_blind\src\init.cpp

+[LISTBOX]

+[Unknown Protocol]

+[%name%]

+[%count%]

+[%mode%]

+[Expanded]

+[Colapsed]

+[%status%]

+[%protocol%]

+[%status_message%]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index d1b001c024..932e5f395c 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -78,11 +78,14 @@
 ;file \protocols\Gadu-Gadu\src\avatar.cpp

 [%miranda_avatarcache%]

 [%s\\%s]

+[Can not create avatars cache directory. ERROR: %d: %s\n%s]

 [jpg]

 [gif]

 [png]

 [\\%s.%s]

 [\\%s avatar.%s]

+[Can not create avatar file. ERROR: %d: %s\n%s]

+[Can not open avatar file. ERROR: %d: %s\n%s]

 ;file \protocols\Gadu-Gadu\src\core.cpp

 [Miranda was unable to resolve the name of the Gadu-Gadu server to its numeric address.]

 [Miranda was unable to make a connection with a server. It is likely that the server is down, in which case you should wait for a while and try again later.]

@@ -98,7 +101,7 @@
 [External direct connections hostname %s is invalid. Disabling external host forwarding.]

 [<none>]

 [Server hostname %s is invalid. Using default hostname provided by the network.]

-[Connection cannot be established because of error:\n\t%s]

+[Connection cannot be established. errno=%d: %s]

 [, %s %s]

 [, %s %d]

 [Age:]

@@ -138,6 +141,9 @@
 [Ignore]

 [Your details has been uploaded to the public directory.]

 [You have to be logged in before you can change your details.]

+;file \protocols\Gadu-Gadu\src\filetransfer.cpp

+[Can not create transfer file. ERROR: %d: %s (dcc)\n%s]

+[Can not create transfer file. ERROR: %d: %s (dcc7)\n%s]

 ;file \protocols\Gadu-Gadu\src\gg.cpp

 [WinSock %u: Unknown error.]

 [WinSock %d: %s]

@@ -199,29 +205,32 @@
 [Select picture to send]

 [bmp]

 [jpeg]

+[Can not create image cache directory. ERROR: %d: %s\n%s]

 [\\%s]

 [%.*s (%u)%s]

+[Cannot save received image to file. ERROR: %d: %s\n%s]

 [[img]%s[/img]]

 [.bmp]

 [.gif]

 [.jpg]

 [.png]

+[Can not open image file. ERROR: %d: %s\n%s]

 [Image exceeds maximum allowed size of 255 KB.]

 ;file \protocols\Gadu-Gadu\src\import.cpp

 [You have to be connected before you can import/export contacts from/to server.]

-[List cannot be imported because of error:\n\t%s]

-[List cannot be removeed because of error:\n\t%s]

+[List cannot be imported because of error:\n\t%s (Error: %d)]

+[List cannot be removeed because of error: %s (Error: %d)]

 [Text files]

 [ (*.txt)]

 [*.TXT]

 [All Files]

 [ (*)]

 [txt]

-[List cannot be imported from file "%s" because of error:\n\t%s]

+[List cannot be imported from file "%s" because of error:\n\t%s (Error: %d)]

 [contacts]

 [.txt]

-[List cannot be exported to file "%s" because of error:\n\t%s]

-[List cannot be exported because of error:\n\t%s]

+[List cannot be exported to file "%s" because of error:\n\t%s (Error: %d)]

+[List cannot be exported because of error:\n\t%s (Error: %d)]

 [Import List From &Server]

 [Import List From &Text File...]

 [&Remove List From Server]

@@ -230,7 +239,7 @@
 ;file \protocols\Gadu-Gadu\src\links.cpp

 [Gadu-Gadu Link Protocol]

 ;file \protocols\Gadu-Gadu\src\ownerinfo.cpp

-[Password could not be reminded because of error:\n\t%s]

+[Password could not be reminded because of error:\n\t%s (Error: %d)]

 [Password was sent to your e-mail.]

 ;file \protocols\Gadu-Gadu\src\popups.cpp

 [%s/%s]

diff --git a/langpacks/english/Plugins/IgnoreState.txt b/langpacks/english/Plugins/IgnoreState.txt
index 6c2a87f2c4..2591cf63bd 100644
--- a/langpacks/english/Plugins/IgnoreState.txt
+++ b/langpacks/english/Plugins/IgnoreState.txt
@@ -1,7 +1,7 @@
 #muuid {a6872bcd-f2a1-41b8-b2f1-dd7cec055734}

 ;============================================================

 ;  File: IgnoreState.dll

-;  Plugin: IgnoreState

+;  Plugin: Ignore State

 ;  Version: 0.0.3.0

 ;  Authors: Kildor

 ;============================================================

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 5f8c36ac03..8ff463996a 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -1,7 +1,7 @@
 ;#muuid not found, please specify manually!

 ;============================================================

 ;  File: KeepStatus.dll

-;  Plugin: KeepStatus

+;  Plugin: Keep Status

 ;  Version: 0.8.0.97

 ;  Authors: P Boon

 ;============================================================

diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt
index ae9683daf3..2be7d3c30d 100644
--- a/langpacks/english/Plugins/MenuEx.txt
+++ b/langpacks/english/Plugins/MenuEx.txt
@@ -1,7 +1,7 @@
 ;#muuid not found, please specify manually!

 ;============================================================

 ;  File: MenuEx.dll

-;  Plugin: MenuItemEx

+;  Plugin: Menu Item Ext

 ;  Version: x.x.x.x

 ;  Authors: 

 ;============================================================

diff --git a/langpacks/english/Plugins/MetaContacts.txt b/langpacks/english/Plugins/MetaContacts.txt
index eba07913b9..597fa0c328 100644
--- a/langpacks/english/Plugins/MetaContacts.txt
+++ b/langpacks/english/Plugins/MetaContacts.txt
@@ -1,7 +1,7 @@
 #muuid {4c4a27cf-5e64-4242-a332-b98b08243e89}

 ;============================================================

 ;  File: MetaContacts.dll

-;  Plugin: MetaContacts Plugin

+;  Plugin: MetaContacts

 ;  Version: 0.14.0.13

 ;  Authors: J. Schaal & S. Ellis

 ;============================================================

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index e1bb707e38..a290c00009 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -66,6 +66,7 @@
 [</GPGdec>]

 [<GPGenc>]

 [</GPGenc>]

+[Arial]

 [GPG Turn off encryption]

 [GPG Turn on encryption]

 [GPG encryption status]

@@ -223,6 +224,8 @@
 [Where is no public or private key.]

 ;file \plugins\New_GPG\src\utilities.cpp

 [Do you want to toggle encryption for all subcontacts ?]

+[%s: %s]

+[Send publick key]

 [.gpg]

 [ -o ]

 [Target file exists, do you want to replace it ?]

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 5d85aea9d4..afcd5478f2 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -1,7 +1,7 @@
 #muuid {56cc3f29-ccbf-4546-a8ba-9856248a412a}

 ;============================================================

 ;  File: NewsAggregator.dll

-;  Plugin: NewsAggregator

+;  Plugin: News Aggregator

 ;  Version: 0.0.0.1

 ;  Authors: Mataes, FREAK_THEMIGHTY

 ;============================================================

@@ -49,6 +49,21 @@
 [Enter Feed URL]

 [Enter checking interval]

 [Enter message format]

+[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]

+[#<title>#]

+[The title of the item.]

+[#<description>#]

+[The item synopsis.]

+[#<link>#]

+[The URL of the item.]

+[#<author>#]

+[Email address of the author of the item.]

+[#<comments>#]

+[URL of a page for comments relating to the item.]

+[#<guid>#]

+[A string that uniquely identifies the item.]

+[#<category>#]

+[Specify one or more categories that the item belongs to.]

 [Feed Tag Help]

 [Are you sure?]

 [Tags Mask Reset]

@@ -110,14 +125,7 @@
 [author]

 [comments]

 [guid]

-[#<title>#]

 [empty]

-[#<link>#]

-[#<description>#]

-[#<author>#]

-[#<comments>#]

-[#<guid>#]

-[#<category>#]

 [Atom 3]

 [rel]

 [self]

diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index a53c1daaba..34b6184990 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -1,7 +1,7 @@
 #muuid {29517be5-779a-48e5-8950-cb4de1d43172}

 ;============================================================

 ;  File: PackUpdater.dll

-;  Plugin: PackUpdater

+;  Plugin: Pack Updater

 ;  Version: 0.0.1.1

 ;  Authors: Mataes, ZERO_BiT

 ;============================================================

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 4e74f763bd..de3c895f85 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -1,7 +1,7 @@
 #muuid {968def4a-bc60-4266-ac08-754ce721db5f}

 ;============================================================

 ;  File: PluginUpdater.dll

-;  Plugin: PluginUpdater

+;  Plugin: Plugin Updater

 ;  Version: 0.1.0.2

 ;  Authors: Mataes, George Hazan

 ;============================================================

diff --git a/langpacks/english/Plugins/StartPosition.txt b/langpacks/english/Plugins/StartPosition.txt
new file mode 100644
index 0000000000..cb4a7cf7a6
--- /dev/null
+++ b/langpacks/english/Plugins/StartPosition.txt
@@ -0,0 +1,22 @@
+#muuid {211f6277-6f9b-4b77-a939-84d04b26b38c}

+;============================================================

+;  File: StartPosition.dll

+;  Plugin: Start Position

+;  Version: 0.2.0.3

+;  Authors: Felipe Brahm - souFrag

+;============================================================

+[Plugin supports starting position of Contact List relative to the the taskbar and screen side.]

+;file \plugins\StartPosition\res\resource.rc

+[Contact List Window Start Position]

+[Left]

+[Right]

+[Pixels from Top]

+[Pixels from Bottom]

+[Pixels from Side]

+[Width]

+[Always start...]

+[Minimized to System Tray]

+[Opened]

+;file \plugins\StartPosition\src\main.cpp

+[Contact List]

+[Start position]