- langpacks/english: update;

- langpacks/russian: update;






git-svn-id: http://svn.miranda-ng.org/main/trunk@9314 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 30 insertions, 34 deletions

diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 92efe2d725..864fd616fe 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -33,7 +33,7 @@
 [Use transparency]

 [opacity:]

 [Opaque popups under cursor]

-[Slide Popup]

+[Slide popup]

 [Effect:]

 [Time (in):]

 [ms]

@@ -46,29 +46,30 @@
 [Download more skins]

 [Popup History]

 [Desktop]

-[Popup Area]

+[Popup area]

 [pixel(s)]

 [Distance between popups]

 [Configure popup area]

 [Close]

 [General]

 [Enable popup actions]

-[Popup Actions are those tiny buttons below notification text.]

-[Common Actions]

+[Popup actions are those tiny buttons below notification text.]

+[Common actions]

 [Please choose in what cases default actions should be added:]

 [Add info && menu for IM contacts only]

 [Add default actions for contacts only]

 [Don't close popups on default actions]

+[Size and position]

 [Use large icons]

 [Popup actions will be displayed as:]

 [Icons and labels below text]

 [Icons on the left]

 [Icons aligned to the right]

-[Show Actions: (requires apply)]

-[Mouse Actions Overwrite]

-[Left Button]

-[Middle Button]

-[Right Button]

+[Show actions: (requires apply)]

+[Mouse actions overwrite]

+[Left button]

+[Middle button]

+[Right button]

 [Notifications]

 [General options]

 [Enable this notification]

@@ -77,7 +78,7 @@
 [Right click action:]

 [Disable when global status is...]

 [Disable when relevant protocol's status is...]

-[Colors can be configured in\r\nCustomize > Fonts && Colors]

+[Colors can be configured in\r\nCustomize > Fonts and colors]

 [More...]

 [Disable if message window is open]

 [Sec]

@@ -88,7 +89,7 @@
 [Ignore fullscreen]

 [Never show]

 [Show default]

-[Default Timeout]

+[Default timeout]

 [Infinite popup delay]

 [Popup delay:]

 [seconds]

@@ -98,13 +99,13 @@
 [Maximum width]

 [Position:]

 [Layout:]

-[Reorder Popups]

+[Reorder popups]

 [Disable when:]

 [Always (has priority)]

 [Fullscreen mode]

 [Debug]

 ;file \plugins\Popup\src\actions.cpp

-[no overwrite]

+[No overwrite]

 [Send message]

 [Quick reply]

 [User details]

@@ -128,12 +129,12 @@
 [Title]

 [Clock]

 [Text]

-[Hovered Action]

+[Hovered action]

 [Background]

 [Border]

 [Sidebar]

 [Title underline]

-[Avatar Border]

+[Avatar border]

 ;file \plugins\Popup\src\history.cpp

 [Popup History is disabled]

 [Popup History message]

@@ -143,19 +144,14 @@
 [With "favorite" overlay]

 [With "fullscreen" overlay]

 [Refresh skin list]

-[Popup Placement]

+[Popup placement]

 [Cancel]

-[Popup Group]

-[Favorite Contact]

-[Show in Fullscreen]

-[Blocked Contact]

-[Quick Reply]

-[Pin Popup]

-[Pinned Popup]

-[Send Message]

-[Contact Menu]

-[Add Contact Permanently]

-[Dismiss Popup]

+[Popup group]

+[Favorite contact]

+[Show in fullscreen]

+[Blocked contact]

+[Pinned popup]

+[Add contact permanently]

 ;file \plugins\Popup\src\main.cpp

 [Classes]

 [Actions]

@@ -184,16 +180,16 @@
 [Out to lunch]

 [On the phone]

 [Width]

-[upper left corner]

-[lower left corner]

-[lower right corner]

-[upper right corner]

-[horizontal]

-[vertical]

+[Upper left corner]

+[Lower left corner]

+[Lower right corner]

+[Upper right corner]

+[Horizontal]

+[Vertical]

 [Global Status]

 [Protocol Status]

 [You cannot specify a value lower than %d and higher than %d.]

-['Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]

+['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]

 [Popup Plus Warning]

 ;file \plugins\Popup\src\opt_skins.cpp

 [Failed to register %s class.]