From be0f676c577a79d71e91b6da864659809df1c5a9 Mon Sep 17 00:00:00 2001
From: Konstantin Nikulin <apollo2k4@narod.ru>
Date: Sun, 9 Aug 2015 16:00:27 +0000
Subject: langpack/english & langpacks/russian skypeweb updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@14885 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/=CORE=.txt           | 8 +-------
 langpacks/english/Plugins/Jabber.txt   | 2 --
 langpacks/english/Plugins/SkypeWeb.txt | 8 ++++++--
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'langpacks/english')

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 707b1e57f7..ec2c647f95 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -974,13 +974,6 @@
 [Are you sure you want to delete this history item?]
 [Delete history]
 [View &history]
-;file \src\core\stdurl\url.cpp
-[URL from %s]
-[Web page address (&URL)]
-[URL]
-;file \src\core\stdurl\urldialogs.cpp
-[Send URL to]
-[Send timed out]
 ;file \src\core\stduserinfo\src\contactinfo.cpp
 [Edit E-Mail address]
 [Edit phone number]
@@ -1383,6 +1376,7 @@
 ;file \src\mir_app\src\skin2opts.cpp
 [Icon sets]
 ;file \src\mir_app\src\skinicons.cpp
+[URL]
 [User online]
 [Group (open)]
 [Group (closed)]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index f50aa65f05..09b6e023bd 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -706,8 +706,6 @@
 [Zulu]
 [These changes will take effect the next time you connect to the Jabber network.]
 [Jabber Protocol Option]
-[Confirm password]
-[Passwords do not match.]
 [This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?]
 [Account removal warning]
 [You can change your password only when you are online]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 5ee8462c1b..28309bfe15 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -22,6 +22,7 @@
 [Always notify as unread for all incoming message]
 [Place:]
 [Use hostname]
+[Use BB-codes]
 [Enter password]
 [Save password]
 [Enter the password to continue.]
@@ -52,8 +53,10 @@
 [Incoming call]
 ;file \protocols\SkypeWeb\src\skype_events.cpp
 [Invalid data!]
-[Original message:\n\t%s\n]
-[Edited at %s:\n\t%s\n]
+[[b]Original message:[/b]\n%s\n]
+[Original message:\n%s\n]
+[[b]Edited at %s:[/b]\n%s\n]
+[Edited at %s:\n%s\n]
 [Call]
 [Call missed]
 [Call ended (%s)]
@@ -84,6 +87,7 @@
 [Create new chat]
 ;file \protocols\SkypeWeb\src\skype_messages.cpp
 [Unknown error!]
+[Network error!]
 ;file \protocols\SkypeWeb\src\skype_mslogin.cpp
 [Enter confirmation code]
 ;file \protocols\SkypeWeb\src\skype_network.cpp
-- 
cgit v1.2.3