diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-02-23 21:24:22 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-02-23 21:24:22 +0000 |
| commit | ae599b695aa065f0a47b7eec1059ce1eef125ef4 (patch) | |
| tree | 9127d5e4636e6234220c37bc82587026504a8e81 /langpacks/english | |
| parent | 2a8b6d62bf9ec0fea791ef53f335284ce94b7325 (diff) | |
- langpacks/english: update;
- langpacks/russian: update;
git-svn-id: http://svn.miranda-ng.org/main/trunk@12257 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
| -rw-r--r-- | langpacks/english/=CORE=.txt | 17 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Facebook.txt | 4 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Jabber.txt | 1 | ||||
| -rw-r--r-- | langpacks/english/Plugins/TabSRMM.txt | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 0698172679..40934ea63f 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -162,20 +162,6 @@ [Text effect]
[Text color]
[Choose font]
-[Font]
-[&Font:]
-[Font st&yle:]
-[\nStyles and effects are disabled for this font.]
-[&Size:]
-[Effects]
-[Stri&keout]
-[&Underline]
-[&Color:]
-[Sample]
-[AaBbYyZz]
-[Sc&ript:]
-[&Apply]
-[&Help]
[Menu objects]
[Menu items]
[Protocol menus]
@@ -239,6 +225,7 @@ [Move &up]
[Move &down]
[Send &offline]
+[&Apply]
[Context menu]
[Use contact's unique ID]
[Use contact's display name]
@@ -313,6 +300,7 @@ [&Emoticons]
[&Bold]
[&Italic]
+[&Underline]
[&Color]
[&Background color]
[&History]
@@ -920,6 +908,7 @@ ;file \src\core\stdhelp\src\about.cpp
[< Copyright]
;file \src\core\stdhelp\src\help.cpp
+[&Help]
[&About...]
[&Support]
[&Miranda NG homepage]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index ed21db27bf..f5e17990af 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.10.3
+; Version: 0.2.10.4
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -33,6 +33,7 @@ [Other events]
[Client notifications]
[Friendship notifications]
+[Ticker feeds]
[Use this server for opening links:]
[Use balloon notifications in system tray instead of popups]
[Use logging notifications into special chatroom]
@@ -116,6 +117,7 @@ [Sample newsfeed]
[Sample notification]
[Sample friendship]
+[Sample ticker]
;file \protocols\FacebookRM\src\json.cpp
[a sticker]
[files]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 056fa25d19..1dfd6555af 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -1038,7 +1038,6 @@ [sent unknown presence type]
[Nick:]
[Status:]
-[Status text:]
[Real JID:]
;file \protocols\JabberG\src\jabber_thread.cpp
[Enter password for %s]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 1eb6d1af94..c721114562 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -2,7 +2,7 @@ ;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.4.0.8
+; Version: 3.4.0.9
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
|