langpacks: update according to [7492]

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

5 files changed, 19 insertions, 9 deletions

diff --git a/langpacks/ukrainian/Plugins/Folders.txt b/langpacks/ukrainian/Plugins/Folders.txt
index ccb116d3b0..58835edb8a 100644
--- a/langpacks/ukrainian/Plugins/Folders.txt
+++ b/langpacks/ukrainian/Plugins/Folders.txt
@@ -49,7 +49,7 @@
 Змінні оточення

 [The plugin can also expand environment variables; the variables are specified like in any other]

 Також плагін дозволяє використовувати змінні оточення. Вони задаються так само, як і в будь-якій

-[program that can use environment variables, i.e. %<env variable>%.]

+[program that can use environment variables, i.e., %<env variable>%.]

 програмі, яка може їх використовувати. Наприклад %<env variable>%.

 [Note: Environment variables are expanded before any Miranda variables. So if you have, for]

 Примітка. Змінні оточення обробляються перед будь-якими змінними Miranda NG. Якщо у вас,

diff --git a/langpacks/ukrainian/Plugins/ICQ.txt b/langpacks/ukrainian/Plugins/ICQ.txt
index 9b259bc4d5..b567206f65 100644
--- a/langpacks/ukrainian/Plugins/ICQ.txt
+++ b/langpacks/ukrainian/Plugins/ICQ.txt
@@ -101,7 +101,7 @@
 Обмін повідомленнями між користувачами

 [Enable peer-to-peer message connections]

 Прямі з'єднання клієнт-клієнт

-[Passive mode, i.e. do not initiate new connections]

+[Passive mode (i.e., do not initiate new connections)]

 Пасивний режим (не ініціювати підключення)

 [Extra Features]

 Додаткові можливості

diff --git a/langpacks/ukrainian/Plugins/Jabber.txt b/langpacks/ukrainian/Plugins/Jabber.txt
index c1e4aae83d..c0b1683bc6 100644
--- a/langpacks/ukrainian/Plugins/Jabber.txt
+++ b/langpacks/ukrainian/Plugins/Jabber.txt
@@ -126,6 +126,14 @@ TLS
 відправив присутність з помилкою

 [sent unknown presence type]

 відправив невідомий тип присутності

+[Nick:]

+Нік:

+[Status:]

+Статус:

+[Status text:]

+Текст статусу:

+[Real JID:]

+Реальний JID:

 [Keep connection alive]

 Підтримувати з'єднання

 ; Чат-кімнати

@@ -465,8 +473,6 @@ Jabber Ad-Hoc команди на %s
 Статус:\t

 [Removing %s?]

 Видалити %s?

-[Real JID:]

-Реальний JID:

 ; Значки

 [Send note]

 Надіслати нотатку

@@ -760,8 +766,6 @@ Unicode зборка
 Видалити

 [Privacy lists are not saved, discard any changes and exit?]

 Списки приватності не збережені, скасувати зміни і вийти?

-[No list selected]

-Список не вибрано

 [Privacy rule]

 Правила приватності

 [Warning: privacy lists were changed on server.]

@@ -790,8 +794,6 @@ Unicode зборка
 Вихід. присутність

 [following stanza types:]

 Наступні типи подій:

-[Can't remove active or default list]

-Неможливо видалити активний або стандартний список

 [If group is ']

 Якщо група '

 [If Jabber ID is ']

@@ -1402,6 +1404,12 @@ Jabber помилка
 Збережіть список

 [Please save list before you make it the default list]

 Збережіть список перед тим як зробити його списком за замовчуванням.

+[No list selected]

+Список не вибрано

+[Can't remove active or default list]

+Неможливо видалити активний або стандартний список

+[Sorry]

+Вибачте

 [Unable to save list because you are currently offline.]

 Неможливо зберегти список, тому що ви не в мережі.

 [No compatible file transfer machanism exist]

diff --git a/langpacks/ukrainian/Untranslated/Jabber.txt b/langpacks/ukrainian/Untranslated/Jabber.txt
index a5ca2609cd..3736ec92ca 100644
--- a/langpacks/ukrainian/Untranslated/Jabber.txt
+++ b/langpacks/ukrainian/Untranslated/Jabber.txt
@@ -240,11 +240,13 @@
 [Privacy lists successfully saved]

 [Error occurred while setting active list]

 [Error occurred while setting default list]

+[Allow]

 [Move rule up]

 [Move rule down]

 [Presence (in)]

 [Presence (out)]

 [Query]

+[List has no rules, empty lists will be deleted then changes applied]

 [allow ]

 [deny ]

 [Else ]

diff --git a/langpacks/ukrainian/Untranslated/NimContact.txt b/langpacks/ukrainian/Untranslated/NimContact.txt
index ed9645298f..03cbe3f394 100644
--- a/langpacks/ukrainian/Untranslated/NimContact.txt
+++ b/langpacks/ukrainian/Untranslated/NimContact.txt
@@ -15,7 +15,7 @@
 [OK]

 [Copy / Export contact]

 [Timer intervals... Non-IM Contact Protocol timer is %d seconds]

-[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line i.e. lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ) i.e. line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

+[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

 [Contacts Display Info]

 [Copy Contact]

 [Edit Non-IM Contact "%s"]