From fa1e43b84175db63a486927d6d33b1f944ded7cd Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 2 Dec 2013 15:29:14 +0000 Subject: langpacks\english: update git-svn-id: http://svn.miranda-ng.org/main/trunk@7038 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/=CORE=.txt | 118 ++++++++++++++++----------------- langpacks/english/Plugins/Dbx_mmap.txt | 14 ++++ langpacks/english/Plugins/WhatsApp.txt | 13 +++- 3 files changed, 82 insertions(+), 63 deletions(-) (limited to 'langpacks') diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 38cbaf483e..ac789875c4 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -909,28 +909,28 @@ [File from %s] [bytes] [&File] -[File &Transfers...] +[File &transfers...] [Incoming] [Complete] [Error] [Denied] ;file \src\core\stdfile\fileexistsdlg.cpp -[%s File] -[All Files] +[%s file] +[All files] ;file \src\core\stdfile\fileopts.cpp -[Executable Files] +[Executable files] [Events] ;file \src\core\stdfile\filerecvdlg.cpp -[My Received Files] -[View User's History] -[User Menu] +[My received files] +[View user's history] +[User menu] [Canceled] ;file \src\core\stdfile\filesenddlg.cpp [%d files] [%d directories] ;file \src\core\stdfile\filexferdlg.cpp [This file has not yet been scanned for viruses. Are you certain you want to open it?] -[File Received] +[File received] [of] [Request sent, waiting for acceptance...] [Waiting for connection...] @@ -961,8 +961,8 @@ ;file \src\core\stdhelp\help.cpp [&About...] [&Support] -[&Miranda NG Homepage] -[&Report Bug] +[&Miranda NG homepage] +[&Report bug] ;file \src\core\stdidle\idle.cpp [Idle] ;file \src\core\stdmsg\src\cmdlist.cpp @@ -978,7 +978,6 @@ [%s is typing a message...] ;file \src\core\stdmsg\src\msglog.cpp [File sent] -[File received] ;file \src\core\stdmsg\src\msgoptions.cpp [Outgoing messages] [Incoming messages] @@ -989,54 +988,54 @@ [Incoming time] [Incoming colon] [Message area] -[Message Log] +[Message log] [** New contacts **] [** Unknown contacts **] [Show balloon popup (unsupported system)] -[Messaging Log] -[Typing Notify] +[Messaging log] +[Typing notify] ;file \src\core\stdmsg\src\msgs.cpp [Message from %s] [%s is typing a message] -[Typing Notification] +[Typing notification] [Miranda could not load the built-in message module, riched20.dll is missing. Press 'Yes' to continue loading Miranda.] [Instant messages] -[Incoming (Focused Window)] -[Incoming (Unfocused Window)] -[Incoming (New Session)] +[Incoming (focused window)] +[Incoming (unfocused window)] +[Incoming (new session)] [Message send error] [Contact started typing] [Contact stopped typing] ;file \src\core\stdmsg\src\msgtimedout.cpp [An unknown error has occurred.] ;file \src\core\stduihist\history.cpp -[Invalid Message] +[Invalid message] [Outgoing URL] [Incoming URL] -[Outgoing File] -[Incoming File] +[Outgoing file] +[Incoming file] [History for %s] [Are you sure you want to delete this history item?] -[Delete History] -[View &History] +[Delete history] +[View &history] ;file \src\core\stdurl\url.cpp [URL from %s] -[Web Page Address (&URL)] +[Web page address (&URL)] [URL] ;file \src\core\stdurl\urldialogs.cpp [Send URL to] [Send timed out] ;file \src\core\stduserinfo\contactinfo.cpp -[Edit E-Mail Address] -[Edit Phone Number] +[Edit E-Mail address] +[Edit phone number] [The phone number should start with a + and consist of numbers, spaces, brackets and hyphens only.] -[Invalid Phone Number] +[Invalid phone number] [Primary] [Custom %d] [Fax] [Mobile] -[Work Phone] -[Work Fax] +[Work phone] +[Work fax] ;file \src\core\stduserinfo\stdinfo.cpp [Male] [Female] @@ -1049,18 +1048,18 @@ [Notes] ;file \src\core\stduserinfo\userinfo.cpp [Owner] -[View/Change My &Details...] +[View/change my &details...] ;file \src\core\stduseronline\useronline.cpp -[%s is Online] +[%s is online] ;file \src\modules\addcontact\addcontact.cpp -[Add Contact] +[Add contact] [Please authorize my request and add me to your contact list.] ;file \src\modules\clist\clcitems.cpp ;file \src\modules\clist\clistmenus.cpp [Custom status] [%s (locked)] ;file \src\modules\clist\clistsettings.cpp -[(Unknown Contact)] +[(Unknown contact)] ;file \src\modules\clist\clisttray.cpp ;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.] @@ -1076,35 +1075,35 @@ [Username] [FirstName LastName] [LastName FirstName] -['(Unknown Contact)' (not movable)] -['(Unknown Contact)'] +['(Unknown contact)' (not movable)] +['(Unknown contact)'] [Contact names] ;file \src\modules\clist\genmenu.cpp -[Menu Icons] +[Menu icons] ;file \src\modules\clist\genmenuopt.cpp [Menus] [Customize] ;file \src\modules\clist\groups.cpp -[New Group] +[New group] [Are you sure you want to delete group '%s'? This operation cannot be undone.] -[Delete Group] +[Delete group] [You already have a group with that name. Please enter a unique name for the group.] -[Rename Group] +[Rename group] [This group] ;file \src\modules\clist\keyboard.cpp -[Show/Hide Contact List] -[Read Message] -[Open Options Page] -[Open Logging Options] -[Open Find User Dialog] +[Show/Hide contact list] +[Read message] +[Open Options page] +[Open logging options] +[Open 'Find user' dialog] ;file \src\modules\clist\movetogroup.cpp -[&Move to Group] -[] +[&Move to group] +[] ;file \src\modules\database\database.cpp [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.] [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely due to insufficient privileges. Please move profile manually.] [Profile cannot be placed into Miranda root folder.\nPlease move Miranda profile to some other location.] -[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_3x.dll or equivalent.] +[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll or equivalent.] [No profile support installed!] [Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed.] [Miranda can't understand that profile] @@ -1121,12 +1120,12 @@ ;file \src\modules\database\profilemanager.cpp [The profile '%s' already exists. Do you want to move it to the Recycle Bin?\n\nWARNING: The profile will be deleted if Recycle Bin is disabled.\nWARNING: A profile may contain confidential information and should be properly deleted.] [The profile already exists] -[Couldn't move '%s' to the Recycle Bin, Please select another profile name.] +[Couldn't move '%s' to the Recycle Bin. Please select another profile name.] [Problem moving profile] [Unable to create the profile '%s', the error was %x] [Problem creating profile] [&Create] -[] +[] [Are you sure you want to remove profile "%s"?] [Size] [Run] @@ -1134,12 +1133,11 @@ [Created] [Modified] [Manage your Miranda NG profile] -[My Profiles] -[New Profile] +[My profiles] +[New profile] ;file \src\modules\extraicons\DefaultExtraIcons.cpp [Chat activity] ;file \src\modules\extraicons\extraicons.cpp -[Chat Activity] ;file \src\modules\extraicons\options_ei.cpp [Extra icons] ;file \src\modules\findadd\findadd.cpp @@ -1148,9 +1146,9 @@ [Results] [There are no results to display.] [Searching] -[All Networks] +[All networks] [Handle] -[&Find/Add Contacts...] +[&Find/Add contacts...] ;file \src\modules\findadd\searchresults.cpp [Could not start a search on '%s', there was a problem - is %s connected?] [Could not search on any of the protocols, are you online?] @@ -1169,17 +1167,17 @@ [Smooth bump] [Contour thin] [Contour heavy] -[Configuration Files] -[Text Files] +[Configuration files] +[Text files] [Error writing file] -[Sample Text] +[Sample text] [Fonts] ;file \src\modules\fonts\FontService.cpp [Headers] [Generic text] [Small text] ;file \src\modules\icolib\skin2opts.cpp -[Icon Sets] +[Icon sets] ;file \src\modules\ignore\ignore.cpp [** All contacts **] [Contacts] @@ -1188,7 +1186,7 @@ [Standard hh:mm:ss times] [Times in milliseconds] [Times in microseconds] -[(Miranda Core Logging)] +[(Miranda core logging)] [Select where log file will be created] [Select program to be run] [Standard netlib log] @@ -1196,7 +1194,7 @@ [] [Network] ;file \src\modules\netlib\netlibssl.cpp -[Client cannot decode host message. Possible causes: Host does not support SSL or requires not existing security package] +[Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package] [Host we are connecting to is not the one certificate was issued for] ;file \src\modules\options\options.cpp [] diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt index 12eb9e5795..6730dbce1e 100644 --- a/langpacks/english/Plugins/Dbx_mmap.txt +++ b/langpacks/english/Plugins/Dbx_mmap.txt @@ -11,13 +11,27 @@ [EN] [OK] [Cancel] +[New password] +[Please enter your new password] [Enter password] +[Change password] +[Change] +[Remove] +[Old password] ;file \plugins\Db3x_mmap\src\database.cpp [Disk is full. Miranda will now shutdown.] [Database failure. Miranda will now shutdown.] [Database Error] [Miranda has detected corruption in your database. This corruption maybe fixed by DbChecker plugin. Please download it from http://miranda-ng.org/p/DbChecker/. Miranda will now shutdown.] [Database Panic] +;file \plugins\Db3x_mmap\src\ui.cpp +[Logo] +[Password] +[Password is too short!] +[Passwords do not match!] +[Wrong old password entered!] +[Database] +[Set password] ;file \plugins\Db3x_mmap\src\dbtool\aggressive.cpp [Performing aggressive pass] [Aggressive: random junk at %08X: skipping] diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt index b6047aa602..7688a3a246 100644 --- a/langpacks/english/Plugins/WhatsApp.txt +++ b/langpacks/english/Plugins/WhatsApp.txt @@ -1,20 +1,23 @@ #muuid {4f1ff7fa-4d75-44b9-93b0-2ced2e4f9e3e} ;============================================================ ; File: WhatsApp.dll -; Plugin: WhatsApp -; Version: 0.0.2.0 +; Plugin: WhatsApp protocol +; Version: 0.0.2.1 ; Authors: Uli Hecht ;============================================================ [WhatsApp protocol support for Miranda NG.] ;file \protocols\WhatsApp\res\whatsapp.rc [Phone-Number] [Including country code, without '+' or '00'] +[Password] [Nickname] [Request Code] [Register Code] [SMS-Code:] [Will only be used for registration] [Use SSL connection (443 port)] +[Paste password from WART utility] +[Use WART utility from Plugins folder for registering your number and generating password] [WhatsApp] [Cancel] [OK] @@ -24,13 +27,17 @@ [Please enter a nickname.] [Please enter a password.] ;file \protocols\WhatsApp\src\dialogs.cpp -[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneousley!\nContinue?] +[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?] [Please correctly specify your registration code received by SMS] [Your password has been set automatically.\nIf you change your password manually you may lose it and need to request a new code!] +;file \protocols\WhatsApp\src\main.cpp +[Did not unpack registration utility WART-1.5.4.0.exe.] ;file \protocols\WhatsApp\src\proto.cpp [%s server connection] [Unable to get Netlib connection for WhatsApp] [Network-connection error.] +[Network] +[Account] ;file \protocols\WhatsApp\src\theme.cpp [WhatsApp Icon] [Add To Group] -- cgit v1.2.3