From f18a5bca7b7a5a4f7c0ae0a5b9819c7b89732ed7 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Nov 2013 21:38:17 +0000 Subject: langpacks\english: update git-svn-id: http://svn.miranda-ng.org/main/trunk@6916 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/=CORE=.txt | 10 +++++----- langpacks/english/Plugins/Clist_modern.txt | 5 +---- langpacks/english/Plugins/Clist_mw.txt | 1 - langpacks/english/Plugins/Clist_nicer.txt | 1 - langpacks/english/Plugins/Db_autobackups.txt | 6 ++++-- langpacks/english/Plugins/New_GPG.txt | 6 +++--- langpacks/english/Plugins/Popup.txt | 1 - 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 7c974922ca..c7f3c7a448 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -244,7 +244,7 @@ [&Reset to default] [find/add] [&Add to List] -[User &Details] +[User &details] [Send &Message] [Log] [&Copy] @@ -261,7 +261,6 @@ [&Authorize] [&Deny] [Decide &Later] -[User &details] [Reason:] [Denial Reason:] [Add to contact list if authorized] @@ -905,6 +904,8 @@ ;file \src\core\stdclist\src\clistopts.cpp [Global] ;file \src\core\stdclist\src\cluiopts.cpp +;file \src\core\stdcrypt\encrypt.cpp +[Standard crypto provider] ;file \src\core\stdemail\email.cpp [User has not registered an e-mail address] [Send e-mail] @@ -1069,7 +1070,6 @@ ;file \src\modules\clist\clistsettings.cpp [(Unknown Contact)] ;file \src\modules\clist\clisttray.cpp -[&Main Menu] ;file \src\modules\clist\clui.cpp [This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network.] [De&lete] @@ -1286,7 +1286,7 @@ [Tick] [No Tick] [Help] -[Miranda Website] +[Miranda website] [Small Dot] [Filled Blob] [Empty Blob] @@ -1296,7 +1296,7 @@ [Unloaded plugin] [Show/Hide] [Exit] -[Main Menu] +[Main menu] [Leave chat] [Move to Group] [On] diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index bb37555f52..d05b8b132f 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -442,7 +442,6 @@ [(Unknown Contact)] ;file \plugins\Clist_modern\src\modern_clisttray.cpp [&Find/Add Contacts...] -[&Main Menu] [&Options...] [&About] ;file \plugins\Clist_modern\src\modern_clui.cpp @@ -525,16 +524,14 @@ [Center] [Right] ;file \plugins\Clist_modern\src\modern_toolbar.cpp -[Main Menu] [Main menu] -[Status Menu] [Status menu] [Accounts] [Accounts...] [Show/Hide offline contacts] [Hide offline contacts] [Show offline contacts] -[Find User] +[Find user] [Use/Disable groups] [Use groups] [Disable Groups] diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt index 7c9f3fd11f..d8379612d7 100644 --- a/langpacks/english/Plugins/Clist_mw.txt +++ b/langpacks/english/Plugins/Clist_mw.txt @@ -191,7 +191,6 @@ [(Unknown Contact)] ;file \plugins\Clist_mw\src\clisttray.cpp [&Find/Add Contacts...] -[&Main Menu] [&Options...] [&About] ;file \plugins\Clist_mw\src\clui.cpp diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt index 2ef5971abd..629ee65f65 100644 --- a/langpacks/english/Plugins/Clist_nicer.txt +++ b/langpacks/english/Plugins/Clist_nicer.txt @@ -444,7 +444,6 @@ [Floating] ;file \plugins\Clist_nicer\src\CLUIFrames\groupmenu.cpp [&Find/Add Contacts...] -[&Main Menu] [&Options...] [&About the contact list...] [&New SubGroup] diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt index 01430de469..b6753a9af7 100644 --- a/langpacks/english/Plugins/Db_autobackups.txt +++ b/langpacks/english/Plugins/Db_autobackups.txt @@ -23,10 +23,12 @@ [Disable progress bar] [Disable Popups] ;file \plugins\Db_autobackups\src\backup.cpp -[Miranda databases] +[Miranda NG database] +[Created by:] +[Miranda NG databases] +[Compressed Miranda NG databases] [All Files] [Backup in progress] -[Rotating backup files...] [Copying database file...] [Database backed up] ;file \plugins\Db_autobackups\src\main.cpp diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index 7512980b40..13ec8afbf8 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -15,7 +15,7 @@ [Import key from keyserver] [Set own key] [Generate key] -[Select key for use] +[Select key to use] [Key password:] [Load other] [Delete key] @@ -57,7 +57,7 @@ [Select keyserver for key search:] [Received encrypted file] [Decrypt] -[Received encrypted file form contact with disabled encryption.] +[Received encrypted file from contact with disabled encryption.] [Remember choice] [Choose which keys to export] [Export public keys (only set for contacts)] @@ -68,13 +68,13 @@ [New password twice:] [Userlist:] [Export PubKey] -[Select own key] [Turn on debug log] [Use jabber api on Miranda NG (recomended)] [Default key] [Encrypt file transfers] [Automatic key exchange] [Copy own key] +[Select own key] [Add tags to encoded and decoded messages] [Incoming message tags:] [Outgoing message tags:] diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt index 66675469cf..98932428cc 100644 --- a/langpacks/english/Plugins/Popup.txt +++ b/langpacks/english/Plugins/Popup.txt @@ -146,7 +146,6 @@ [Pin Popup] [Pinned Popup] [Send Message] -[User Details] [Contact Menu] [Add Contact Permanently] [Dismiss Popup] -- cgit v1.2.3