summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt8
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt1
-rw-r--r--langpacks/english/Plugins/IRC.txt2
-rw-r--r--langpacks/english/Plugins/New_GPG.txt2
-rw-r--r--langpacks/english/Plugins/SecureIM.txt1
5 files changed, 8 insertions, 6 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index d130b2d20c..470da1ccd9 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -20,12 +20,13 @@
[%s message for %s]
[&Cancel]
[Retrieving %s message...]
-[Status messages]
[Do not reply to requests for this message]
[Do not pop up dialog asking for new message]
[By default, use the same message as last time]
[By default, use this message:]
[Use %time% for the current time, %date% for the current date]
+[Status messages]
+[Reset]
[Change %s message]
[Closing in %d]
;file \src\core\stdclist\res\resource.rc
@@ -409,7 +410,6 @@
[Copyright:]
[Please restart Miranda NG for your changes to take effect.]
[Fonts and colors]
-[Reset]
[Export...]
[Color/background]
[Text effect]
@@ -1255,6 +1255,9 @@
[Frame menu]
;file \src\mir_app\src\menu_groups.cpp
[Group menu]
+[Hide offline users out here]
+[Disable groups]
+[Exit]
[Subgroup menu]
;file \src\mir_app\src\menu_options.cpp
[New submenu]
@@ -1452,7 +1455,6 @@
[Unicode plugin]
[ANSI plugin]
[Show/Hide]
-[Exit]
[Join chat]
[Leave chat]
[Move to group]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index ccbb1b40d2..7a18261d93 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -358,6 +358,7 @@
[Contact rate: medium]
[Contact rate: high]
[Show even if offline]
+[Contact rate]
;file \plugins\Clist_modern\src\modern_clistopts.cpp
[Avatar]
[Icon]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index b81cd40ff5..2b133cb04b 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -18,7 +18,6 @@
[Alternative nick]
[Full name (e-mail)]
[User ID (Ident)]
-[Ident]
[Enable]
[System]
[Port]
@@ -38,6 +37,7 @@
[Check every (s):]
[Update statuses in channel nick list]
[Don't check if more than (users):]
+[Ident]
[User information]
[Ping]
[Version]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 89d8e1ad43..4e6f402d66 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -81,7 +81,7 @@
[Open:]
[Close:]
[Strip all tags in outgoing messages]
-[Turn on presence signing (Jabber) (required by XEP-0027)]
+[Turn on Jabber presence signing (required by XEP-0027)]
[Export keys]
[Import keys]
[Send error messages]
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 07792fcf55..5caae15ded 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -13,7 +13,6 @@
[Always show status icons in contact list]
[Context Menu only for "Miranda" clients]
[Status in Context Menu]
-[Disable encryption for game plugins]
[Always secured if possible]
[Not secured for NotOnList]
[Auto accept RSA key (NOT SECURED)]