summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2015-12-28 14:42:37 +0000
committerDart Raiden <wowemuh@gmail.com>2015-12-28 14:42:37 +0000
commitccf68b6ac10c9bfd101ff45f75fc3944170494e7 (patch)
treec0143f5bb380dd0b60ce5e4711fa1e35882fba79 /langpacks/english
parentf041b583d006db97d0f215409dcb371f8e8a0fdd (diff)
langpacks/english: update
git-svn-id: http://svn.miranda-ng.org/main/trunk@15953 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt2
-rw-r--r--langpacks/english/Plugins/AVS.txt7
-rw-r--r--langpacks/english/Plugins/AutoShutdown.txt28
-rw-r--r--langpacks/english/Plugins/Dropbox.txt2
-rw-r--r--langpacks/english/Plugins/FileAsMessage.txt2
-rw-r--r--langpacks/english/Plugins/FltContacts.txt2
-rw-r--r--langpacks/english/Plugins/New_GPG.txt2
-rw-r--r--langpacks/english/Plugins/PManagerEx.txt5
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/english/Plugins/Popup.txt2
-rw-r--r--langpacks/english/Plugins/Steam.txt7
11 files changed, 31 insertions, 30 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 803ea78a7c..1e6ec12778 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -513,7 +513,7 @@
[Please complete the following form to create a new user profile]
[Profile]
[e.g., Workplace]
-[You can select a different profile driver from the default, it may offer more features or abilities, if in doubt use the default.]
+[You can select a different database driver from the default, it may offer more features or abilities, if in doubt use the default.]
[e.g., dbx mmap]
[Driver]
[Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mmap.dll]
diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 8595fa5c58..7996508967 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -50,7 +50,7 @@
[My Avatars]
[My Global Avatar Cache]
[Fatal error, image services not found. Avatar services will be disabled.]
-[Avatar Service]
+[Avatar service]
;file \plugins\AVS\src\options.cpp
[Set avatar options for %s]
[Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]
@@ -62,7 +62,6 @@
[Own avatars]
[No avatar]
[Are you sure you want to remove your avatar?]
-[Global Avatar]
[Avatar]
;file \plugins\AVS\src\services.cpp
[All files]
@@ -73,5 +72,5 @@
[Flash animations]
[XML files]
[Grow avatar to fit max allowed protocol size]
-[Set My Avatar]
-[Set My Avatar for %s]
+[Set my avatar]
+[Set my avatar for %s]
diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 1bc6d0872e..eb3a217256 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -11,13 +11,13 @@
[&Show confirmation dialog before shutdown]
[&Countdown starts at:]
[seconds]
-[Shutdown Events]
+[Shutdown events]
[&Activate automatic shutdown with the same settings again if Miranda NG was closed with automatic shutdown enabled]
[&Ignore hidden or temporary contacts when watching for all contacts being offline]
-[Critical Shutdown Events]
+[Critical shutdown events]
[Automatically shutdown the computer and turn the power off when one of the following occurs:]
[&Thunderstorm warning is issued (Weather)]
-[Automatic Shutdown]
+[Automatic shutdown]
[Select the automatic shutdown event]
[Shutdown at &specific time]
[Shutdown a&t:]
@@ -38,13 +38,13 @@
[Shutdown at:]
[Time left:]
[Paused]
-[&Unpause Countdown]
-[&Pause Countdown]
-[&Cancel Countdown]
+[&Unpause countdown]
+[&Pause countdown]
+[&Cancel countdown]
[AutoShutdown]
-[Countdown on Frame]
+[Countdown on frame]
[Background]
-[Progress Bar]
+[Progress bar]
;file \plugins\AutoShutdown\src\main.cpp
[Header]
[Active]
@@ -72,12 +72,12 @@
[The computer will automatically be set to standby mode in %u second(s).]
[The computer will automatically be set to hibernate mode in %u second(s).]
[The workstation will automatically get locked in %u second(s).]
-[All dialup connections will be closed in %u second(s).]
+[All dial-up connections will be closed in %u second(s).]
[The computer will automatically be shut down in %u second(s).]
-[Automatic Shutdown Error]
+[Automatic shutdown error]
[The shutdown process failed!\nReason: %s]
[Unknown]
-[Inititiating the shutdown process failed!\nReason: %s]
+[Initiating the shutdown process failed!\nReason: %s]
[Close Miranda NG]
[Set Miranda NG offline]
[Log off user]
@@ -86,7 +86,7 @@
[Standby mode]
[Hibernate mode]
[Lock workstation]
-[Hang up dialup connections]
+[Hang up dial-up connections]
[Sets all Miranda NG protocols to offline and closes Miranda NG.]
[Sets all Miranda NG protocols to offline.]
[Logs the current Windows user off so that another user can log in.]
@@ -97,7 +97,7 @@
[Locks the computer. To unlock the computer, you must log in.]
[Sets all protocols to offline and closes all RAS connections.]
[Alerts]
-[Automatic Shutdown Countdown]
+[Automatic shutdown countdown]
;file \plugins\AutoShutdown\src\utils.cpp
-[Toggle Automatic Shutdown]
+[Toggle automatic shutdown]
[Main]
diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index e1a4f68923..474caae862 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Dropbox.dll
; Plugin: Dropbox
-; Version: 0.12.0.7
+; Version: 0.12.0.8
; Authors: Miranda NG Team
;============================================================
[Allows you to transfer files via Dropbox.]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index bf53cf0a47..9235d21f78 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -21,7 +21,7 @@
[To send]
[Received]
[Use only alphanumeric encoding on transfer]
-[Extra options: Events -> File Transfers, "Receiving files" group]
+[Go to Options -> Events -> File Transfers, "Receiving files" group for extra settings]
;file \plugins\FileAsMessage\src\dialog.cpp
[File already exists. Overwrite?]
[Couldn't open a file]
diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index db1433d771..3ec1a49b7b 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -2,7 +2,7 @@
;============================================================
; File: FltContacts.dll
; Plugin: Floating contacts
-; Version: 0.7.0.3
+; Version: 0.7.0.4
; Authors: Iavor Vajarov, Kosh&chka, Victor Pavlychko
;============================================================
[Floating Contacts plugin for Miranda.]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 13682a1650..db5ef3f6c1 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -2,7 +2,7 @@
;============================================================
; File: New_GPG.dll
; Plugin: GPG
-; Version: 0.0.0.11
+; Version: 0.0.0.12
; Authors: sss
;============================================================
[New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]
diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt
index 182a72489e..27c08cd879 100644
--- a/langpacks/english/Plugins/PManagerEx.txt
+++ b/langpacks/english/Plugins/PManagerEx.txt
@@ -8,10 +8,9 @@
[Adds a menu item to change or load a different profile of Miranda NG, restart or run DbChecker.]
;file \plugins\ProfileManager\src\pmanagerEx.cpp
[Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]
-[Check Database]
+[Check database]
[Load profile]
[Change profile]
-[Check database]
[Restart]
-[Database]
[Profile manager]
+[Database]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 9cab3e9c28..941c2e24ba 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -21,7 +21,7 @@
[(but only once a day)]
[Every]
[Silent mode]
-[Backup database before update (requires Db_autobackups)]
+[Backup database before update (requires Db_autobackups plugin)]
[Files source]
[Stable version]
[Development version (less stable)]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index ecd3e15492..08071a1bcb 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -164,7 +164,7 @@
[Toggle Popups]
[Enable Popups]
[Disable Popups]
-[Popup plus]
+[Popup Plus]
[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
;file \plugins\Popup\src\opt_adv.cpp
[No effect]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 0ab1486741..447d839f2a 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Steam.dll
; Plugin: Steam protocol
-; Version: 0.11.4.2
+; Version: 0.11.5.0
; Authors: Miranda NG Team, Robert Pösel
;============================================================
[Steam protocol support for Miranda NG.]
@@ -40,7 +40,8 @@
[Network]
[Blocked contacts]
;file \protocols\Steam\src\steam_login.cpp
-[Connection token expired. Please login again.]
+[Cannot obtain connection token.]
+[Unknown login error.]
;file \protocols\Steam\src\steam_menus.cpp
[Steam menu chooser]
[Request authorization]
@@ -56,4 +57,6 @@
[%s connection]
[SteamID]
[You cannot send messages when you are offline.]
+;file \protocols\Steam\src\steam_utils.cpp
+[closed chat session]
;file \protocols\Steam\src\steam_xstatus.cpp