diff options
author | Robert Pösel <robyer@seznam.cz> | 2014-08-07 09:21:34 +0000 |
---|---|---|
committer | Robert Pösel <robyer@seznam.cz> | 2014-08-07 09:21:34 +0000 |
commit | 69ff5146f5ac493beffb277d3d9f75ea7654b4b9 (patch) | |
tree | 4f6a11c6d47cfee2ba8d63491da4356e14e34d5a /langpacks/english | |
parent | 68ec1a43ea6342b69d62cf66aedf9f71dc3300f7 (diff) |
Langpack czech: update
Langpack english: update
git-svn-id: http://svn.miranda-ng.org/main/trunk@10109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r-- | langpacks/english/Plugins/Clist_modern.txt | 4 | ||||
-rw-r--r-- | langpacks/english/Plugins/CmdLine.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/Facebook.txt | 4 | ||||
-rw-r--r-- | langpacks/english/Plugins/ICQ.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/ListeningTo.txt | 10 | ||||
-rw-r--r-- | langpacks/english/Plugins/MRA.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/MenuEx.txt | 4 | ||||
-rw-r--r-- | langpacks/english/Plugins/NewXstatusNotify.txt | 4 | ||||
-rw-r--r-- | langpacks/english/Plugins/NotesReminders.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/Scriver.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/Skype.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/TabSRMM.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/Tipper.txt | 12 |
13 files changed, 26 insertions, 26 deletions
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index d9823e615f..0d2979849f 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -255,8 +255,8 @@ [Contact time]
[Show status if there is no status message]
[Show listening to if there is no status message]
-[XStatus has priority]
-[Use 'XStatus: XMessage']
+[xStatus has priority]
+[Use 'xStatus: xMessage']
[(Variables will be replaced)]
[Show third line]
[Draw smileys on third line]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 564e64e6d4..0687fae666 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -23,7 +23,7 @@ ;file \plugins\CmdLine\src\mimcmd_data.h
[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]
[Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]
-[Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<XStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
+[Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
[Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]
[Disables or enables sounds.\nUsage: sounds (disable | enable | toggle).\nThe command will either disable or enable sounds.]
[Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index e5d153081e..55a52887e0 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.7.0
+; Version: 0.2.8.0
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -42,7 +42,7 @@ [Map non-standard statuses to Invisible (instead of Online)]
[Allow posting statuses to my pages (may slow down login)]
[Use this server for opening links:]
-[Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)]
+[Show stickers as custom smileys (EXPERIMENTAL)]
[Use local time for received messages]
[Message sessions]
[Keep messages as unread on server (don't send "seen" info)]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index 9be59a40a4..1fc201a00d 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -826,7 +826,7 @@ ;file \protocols\IcqOscarJ\src\icq_xtraz.cpp
[Greeting card:]
;file \protocols\IcqOscarJ\src\init.cpp
-[ICQ XStatus]
+[ICQ xStatus]
;file \protocols\IcqOscarJ\src\log.cpp
[ICQ Warning]
[ICQ Error]
diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt index 3442afb64b..17213d51dc 100644 --- a/langpacks/english/Plugins/ListeningTo.txt +++ b/langpacks/english/Plugins/ListeningTo.txt @@ -14,11 +14,11 @@ [Video]
[Others]
[You also have to enable it per protocol in the main menu]
-[XStatus]
-[For protocols that don't support listening to but support XStatus:]
-[Set XStatus to Music and show listening info]
-[If other XStatus is not set, set XStatus to Music and show listening info]
-[If XStatus is Music, show listening info]
+[xStatus]
+[For protocols that don't support listening to but support xStatus:]
+[Set xStatus to Music and show listening info]
+[If other xStatus is not set, set xStatus to Music and show listening info]
+[If xStatus is Music, show listening info]
[Do nothing]
[Contacts]
[Apply template for info from contacts (overrides contacts template)]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index dca1eca739..1030b89f56 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -172,7 +172,7 @@ [Popups]
;file \protocols\MRA\src\MraProto.cpp
[%s connection]
-[Mail.ru Xstatus]
+[Mail.ru xStatus]
[Mail.ru extra info]
[E-mail address]
;file \protocols\MRA\src\Mra_functions.cpp
diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt index cd6154031e..aadc7fe687 100644 --- a/langpacks/english/Plugins/MenuEx.txt +++ b/langpacks/english/Plugins/MenuEx.txt @@ -31,8 +31,8 @@ [Hide contact on 'Ignore all']
;file \plugins\MenuItemEx\src\main.cpp
[Status message]
-[XStatus title]
-[XStatus message]
+[xStatus title]
+[xStatus message]
[Listening to]
[Activity title]
[Activity text]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt index 0445872df9..b5fdeb45fa 100644 --- a/langpacks/english/Plugins/NewXstatusNotify.txt +++ b/langpacks/english/Plugins/NewXstatusNotify.txt @@ -210,7 +210,7 @@ ;file \plugins\NewXstatusNotify\src\xstatus.cpp
[Mood]
[Activity]
-[XStatus]
+[xStatus]
[<no title>]
[%s changed %s]
;file \plugins\NewXstatusNotify\src\xstatus.h
@@ -225,5 +225,5 @@ [has %n @ %t: %m]
[changed status message @ %n]
[is %s and has status message @ %n]
-[These variables are available:\r\n\r\n%n\textra status name (Xstatus, Mood, Activity)\r\n%t\textra status title\r\n%m\textra status message\r\n%c\tcustom nickname\r\n\\n\tline break\r\n\\t\ttab stop]
+[These variables are available:\r\n\r\n%n\textra status name (xStatus, Mood, Activity)\r\n%t\textra status title\r\n%m\textra status message\r\n%c\tcustom nickname\r\n\\n\tline break\r\n\\t\ttab stop]
[These variables are available:\r\n\r\n%n\tnew status message\r\n%o\told status message\r\n%c\tcustom nickname\r\n%s\tcurrent status\r\n\\n\tline break\r\n\\t\ttab stop]
diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt index 82507585f2..61d16a0058 100644 --- a/langpacks/english/Plugins/NotesReminders.txt +++ b/langpacks/english/Plugins/NotesReminders.txt @@ -115,7 +115,7 @@ [Vie&w Notes]
[&Delete All Notes]
[&Bring All to Front]
-[Miranda could not load the Note & Reminders plugin, 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.]
+[Miranda could not load the Notes & Reminders plugin, riched20.dll is missing. If you are using WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]
;file \plugins\NotesAndReminders\src\notes.cpp
[Black]
[Maroon]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index c3a27cd0c9..2ac497823f 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -320,7 +320,7 @@ [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.]
+[Miranda could not load the built-in message module, riched20.dll is missing. If you are using WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]
[Instant messages]
[Incoming (Focused Window)]
[Incoming (Unfocused Window)]
diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt index dbaa2c34c5..c02d644c2a 100644 --- a/langpacks/english/Plugins/Skype.txt +++ b/langpacks/english/Plugins/Skype.txt @@ -84,7 +84,7 @@ [HTTPS proxy authentication failed]
[SOCKS proxy authentication failed]
[P2P connection failed]
-[SERVER_CONNECT_FAILED]
+[Connection to server failed. SkypeKit has been deprecated by Microsoft.]
[Server is overloaded]
[SkypeKit database already in use]
[Invalid Skype name]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index a2446c6b8a..ef38e626e0 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -530,6 +530,7 @@ [Unknown module or contact]
;file \plugins\TabSRMM\src\generic_msghandlers.cpp
[Rich Edit file]
+[No status message]
[Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0 and \\b1 send to multiple contacts\\b0 features depend on it.\n\nYou must enable it under \\b1Options->Message Sessions->Advanced tweaks\\b0. Changing this option requires a restart.]
[You cannot edit user notes when there are unsent messages]
[Version]
@@ -548,7 +549,6 @@ [Incoming (New Session)]
[Outgoing]
[Message send error]
-[No status message]
[Other]
[TabSRMM: Typing]
[TabSRMM session list]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt index e55efb9936..8533f048b4 100644 --- a/langpacks/english/Plugins/Tipper.txt +++ b/langpacks/english/Plugins/Tipper.txt @@ -65,7 +65,7 @@ [Show tooltip after all content is ready (avatar && status message)]
[Retrieve new status message]
[Disable in invisible status]
-[Retrieve XStatus details if auto-retrieve is disabled]
+[Retrieve xStatus details if auto-retrieve is disabled]
[Status bar and tray tooltip]
[Limit status messages in status bar and tray tooltips to:]
[characters]
@@ -158,7 +158,7 @@ [Status:]
[Status message:]
[Mood:]
-[XStatus:]
+[xStatus:]
[Activity:]
[Listening to:]
[Copy all items with labels]
@@ -195,10 +195,10 @@ [Number of msg [OUT]:]
[Contact time]
[Time:]
-[XStatus title]
-[XStatus title:]
-[XStatus text]
-[XStatus text:]
+[xStatus title]
+[xStatus title:]
+[xStatus text]
+[xStatus text:]
[[jabber.dll] Activity title]
[Activity title:]
[[jabber.dll] Activity text]
|