diff po/ru.po @ 13545:cfc2f7fcb3dd

[gaim-migrate @ 15922] Way more changes that I initially thought I was going to make. I apologize for the commit message spam. These changes bring a lot of consistency to our capitalization and punctuation, especially of words like "e-mail". For reference, I've used these rules (after discussing in #gaim): e-mail, a case of two words joined: "e-mail" - in the middle of a sentence caps context "E-mail" - start of text in a sentence caps context "E-Mail" - in a header (title) caps context re-enable, a single word, would be: "re-enable", "Re-enable", and "Re-enable" (respectively) The reason this changeset exploded is that, as I went through and verified these changes, I realized we were using improper capitalization (e.g. header instead of sentence) in a number of dialogs. I fixed a number of these cases before, and this corrects another pile. This looks like I've made a LOT of work for the translators, but the impact is significantly mitigated by three factors: 1) Many of these changes use strings that already exist, or change one string in many places. 2) I've used sed to correct the .po files where possible. 3) The actual changes are extremely trivial. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 21 Mar 2006 04:32:45 +0000
parents 153434dc60ad
children 98e65e6a5c32
line wrap: on
line diff
--- a/po/ru.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ru.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2803,7 +2803,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:373
@@ -7301,7 +7301,7 @@
 msgstr "Синтаксическая ошибка (вероятно, ошибка Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Неверный адрес e-mail"
 
 #: ../src/protocols/msn/error.c:45
@@ -8979,7 +8979,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9204,12 +9204,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9248,14 +9248,14 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
@@ -9264,7 +9264,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
@@ -9290,7 +9290,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9546,7 +9546,7 @@
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9596,7 +9596,7 @@
 msgstr "Показать собеседников без авторизации"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Искать собеседника по e-mail..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11077,15 +11077,15 @@
 msgstr "Не удалось выполнить генерацию пары ключей"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Длина ключа"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Файл публичного ключа"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Файл личного ключа"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11400,7 +11400,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Длина ключа: \t%d бит\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11609,7 +11609,7 @@
 msgstr "Служба каталогов временно недоступна."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Поиск e-mail запрещён."
 
 #: ../src/protocols/toc/toc.c:527