From 9679609450b807b3c61cdb1baf93ac82fb1a906e Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Fri, 17 Jan 2014 23:27:35 +0000
Subject: - langpacks/english: update; - langpacks/russian: update;

git-svn-id: http://svn.miranda-ng.org/main/trunk@7705 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/=CORE=.txt | 129 +++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 65 deletions(-)

(limited to 'langpacks/english/=CORE=.txt')

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 3b437e4788..44aeb05712 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -657,41 +657,13 @@
 [Join chat]
 [Open chat window]
 ;file \src\core\stdchat\src\colorchooser.cpp
-;file \src\core\stdchat\src\log.cpp
-[%s has joined]
-[You have joined %s]
-[%s has left]
-[%s has disconnected]
-[%s is now known as %s]
-[You are now known as %s]
-[%s kicked %s]
-[Notice from %s: ]
-[The topic is '%s%s']
-[ (set by %s on %s)]
-[ (set by %s)]
-[%s enables '%s' status for %s]
-[%s disables '%s' status for %s]
-[<invalid>]
+;file \src\core\stdchat\src\main.cpp
+[Chat module]
+[Message background]
+[User list background]
+[User list lines]
+[User list background (selected)]
 ;file \src\core\stdchat\src\options.cpp
-[Others nicknames]
-[Your nickname]
-[User has joined]
-[User has left]
-[User has disconnected]
-[User kicked ...]
-[User is now known as ...]
-[Notice from user]
-[Incoming message]
-[Outgoing message]
-[The topic is ...]
-[Information messages]
-[User enables status for ...]
-[User disables status for ...]
-[Action message]
-[Highlighted message]
-[Message typing area]
-[User list members (online)]
-[User list members (away)]
 [Use a tabbed interface]
 [Close tab on double click]
 [Restore previously open tabs when showing the window]
@@ -770,11 +742,6 @@
 [Show popup for name changes]
 [Show popup for information messages]
 [Show popup for status changes]
-[Chat module]
-[Message background]
-[User list background]
-[User list lines]
-[User list background (selected)]
 [Window icon]
 [Bold]
 [Italics]
@@ -823,33 +790,7 @@
 [Chat log]
 [Chat]
 [Popups]
-[Message is highlighted]
-[User has performed an action]
-[User has kicked some other user]
-[User's status was changed]
-[User has changed name]
-[User has sent a notice]
-[The topic has been changed]
-;file \src\core\stdchat\src\services.cpp
-[&Join]
 ;file \src\core\stdchat\src\tools.cpp
-[%s wants your attention in %s]
-[%s speaks in %s]
-[%s has joined %s]
-[%s has left %s]
-[%s kicked %s from %s]
-[Notice from %s]
-[Topic change in %s]
-[Information in %s]
-[%s enables '%s' status for %s in %s]
-[%s disables '%s' status for %s in %s]
-[%s says: %s]
-[%s has left (%s)]
-[%s has disconnected (%s)]
-[%s kicked %s (%s)]
-[Notice from %s: %s]
-[The topic is '%s']
-[The topic is '%s' (set by %s)]
 [Look up '%s':]
 [No word to look up]
 [&Message %s]
@@ -1006,6 +947,8 @@
 [An unknown error has occurred.]
 ;file \src\core\stduihist\history.cpp
 [Invalid message]
+[Outgoing message]
+[Incoming message]
 [Outgoing URL]
 [Incoming URL]
 [Outgoing file]
@@ -1051,10 +994,66 @@
 [Add contact]
 [Please authorize my request and add me to your contact list.]
 ;file \src\modules\chat\chat_opts.cpp
+[Others nicknames]
+[Your nickname]
+[User has joined]
+[User has left]
+[User has disconnected]
+[User kicked ...]
+[User is now known as ...]
+[Notice from user]
+[The topic is ...]
+[Information messages]
+[User enables status for ...]
+[User disables status for ...]
+[Action message]
+[Highlighted message]
+[Message typing area]
+[User list members (online)]
+[User list members (away)]
+[Message is highlighted]
+[User has performed an action]
+[User has kicked some other user]
+[User's status was changed]
+[User has changed name]
+[User has sent a notice]
+[The topic has been changed]
 ;file \src\modules\chat\chat_svc.cpp
+[&Join]
 ;file \src\modules\chat\clist.cpp
 ;file \src\modules\chat\log.cpp
+[%s has joined]
+[You have joined %s]
+[%s has left]
+[%s has disconnected]
+[%s is now known as %s]
+[You are now known as %s]
+[%s kicked %s]
+[Notice from %s: ]
+[The topic is '%s%s']
+[ (set by %s on %s)]
+[ (set by %s)]
+[%s enables '%s' status for %s]
+[%s disables '%s' status for %s]
+[<invalid>]
 ;file \src\modules\chat\tools.cpp
+[%s wants your attention in %s]
+[%s speaks in %s]
+[%s has joined %s]
+[%s has left %s]
+[%s kicked %s from %s]
+[Notice from %s]
+[Topic change in %s]
+[Information in %s]
+[%s enables '%s' status for %s in %s]
+[%s disables '%s' status for %s in %s]
+[%s says: %s]
+[%s has left (%s)]
+[%s has disconnected (%s)]
+[%s kicked %s (%s)]
+[Notice from %s: %s]
+[The topic is '%s']
+[The topic is '%s' (set by %s)]
 ;file \src\modules\clist\clcitems.cpp
 ;file \src\modules\clist\clistmenus.cpp
 [Custom status]
-- 
cgit v1.2.3