summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-02-16 22:51:00 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-02-16 22:51:00 +0000
commit389c1cf437ac155563f4d832c2b04594854f520a (patch)
treef9bc01e7fcf6bbc2a6f5a40b8e33302c6375e708 /langpacks/english
parent2b014d61a528785fef5374627f8e841721e0e4e0 (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@12153 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt4
-rw-r--r--langpacks/english/Plugins/Tox.txt10
2 files changed, 6 insertions, 8 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 736fb227bd..0698172679 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1090,6 +1090,9 @@
[%s (locked)]
[Status menu]
[Main menu]
+;file \src\modules\clist\clistmod.cpp
+[Connecting]
+[Connecting (attempt %d)]
;file \src\modules\clist\clistsettings.cpp
[(Unknown contact)]
;file \src\modules\clist\clisttray.cpp
@@ -1360,7 +1363,6 @@
[User online]
[Group (open)]
[Group (closed)]
-[Connecting]
[User details]
[History]
[Down arrow]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index eadfd3bc50..b1c1eb0118 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -26,12 +26,10 @@
[Save password]
[Tox profile is encrypted. Enter the password to continue.]
[Add]
-[Change]
-[Remove]
[IPv4]
[IPv6]
[Port]
-[Client ID]
+[Public key]
;file \protocols\Tox\src\tox_events.cpp
[Network]
[Account]
@@ -40,12 +38,10 @@
[%s connection]
;file \protocols\Tox\src\tox_options.cpp
[Add node]
+[Change node]
[Enter IPv4]
[Error]
-[Enter IPv6]
-[Enter port]
-[Enter client ID]
-[Change node]
+[Enter public key]
[Are you sure?]
[Node deleting]
;file \protocols\Tox\src\tox_profile.cpp