From b0563aa067e81f3069d2718bbf5e5d3853bbb058 Mon Sep 17 00:00:00 2001
From: Konstantin Nikulin <apollo2k4@narod.ru>
Date: Sun, 31 Jul 2016 09:29:53 +0000
Subject: langpack/english & langpack/russian update

git-svn-id: http://svn.miranda-ng.org/main/trunk@17148 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/Plugins/CSList.txt         |  1 -
 langpacks/english/Plugins/Facebook.txt       | 10 +++++-----
 langpacks/english/Plugins/GG.txt             |  2 +-
 langpacks/english/Plugins/NotifyAnything.txt |  1 -
 langpacks/english/Plugins/UInfoEx.txt        |  5 +++++
 langpacks/english/Plugins/WhenWasIt.txt      |  3 +--
 6 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'langpacks/english')

diff --git a/langpacks/english/Plugins/CSList.txt b/langpacks/english/Plugins/CSList.txt
index 35d52df1e1..18978119a2 100644
--- a/langpacks/english/Plugins/CSList.txt
+++ b/langpacks/english/Plugins/CSList.txt
@@ -18,7 +18,6 @@
 [Remember last window position]
 [Note: Menu items are only visible when at least one account is properly set. Check if you have at least one account with UIN filled in.]
 ;file \plugins\CSList\src\cslist.cpp
-[Status]
 [Add new item]
 [Add]
 [Modify item]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7da3b590e2..5bebfcb6cd 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -63,9 +63,10 @@
 ;file \protocols\FacebookRM\src\captcha.cpp
 [Enter the text you see]
 ;file \protocols\FacebookRM\src\chat.cpp
+[Former]
 [Myself]
-[User]
 [Friend]
+[User]
 [&Invite user...]
 [&Leave chat session]
 [User &details]
@@ -158,14 +159,14 @@
 [Loading wall posts...]
 [Loading friendship requests...]
 [Loading notifications...]
-[Loading what happened on this day...]
+[Loading memories...]
 [Do you want to cancel your friendship with '%s'?]
 [Client errors]
 [Wall posts]
 [Other events]
 [Friendship events]
 [Real-time friends activity]
-["On this day" posts]
+[Memories]
 [Visit profile]
 [Visit notifications]
 [Show 'Share status' window]
@@ -174,7 +175,6 @@
 [Other event]
 [Friendship event]
 [Ticker event]
-["On this day" event]
 [Message read: %s by %s]
 [Message read: %s]
 ;file \protocols\FacebookRM\src\theme.cpp
@@ -202,5 +202,5 @@
 [Services...]
 [Check friendship requests]
 [Check newsfeeds]
-[Check "On this day" posts]
+[Check memories]
 [Check notifications]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 75290ca881..c0827e199b 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -175,8 +175,8 @@
 [&Image]
 [Image files (*.bmp,*.gif,*.jpeg,*.jpg,*.png)]
 [Image cannot be written to disk.]
-[Delete image from the list]
 [Save image to disk]
+[Delete image from the list]
 [Image from %s]
 [Image for %s]
 [Select picture to send]
diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index 1cb5004f7c..9f3acee544 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -29,4 +29,3 @@
 [Invalid port number]
 [NotifyAnything]
 [Plugins]
-;file \plugins\NotifyAnything\src\stdafx.h
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 02a3c72e0d..c03205be9e 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -311,6 +311,11 @@
 [Main]
 ;file \plugins\UserInfoEx\src\mir_icolib.h
 [Extended user info]
+[Extended user info/Zodiacs]
+[Extended user info/Dialogs]
+[Extended user info/Buttons]
+[Extended user info/Treeview]
+[Extended user info/Reminder]
 ;file \plugins\UserInfoEx\src\mir_menuitems.cpp
 [Export/import contact]
 [User &details]
diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index ffc582960d..2399210f9d 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -117,13 +117,12 @@
 [Done exporting birthdays]
 [Could not open file to import birthdays]
 [Error]
+[Could not find UID '%s [%S]' in current database, skipping]
 [Warning]
 [Could not open file to export birthdays]
 [Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n]
 [Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n]
 [This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n]
-;file \plugins\WhenWasIt\src\services.h
-[Could not find UID '%s [%S]' in current database, skipping]
 ;file \plugins\WhenWasIt\src\WhenWasIt.cpp
 [Birthdays (When Was It)]
 [Add/change user &birthday]
-- 
cgit v1.2.3