summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 07:38:17 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 07:38:17 +0000
commitdefd28bd1a71aedd686fc37fe95405da33cc0498 (patch)
treee7626a3de3df81c5445e9054a4cd5337d7ada0b3 /langpacks/english
parent3935507067d57ccede81b300368eaa459827f7cf (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@13065 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt2
-rw-r--r--langpacks/english/Plugins/SendSS.txt1
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt1
-rw-r--r--langpacks/english/Plugins/SmileyAdd.txt4
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
-rw-r--r--langpacks/english/Plugins/Weather.txt2
6 files changed, 7 insertions, 5 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index fe2a9619b8..1668550f25 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1,7 +1,7 @@
;============================================================
; File: miranda32/64.exe
; Module: Miranda Core
-; Version: 0.95.4
+; Version: 0.95.5
;============================================================
;file \src\resource.rc
[Enter account name (for example, My Google)]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 887c2e515a..c83af2f3fe 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -125,6 +125,7 @@
[Credits]
;file \plugins\SendScreenshotPlus\src\UMainForm.cpp
[Drag&Drop the target on the desired window.]
+[Send screenshot to %s]
[Window]
[Desktop]
[<Entire Desktop>]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 3b58229dcc..ae42393a3a 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -9,7 +9,6 @@
;file \protocols\SkypeWeb\res\resource.rc
[Create group chat]
[Cancel]
-[New chat's title:]
[Mark users you want to invite to a new chat]
[Invite user to chat]
[Choose one of your contacts to be invited:]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 8af5356df7..9343b9a8fa 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SmileyAdd.dll
; Plugin: SmileyAdd
-; Version: 0.2.3.17
+; Version: 0.2.3.18
; Authors: Peacow, nightwish, bid, borkra
;============================================================
[Smiley support for Miranda NG.]
@@ -13,6 +13,7 @@
[Author:]
[Version:]
[Preview]
+[Use per protocol global smiley packs]
[Display]
[Replace only smileys surrounded by spaces]
[Scale smiley to text height]
@@ -55,6 +56,7 @@
[Smiley pack %s not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.]
[There were problems loading smiley pack (it should be corrected).\nSee network log for details.]
[Smiley #%u in file %s for smiley pack %s not found.]
+[ global smiley pack]
[Standard]
[Regular expression "%s" in smiley pack "%s" could produce "empty matches".]
[Regular expression "%s" in smiley pack "%s" malformed.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index f8f01049fb..e467888c82 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.53
+; Version: 0.1.1.0
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index ac426f0179..b12688af87 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -110,7 +110,7 @@
[Humidity]
[More...]
[Weather Protocol INI Setup]
-[Weather Protocol INI Setup\nInstall and load your weather ini file here]
+[Install and load your weather ini file here]
[Weather Protocol cannot find any weather INI file stored in your computer. To setup weather INI and add weather stations, please follow the steps:]
[Click here to download a weather ini file from Miranda file listing]
[Extract the weather ini file from archive to this directory]