summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt6
-rw-r--r--langpacks/english/Plugins/Dbx_mmap.txt5
-rw-r--r--langpacks/english/Plugins/HistoryStats.txt2
-rw-r--r--langpacks/english/Plugins/MirFox.txt1
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt3
-rw-r--r--langpacks/english/Plugins/SendSS.txt15
-rw-r--r--langpacks/english/Plugins/SimpleStatusMsg.txt51
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/english/Plugins/Tlen.txt2
9 files changed, 44 insertions, 43 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index f555cec93a..4febb7d34f 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -575,14 +575,14 @@
[Message window event log]
[Show names]
[Show timestamp]
+[Show seconds]
[Show dates]
+[Show formatting]
+[Load history events]
[Load unread events only]
[Load number of previous events]
[Load previous events less than]
[minutes old]
-[Show seconds]
-[Load history events]
-[Show formatting]
[Send typing notifications to the following users when you are typing a message to them:]
[Show typing notifications when a user is typing a message]
[Update inactive message window icons when a user is typing]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index c49de340d3..9528279b5f 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Dbx_mmap.dll
; Plugin: Miranda NG mmap database driver
-; Version: 0.95.0.4
+; Version: 0.95.1.1
; Authors: Miranda-NG project
;============================================================
[Provides Miranda database support: global settings, contacts, history, settings per contact.]
@@ -28,6 +28,9 @@
[Database Error]
[Miranda has detected corruption in your database. This corruption may be fixed by DbChecker plugin. Please download it from http://miranda-ng.org/p/DbChecker/. Miranda will now shut down.]
[Database Panic]
+;file \plugins\Db3x_mmap\src\dbheaders.cpp
+[This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nPlease press Yes to read further instructions or No to cancel]
+[Obsolete database format]
;file \plugins\Db3x_mmap\src\dbintf.cpp
[Your database must be converted into the new format. This is potentially dangerous operation, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
[Database conversion required]
diff --git a/langpacks/english/Plugins/HistoryStats.txt b/langpacks/english/Plugins/HistoryStats.txt
index 4b75ec2e17..5fbd4a32e1 100644
--- a/langpacks/english/Plugins/HistoryStats.txt
+++ b/langpacks/english/Plugins/HistoryStats.txt
@@ -294,9 +294,7 @@
[Column specific settings]
[For this config the selected column...]
[...can be output as: ]
-[HTML]
[PNG (partial)]
-[PNG]
[...will be output as: ]
[Nothing (column will be skipped)]
[HTML as fallback]
diff --git a/langpacks/english/Plugins/MirFox.txt b/langpacks/english/Plugins/MirFox.txt
index 5a977aee93..f0db20a105 100644
--- a/langpacks/english/Plugins/MirFox.txt
+++ b/langpacks/english/Plugins/MirFox.txt
@@ -32,7 +32,6 @@
[MirFox log]
[Message sent to %s (%s)]
[Message sent]
-[MirFox]
[Cannot send message to %s (%s) - %S]
[Cannot send message - %S]
[Cannot send message to %s (%s)]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index e1b324a275..31d123834b 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PluginUpdater.dll
; Plugin: Plugin updater
-; Version: 0.1.2.0
+; Version: 0.1.2.1
; Authors: Mataes, George Hazan
;============================================================
[Plugin updater for Miranda NG.]
@@ -79,6 +79,7 @@
[%d component(s) was updated]
[No updates found.]
[Update checking already started!]
+;file \plugins\PluginUpdater\src\Events.cpp
;file \plugins\PluginUpdater\src\Options.cpp
[hours]
[days]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 73a318aa96..056b158866 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SendSS.dll
; Plugin: Send ScreenShot+
-; Version: 0.8.5.2
+; Version: 0.8.7.0
; Authors: Merlin
;============================================================
[Take a screenshot and send it to a contact.]
@@ -20,6 +20,7 @@
[E&xplore]
[&Fill description textbox.]
[Delete &after send]
+[Open editor before sending]
[Open again]
[&Capture]
[About]
@@ -30,6 +31,7 @@
[Caption:]
[Size (HxW):]
[C&lient Area]
+[indirect capture]
[Target Tool]
[File:]
[Description:]
@@ -49,6 +51,8 @@
;file \plugins\SendScreenshotPlus\src\CSend.h
[Unable to initiate %s.]
[MAPI error (%i):\n%s.]
+[Unknown response from %s (%i)]
+[Got no response from %s (%i)]
;file \plugins\SendScreenshotPlus\src\CSendDropbox.cpp
[Dropbox transfer]
[%s (%i):\nCould not add a share to the Dropbox plugin.]
@@ -73,14 +77,14 @@
;file \plugins\SendScreenshotPlus\src\CSendFTPFile.cpp
[FTPFile transfer]
[%s (%i):\nCould not add a share to the FTP File plugin.]
-;file \plugins\SendScreenshotPlus\src\CSendHost_uploadpie.cpp
+;file \plugins\SendScreenshotPlus\src\CSendHost_ImageShack.cpp
[Image upload]
-[Upload server did not respond timely.]
+;file \plugins\SendScreenshotPlus\src\CSendHost_imgur.cpp
+;file \plugins\SendScreenshotPlus\src\CSendHost_uploadpie.cpp
;file \plugins\SendScreenshotPlus\src\CSendHTTPServer.cpp
[HTTPServer transfer]
[Could not start the HTTP Server plugin.]
[%s (%i):\nCould not add a share to the HTTP Server plugin.]
-;file \plugins\SendScreenshotPlus\src\CSendImageShack.cpp
;file \plugins\SendScreenshotPlus\src\dlg_msgbox.cpp
[Retry]
[Yes]
@@ -115,6 +119,7 @@
[Prev]
[Next]
[Update]
+[Edit on]
[BBC]
[BBC link]
[Down arrow]
@@ -138,8 +143,6 @@
[File Transfer]
[E-mail]
[FTP File]
-[Dropbox]
-[ImageShack]
[Upload Pie (30m)]
[Upload Pie (1d)]
[Upload Pie (1w)]
diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index c957ac291a..c8c501ae67 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -7,11 +7,11 @@
;============================================================
[Provides a simple way to set status and away messages.]
;file \plugins\SimpleStatusMsg\res\resource.rc
-[%s Message for %s]
+[%s message for %s]
[&Cancel]
[Retrieving %s message...]
-[Co&py to Clipboard]
-[%s Message (%s)]
+[Co&py to clipboard]
+[%s message (%s)]
[Retrieving status message for %s...]
[Behavior on status change]
[Apply to all]
@@ -48,13 +48,11 @@
[Automatically close dialog window after]
[Remember last dialog window position]
[Remove Carriage Return (CR = '\\r' = #0D) chars from status messages]
-[Show 'Copy Away Message' item in contact menu]
-[Show 'Go to URL in Away Message' item in contact menu]
-[Show 'Status Message...' item in status menu]
+[Show 'Status message...' item in status menu]
[Clear History]
[Clear Predefined]
[* This feature is available only when using StartupStatus plugin.]
-[Status on Startup]
+[Status on startup]
[Set status after]
[milliseconds]
[Protocol:]
@@ -84,21 +82,21 @@
[Copy]
[Paste]
[Delete]
-[Select All]
+[Select all]
;file \plugins\SimpleStatusMsg\src\awaymsg.cpp
[Failed to retrieve %s message.]
[&Close]
-[Re&ad %s Message]
-[Copy %s Message]
-[&Go to URL in %s Message]
-[Re&ad Away Message]
-[Copy Away Message]
-[&Go to URL in Away Message]
+[Re&ad %s message]
+[Copy %s message]
+[&Go to URL in %s message]
+[Re&ad Away message]
+[Copy Away message]
+[&Go to URL in Away message]
;file \plugins\SimpleStatusMsg\src\main.cpp
-[Change Status Message]
-[Open Status Message Dialog]
-[Status Message]
-[Status Message...]
+[Change status message]
+[Open status message dialog]
+[Status message]
+[Status message...]
[%s (locked)]
[External Applications]
[retrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]
@@ -107,29 +105,30 @@
;file \plugins\SimpleStatusMsg\src\msgbox.cpp
[<startup>]
[<current>]
-[Add to Predefined]
-[Delete Selected]
-[Global]
+[Clear history]
+[Add to predefined]
+[Delete selected]
+[global]
[Closing in %d]
[Are you sure you want to clear status message history?]
[Confirm clearing history]
;file \plugins\SimpleStatusMsg\src\options.cpp
[Global status change]
-[Open String Formatting Help]
+[Open string formatting help]
[Hide]
[Show next to cancel button]
[Flat, next to cancel button]
[Show in message list]
[Are you sure you want to clear predefined status messages?]
[Confirm clearing predefined]
-[<Last status>]
+[<last status>]
[Status]
[General]
[Advanced]
;file \plugins\SimpleStatusMsg\src\utils.cpp
-[Recent Message]
-[Predefined Message]
-[Go to URL in Away Message]
+[Recent message]
+[Predefined message]
+[Go to URL in Away message]
[Simple Status Message]
[I've been away since %time%.]
[Give it up, I'm not in!]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 590455fff5..e15a46c913 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.3.1.2
+; Version: 3.3.1.4
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index a047bc81b8..38afe0b60c 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -138,8 +138,6 @@
[Ignore all images]
[<Last message>]
[Forwarding]
-[SOCKS4]
-[SOCKS5]
[%S mail]
;file \protocols\Tlen\src\tlen_picture.cpp
[Image sent file://%s]