summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-03-29 13:14:26 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-03-29 13:14:26 +0000
commit91a8274d913874078111da7ffa8e8550c1900f90 (patch)
tree3201daf9b22858194152067b74de6e9aa063724d /langpacks/english
parent937d432a276f48414135c37abdf4e4a07a530857 (diff)
- langpacks/english: updated
git-svn-id: http://svn.miranda-ng.org/main/trunk@4234 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/Langpack_english.txt27
-rw-r--r--langpacks/english/Plugins/BuddyPounce.txt3
-rw-r--r--langpacks/english/Plugins/CyrTranslit.txt2
-rw-r--r--langpacks/english/Plugins/IEView.txt1
-rw-r--r--langpacks/english/Plugins/MyDetails.txt19
-rw-r--r--langpacks/english/Plugins/RecentContacts.txt1
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt1
7 files changed, 30 insertions, 24 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 1c6d943c1b..e0041c528e 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -3151,13 +3151,12 @@
[Days]
[Show confirmation window? (0 to not Show)]
[Seconds to wait before sending]
-[Send a file]
[Pounce being sent to %s in %d seconds]
[Retry]
[Message successfully sent to %s]
[Message failed to send to %s]
;file \plugins\BuddyPounce\src\main.cpp
-[Plugins]
+[Message Sessions]
#muuid {c5ef53a8-80d4-4ce9-b341-ec90d3ec9156}
;============================================================
; File: ChangeKeyboardLayout.dll
@@ -5001,6 +5000,8 @@
; Authors: ValeraVi, Ivan Krechetov
;============================================================
[Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]
+;file \plugins\CyrTranslit\src\MirandaContact.cpp
+[&Transliterate (ФЫВА->FYVA)]
#muuid {a0138fc6-4c52-4501-af93-7d3e20bcae5b}
;============================================================
; File: DbChecker.dll
@@ -8082,7 +8083,6 @@
[URL sent]
[URL received]
;file \plugins\IEView\src\HTMLBuilder.cpp
-['(Unknown Contact)']
[(Unknown Contact)]
[ requested authorisation]
[ was added.]
@@ -11360,8 +11360,6 @@
[OK]
[Cancel]
[General]
-[Cycle through protocols every:]
-[seconds]
[...avatar]
[RTL]
[Align text to right]
@@ -11384,11 +11382,13 @@
[Round corners]
[Custom corner size:]
[Use free space (under avatar) to other texts]
-[Protocol]
-[Show protocol name]
-[Show protocol cycle button]
[Global On...]
[Frame Options]
+[Cycle through accounts every:]
+[seconds]
+[Account]
+[Show account name]
+[Show account cycle button]
[Set My Status Message for All Status]
[Status Message:]
[Status popup]
@@ -11407,10 +11407,10 @@
[Set My Nickname...]
[Set My Status Message...]
[Enable Listening To]
-[Show next protocol]
-[Show previous protocol]
-[Cycle through protocols]
-[Don't cycle through protocols]
+[Show next account]
+[Show previous account]
+[Cycle through accounts]
+[Don't cycle through accounts]
[Nick popup]
[Status message popup]
[Avatar popup]
@@ -11437,6 +11437,7 @@
[Next protocol]
[Set My Nickname for %s]
[Set My Status Message for %s]
+[Show next protocol]
[Contact List]
;file \plugins\MyDetails\src\options.cpp
#muuid {3503D584-6234-4BEF-A553-6C1B9CD471F2}
@@ -13360,6 +13361,7 @@
;file \plugins\RecentContacts\src\RecentContacts.cpp
[Main icon]
[Contact]
+[Toggle Ignore]
[Ignore Contact]
[Show Contact]
[Show Recent Contacts]
@@ -15130,6 +15132,7 @@
[StartupStatus]
[Your default profile will be changed]
;file \plugins\StatusPlugins\StartupStatus\profiles.cpp
+[Status profiles]
[There is a maximum of 6 menu items]
;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp
[Pressed toolbar icon]
diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index a8fe021a25..49fd01c1dc 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -69,10 +69,9 @@
[Days]
[Show confirmation window? (0 to not Show)]
[Seconds to wait before sending]
-[Send a file]
[Pounce being sent to %s in %d seconds]
[Retry]
[Message successfully sent to %s]
[Message failed to send to %s]
;file \plugins\BuddyPounce\src\main.cpp
-[Plugins]
+[Message Sessions]
diff --git a/langpacks/english/Plugins/CyrTranslit.txt b/langpacks/english/Plugins/CyrTranslit.txt
index a983c26885..cc7062b272 100644
--- a/langpacks/english/Plugins/CyrTranslit.txt
+++ b/langpacks/english/Plugins/CyrTranslit.txt
@@ -6,3 +6,5 @@
; Authors: ValeraVi, Ivan Krechetov
;============================================================
[Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]
+;file \plugins\CyrTranslit\src\MirandaContact.cpp
+[&Transliterate (ФЫВА->FYVA)]
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 260284f7c3..9909eadd40 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -44,7 +44,6 @@
[URL sent]
[URL received]
;file \plugins\IEView\src\HTMLBuilder.cpp
-['(Unknown Contact)']
[(Unknown Contact)]
[ requested authorisation]
[ was added.]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index e800869b41..2cee907fa6 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -12,8 +12,6 @@
[OK]
[Cancel]
[General]
-[Cycle through protocols every:]
-[seconds]
[...avatar]
[RTL]
[Align text to right]
@@ -36,11 +34,13 @@
[Round corners]
[Custom corner size:]
[Use free space (under avatar) to other texts]
-[Protocol]
-[Show protocol name]
-[Show protocol cycle button]
[Global On...]
[Frame Options]
+[Cycle through accounts every:]
+[seconds]
+[Account]
+[Show account name]
+[Show account cycle button]
[Set My Status Message for All Status]
[Status Message:]
[Status popup]
@@ -59,10 +59,10 @@
[Set My Nickname...]
[Set My Status Message...]
[Enable Listening To]
-[Show next protocol]
-[Show previous protocol]
-[Cycle through protocols]
-[Don't cycle through protocols]
+[Show next account]
+[Show previous account]
+[Cycle through accounts]
+[Don't cycle through accounts]
[Nick popup]
[Status message popup]
[Avatar popup]
@@ -89,5 +89,6 @@
[Next protocol]
[Set My Nickname for %s]
[Set My Status Message for %s]
+[Show next protocol]
[Contact List]
;file \plugins\MyDetails\src\options.cpp
diff --git a/langpacks/english/Plugins/RecentContacts.txt b/langpacks/english/Plugins/RecentContacts.txt
index cc35b9f80b..4b54dfc4dc 100644
--- a/langpacks/english/Plugins/RecentContacts.txt
+++ b/langpacks/english/Plugins/RecentContacts.txt
@@ -17,6 +17,7 @@
;file \plugins\RecentContacts\src\RecentContacts.cpp
[Main icon]
[Contact]
+[Toggle Ignore]
[Ignore Contact]
[Show Contact]
[Show Recent Contacts]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 7c1de5c4c8..f192bfcf6c 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -160,6 +160,7 @@
[StartupStatus]
[Your default profile will be changed]
;file \plugins\StatusPlugins\StartupStatus\profiles.cpp
+[Status profiles]
[There is a maximum of 6 menu items]
;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp
[Pressed toolbar icon]