From 6e0af04fbac15f8e456845511c8de1895aeaa224 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 1 Dec 2013 15:53:21 +0000 Subject: langpacks\english: update git-svn-id: http://svn.miranda-ng.org/main/trunk@7021 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/BasicHistory.txt | 2 +- langpacks/english/Plugins/Clist_modern.txt | 3 +-- langpacks/english/Plugins/Contacts.txt | 2 +- langpacks/english/Plugins/Dbx_mmap.txt | 29 +++++------------------------ langpacks/english/Plugins/Facebook.txt | 5 +++-- langpacks/english/Plugins/Msg_Export.txt | 2 +- langpacks/english/Plugins/Scriver.txt | 4 ++-- langpacks/english/Plugins/TabSRMM.txt | 11 ++++------- langpacks/english/Plugins/UInfoEx.txt | 2 +- 9 files changed, 19 insertions(+), 41 deletions(-) (limited to 'langpacks/english/Plugins') diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt index 9149577a1e..0e01916fec 100644 --- a/langpacks/english/Plugins/BasicHistory.txt +++ b/langpacks/english/Plugins/BasicHistory.txt @@ -116,7 +116,7 @@ [Delete Group] [Options] [Filters] -[Fonts & Colors] +[Fonts and colors] [Icons] [Hotkeys] [Rich Html] diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index d05b8b132f..7b8484a8b1 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -350,7 +350,7 @@ [Do you want contact '%s' to be added to MetaContact '%s'?] ;file \plugins\Clist_modern\src\modern_clcopts.cpp [Contact names] -[Row Items] +[Row items] [Frame texts] [Special colors] [Standard contacts] @@ -437,7 +437,6 @@ [Row design] [Second Line] [Third Line] -[Row items] ;file \plugins\Clist_modern\src\modern_clistsettings.cpp [(Unknown Contact)] ;file \plugins\Clist_modern\src\modern_clisttray.cpp diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt index bf883ff450..97cf12d5a1 100644 --- a/langpacks/english/Plugins/Contacts.txt +++ b/langpacks/english/Plugins/Contacts.txt @@ -25,7 +25,7 @@ [Try again] [Popup] [Add to List] -[User Details] +[User details] [Send Message] ;file \plugins\ContactsPlus\src\main.cpp [Contacts received from] diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt index 3bbd486ec2..12eb9e5795 100644 --- a/langpacks/english/Plugins/Dbx_mmap.txt +++ b/langpacks/english/Plugins/Dbx_mmap.txt @@ -7,30 +7,11 @@ ;============================================================ [Provides Miranda database support: global settings, contacts, history, settings per contact.] ;file \plugins\Db3x_mmap\res\db3x_mmap.rc -[Install Database Settings] -[Yes] -[No] -[A file containing new database settings has been placed in the Miranda NG directory.] -[Do you want to import the settings now?] -[No to all] -[&View contents] -[Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.] -[Database Setting Change] -[Database settings are being imported from] -[This file wishes to change the setting] -[to the value] -[Do you want to allow this change?] -[&Allow all further changes to this section] -[&Yes] -[&No] -[Cancel Import] -[Database Import Complete] -[The import has completed from] -[What do you want to do with the file now?] -[&Recycle] -[&Delete] -[&Move/Rename] -[&Leave] +[Login to Miranda NG] +[EN] +[OK] +[Cancel] +[Enter password] ;file \plugins\Db3x_mmap\src\database.cpp [Disk is full. Miranda will now shutdown.] [Database failure. Miranda will now shutdown.] diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index 25bd453ba0..c9056f715a 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Facebook.dll ; Plugin: Facebook RM -; Version: 0.2.2.0 +; Version: 0.2.2.1 ; Authors: Michal Zelinka, Robert Pösel ;============================================================ [Facebook protocol support for Miranda NG.] @@ -20,7 +20,7 @@ [Cancel] [Contacts >>] [Attach contacts:] -[User Details] +[User details] [Default group:] [Automatically set 'Ignore status change' flag] [Contacts Settings] @@ -103,6 +103,7 @@ [User sent you %s:] [Message read: %s by %s] [Message read: %s] +[This message is no longer available, because it was marked as abusive or spam.] [%s and more (%d)] ;file \protocols\FacebookRM\src\messages.cpp [You cannot send messages when you are offline.] diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt index 863c719780..63a1e06b63 100644 --- a/langpacks/english/Plugins/Msg_Export.txt +++ b/langpacks/english/Plugins/Msg_Export.txt @@ -35,7 +35,7 @@ [When user is deleted] [Delete file] [Debug] -[User &Details] +[User &details] [Export selected] [Set to default filename] [Copy] diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index aa3c7da789..a7cae844ca 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -23,7 +23,7 @@ [Tabs] [Enable tabs] [Always show tab bar] -[Tabs at bottom] +[Tabs at the bottom] [Limit names on tabs to] [characters] [Show close button on each tab] @@ -254,7 +254,7 @@ [Smiley] [Add Contact] [User Menu] -[User Details] +[User details] [History] [Send] [Look up '%s':] diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 2853f93a6a..4b79a87ca9 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -340,8 +340,8 @@ [Always pop up and activate new windows] [Create new windows in minimized state] [Send on Shift+Enter] -[Send message on Enter] -[Send message on double Enter] +[Send message on 'Enter'] +[Send message on double 'Enter'] [Minimize the message window on send] [Tabs:] [Use tabbed interface] @@ -452,7 +452,7 @@ [Show Tool Bar] [Place ToolBar at bottom] [Title Bar] -[Tabs at Bottom] +[Tabs at the bottom] [Window Flashing] [Use default Value] [Show Multisend Contact List] @@ -516,7 +516,6 @@ [Container options] [Configure container options for\n%s] [Tabs at the top] -[Tabs at the bottom] [Switch bar on the left side] [Switch bar on the right side] [Globally on] @@ -754,7 +753,7 @@ [Message delivery error] [Incoming message] [Outgoing message] -[Statuschange] +[Status change] [Static container icon] [Sounds (status bar)] [Pulldown Arrow] @@ -873,8 +872,6 @@ [Message window behavior] [Sending messages] [Send on SHIFT - Enter] -[Send message on 'Enter'] -[Send message on double 'Enter'] [Close the message window on send] [Always flash contact list and tray icon for new messages] [Delete temporary contacts on close] diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index c6ff55fefc..f94a721225 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -317,7 +317,7 @@ [UserInfoEx] ;file \plugins\UserInfoEx\src\mir_menuitems.cpp [Ex-/Import contact] -[User &Details] +[User &details] [&Export User Details] [&Import] [&Import User Details] -- cgit v1.2.3