diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-08-05 09:04:18 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-08-05 09:04:18 +0000 |
| commit | 56adea4112a4106dd14ccd56c9759566d2739e5d (patch) | |
| tree | 8a9ad2c07efd36d0411df17b997808ad153c5eed /langpacks | |
| parent | 02289be12cfa5cffc80fdba75c155d0a82fb83f5 (diff) | |
- langpacks/english: updated
git-svn-id: http://svn.miranda-ng.org/main/trunk@5585 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks')
| -rw-r--r-- | langpacks/english/=CORE=.txt | 3 | ||||
| -rw-r--r-- | langpacks/english/Langpack_english.txt | 10 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Facebook.txt | 6 | ||||
| -rw-r--r-- | langpacks/english/Plugins/UInfoEx.txt | 1 |
4 files changed, 18 insertions, 2 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 4fa8079fd1..bd851c4d92 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -995,12 +995,13 @@ [Message from %s]
[%s is typing a message]
[Typing Notification]
-[Miranda could not load the built-in message module, riched20.dll is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]
[Instant messages]
[Incoming (Focused Window)]
[Incoming (Unfocused Window)]
[Incoming (New Session)]
[Message send error]
+[Contact started typing]
+[Contact stopped typing]
;file \src\core\stdmsg\src\msgtimedout.cpp
[An unknown error has occured.]
;file \src\core\stduihist\history.cpp
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt index 5ec5b37366..5ac505f730 100644 --- a/langpacks/english/Langpack_english.txt +++ b/langpacks/english/Langpack_english.txt @@ -996,12 +996,13 @@ [Message from %s]
[%s is typing a message]
[Typing Notification]
-[Miranda could not load the built-in message module, riched20.dll is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]
[Instant messages]
[Incoming (Focused Window)]
[Incoming (Unfocused Window)]
[Incoming (New Session)]
[Message send error]
+[Contact started typing]
+[Contact stopped typing]
;file \src\core\stdmsg\src\msgtimedout.cpp
[An unknown error has occured.]
;file \src\core\stduihist\history.cpp
@@ -5750,6 +5751,12 @@ [Sample newsfeed]
[Sample notification]
;file \protocols\FacebookRM\src\json.cpp
+[a sticker]
+[files]
+[a file]
+[photos]
+[a photo]
+[User sent you %s:]
[Message read: %s]
;file \protocols\FacebookRM\src\messages.cpp
[You cannot send messages when you are offline.]
@@ -18407,6 +18414,7 @@ [Anniversary later]
[Warning: Your current IconPack's version differs from the one UserInfoEx is designed for.\nSome icons may not be displayed correctly]
[Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]
+[Main]
;file \plugins\UserInfoEx\src\mir_icolib.h
[UserInfoEx]
;file \plugins\UserInfoEx\src\mir_menuitems.cpp
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index e72bd97d35..67870e9c7f 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -92,6 +92,12 @@ [Sample newsfeed]
[Sample notification]
;file \protocols\FacebookRM\src\json.cpp
+[a sticker]
+[files]
+[a file]
+[photos]
+[a photo]
+[User sent you %s:]
[Message read: %s]
;file \protocols\FacebookRM\src\messages.cpp
[You cannot send messages when you are offline.]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index 9987ecf08e..5a248f306e 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -312,6 +312,7 @@ [Anniversary later]
[Warning: Your current IconPack's version differs from the one UserInfoEx is designed for.\nSome icons may not be displayed correctly]
[Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]
+[Main]
;file \plugins\UserInfoEx\src\mir_icolib.h
[UserInfoEx]
;file \plugins\UserInfoEx\src\mir_menuitems.cpp
|