Bug#336623: phpbb2-languages: Russian translations fixes
Hello Alexander, Thanks for your patch. However, I'm having trouble applying it: patching file language/lang_russian/lang_admin.php Hunk #1 FAILED at 21. Hunk #4 FAILED at 238. 2 out of 6 hunks FAILED -- saving rejects to file language/lang_russian/lang_admin.php.rej patching file language/lang_russian/lang_main.php patch: malformed patch at line 90: //Êðàòêàÿ èíôîðìàöèÿ î ïðîáëåìàõ ñ ðóññêèì ÿçûêîì: I think this might be caused by the character set of the patch and the files from phpbb. I'm not knowledgable enough to solve this I'm afraid, do you have any idea? thanks, Thijs Forwarded Message From: Alexander GQ Gerasiov [EMAIL PROTECTED] To: Thijs Kinkhorst [EMAIL PROTECTED] Subject: Re: Bug#336623: phpbb2-languages: Russian translations fixes Date: Mon, 05 Dec 2005 12:25:46 +0300 Hello Thijs, Thijs Kinkhorst wrote: Thanks for the fix. Could you please send the patch to me as an attachment, not inline in the bug text? Then I can make sure it applies correctly. Ok. Here is it. diff -u old/language/lang_russian/lang_admin.php new/language/lang_russian/lang_admin.php --- old/language/lang_russian/lang_admin.php2003-02-08 18:25:20.0 +0300 +++ new/language/lang_russian/lang_admin.php2005-10-31 17:49:20.0 +0300 @@ -21,11 +21,11 @@ // // Translation performed by Alexey V. Borzov (borz_off) // [EMAIL PROTECTED] // -$lang['General'] = 'Îáùèå íàñòðîéêè'; +$lang['General'] = 'Íàñòðîéêè'; $lang['Users'] = 'Ïîëüçîâàòåëè'; $lang['Groups'] = 'Ãðóïïû'; $lang['Forums'] = 'Ôîðóìû'; @@ -51,7 +51,7 @@ // // Index // -$lang['Admin'] = 'Àäìèíèñòðèðîâàíèå'; +$lang['Admin'] = 'Óïðàâëåíèå Ôîðóìîì'; $lang['Not_admin'] = 'Ó âàñ íåò ïðàâ íà àäìèíèñòðèðîâàíèå'; $lang['Welcome_phpBB'] = 'Äîáðî ïîæàëîâàòü íà phpBB'; $lang['Admin_intro'] = 'Ñïàñèáî çà âûáîð phpBB â êà÷åñòâå ðåøåíèÿ äëÿ âàøèõ ôîðóìîâ. Íà ýòîé ñòðàíèöå äàí êðàòêèé îáçîð ðàçëè÷íûõ âîçìîæíîñòåé ýòîé äîñêè îáúÿâëåíèé. Âåðíóòüñÿ íà ýòó ñòðàíèöó âû ìîæåòå, ù¸ëêíóâ íà ññûëêó uÃëàâíàÿ ñòðàíèöà/u â ëåâîé ïàíåëè. Äëÿ ïåðåõîäà íà ñïèñîê ôîðóìîâ ù¸ëêíèòå ïî ëîãîòèïó phpBB òàêæå â ëåâîé ïàíåëè. Îñòàëüíûå ññûëêè â ëåâîé ÷àñòè ýòîãî ýêðàíà ïîçâîëÿò âàì óïðàâëÿòü âñåìè àñïåêòàìè âàøèõ ôîðóìîâ, íà êàæäîì ýêðàíå áóäóò äàíû èíñòðóêöèè ïî èñïîëüçîâàíèþ.'; @@ -73,7 +73,7 @@ $lang['Board_started'] = 'Äàòà çàïóñêà'; $lang['Avatar_dir_size'] = 'Ðàçìåð äèðåêòîðèè ñ àâàòàðàìè'; $lang['Database_size'] = 'Îáú¸ì ÁÄ'; -$lang['Gzip_compression'] ='ñæàòèå Gzip'; +$lang['Gzip_compression'] ='Ñæàòèå Gzip'; $lang['Not_available'] = 'Íåäîñòóïíî'; $lang['ON'] = 'ÂÊË'; // This is for GZip compression @@ -238,12 +238,12 @@ $lang['Server_name_explain'] = 'Èìÿ ñåðâåðà, íà êîòîðîì çàïóùåíû ýòè ôîðóìû'; $lang['Script_path'] = 'Ïóòü ê ôîðóìàì'; $lang['Script_path_explain'] = 'Ïóòü ê êàòàëîãó, ñîäåðæàùåìó phpBB, îòíîñèòåëüíî êîðíÿ ñàéòà'; $lang['Server_port'] = 'Ïîðò âåá-ñåðâåðà'; $lang['Server_port_explain'] = 'Ïîðò, íà êîòîðîì çàïóùåí âàø âåá-ñåðâåð (îáû÷íî 80, èçìåíÿéòå bòîëüêî/b åñëè ñåðâåð ðàáîòàåò íà äðóãîì ïîðòó)'; $lang['Site_name'] = 'Íàçâàíèå ñàéòà'; $lang['Site_desc'] = 'Îïèñàíèå ñàéòà'; $lang['Board_disable'] = 'Îòêëþ÷èòü ôîðóìû'; -$lang['Board_disable_explain'] = 'Ôîðóìû ñòàíóò íåäîñòóïíûìè ïîëüçîâàòåëÿì. Íå âûõîäèòå ïîñëå îòêëþ÷åíèÿ ôîðóìîâ, ñíîâà âîéòè âû íå ñìîæåòå!'; +$lang['Board_disable_explain'] = 'Ôîðóìû ñòàíóò íåäîñòóïíûìè ïîëüçîâàòåëÿì. Àäìèíèñòðàòîðû ìîãóò çàéòè íà ôîðóì, âîñïîëüçîâàâøèñü Ïàíåëüþ Àäìèíèñòðèðîâàíèÿ'; $lang['Acct_activation'] = 'Âêëþ÷èòü àêòèâèçàöèþ ó÷¸òíûõ çàïèñåé'; $lang['Acc_None'] = 'Íåò'; // These three entries are the type of activation $lang['Acc_User'] = 'Ïîëüçîâàòåëåì'; @@ -324,6 +324,16 @@ $lang['Session_length'] = 'Äëèíà ñåññèè [ â ñåêóíäàõ ]'; +// Visual Confirmation +$lang['Visual_confirm'] = 'Âêëþ÷èòü âèçóàëüíîå ïîäòâåðæäåíèå'; +$lang['Visual_confirm_explain'] = 'Òðåáóåò îò ïîëüçîâàòåëÿ ââåäåíèÿ êîäà ïîäòâåðæäåíèÿ, óêàçàííîãî íà êàðòèíêå, ïðè ðåãèñòðàöèè.'; + +// Autologin Keys - added 2.0.18 +$lang['Allow_autologin'] = 'Ðàçðåøàòü àâòîìàòè÷åñêèé âõîä'; +$lang['Allow_autologin_explain'] = 'Ðàçðåøàòü ëè ïîëüçîâàòåëÿì óêàçûâàòü, õîòÿò ëè îíè àâòîìàòè÷åñêè âõîòèäü ïðè êàæäîì ïîñåùåíèè ôîðóìà'; +$lang['Autologin_time'] = 'Ñðîê óñòàðåâàíèÿ êëþ÷à àâòîìàòè÷åñêîãî âõîäà'; +$lang['Autologin_time_explain'] = 'Ñêîëüêî äíåé ïîñëå ïîñåùåíèÿ ôîðóìà áóäåò äåéñòâîâàòü àâòîìàòè÷åñêèé âõîä. Äëÿ îòêëþ÷åíèÿ ýòîãî îãðàíè÷åíèÿ óêàæèòå 0 (íîëü).'; + // // Forum Management // @@ -610,6 +617,7 @@ $lang['Save_Settings'] = 'Ñîõðàíèòü íàñòðîéêè'; $lang['Stylesheet'] = 'Ôàéë ñòèëåé CSS'; +$lang['Stylesheet_explain'] = 'Èìÿ ôàéëà ñòèëåé CSS.'; $lang['Background_image'] = 'Ôîíîâîå èçîáðàæåíèå'; $lang['Background_color'] = 'Öâåò ôîíà'; $lang['Theme_name'] = 'Íàçâàíèå öâåòîâîé ñõåìû'; diff -u old/language/lang_russian/lang_main.php new/language/lang_russian/lang_main.php --- old/language/lang_russian/lang_main.php 2003-02-08 18:25:20.0 +0300 +++ new/language/lang_russian
Bug#336623: phpbb2-languages: Russian translations fixes
Hello Alexander, Hello there. I've added some translations missed in original translation from phpbb team. (That's about Visual comformation and Autologin expires with appear in ~2.0.14 and 2.0.18) Thanks for the fix. Could you please send the patch to me as an attachment, not inline in the bug text? Then I can make sure it applies correctly. thanks, Thijs signature.asc Description: This is a digitally signed message part
Bug#336623: phpbb2-languages: Russian translations fixes
Package: phpbb2-languages Version: 2.0.17-1 Severity: minor Tags: patch Hello there. I've added some translations missed in original translation from phpbb team. (That's about Visual comformation and Autologin expires with appear in ~2.0.14 and 2.0.18) Also I've fixed some other variables. -- System Information: Debian Release: 3.1 APT prefers proposed-updates APT policy: (670, 'proposed-updates'), (670, 'stable'), (620, 'testing'), (600, 'unstable'), (550, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/dash Kernel: Linux 2.6.12-1-686 Locale: LANG=ru_RU.KOI8-R, LC_CTYPE=ru_RU.KOI8-R (charmap=KOI8-R) Versions of packages phpbb2-languages depends on: ii phpbb22.0.17-1 A fully featured and skinnable fla phpbb2-languages recommends no packages. -- no debconf information *** /tmp/russian.diff diff -u old/language/lang_russian/lang_admin.php new/language/lang_russian/lang_admin.php --- old/language/lang_russian/lang_admin.php2003-02-08 18:25:20.0 +0300 +++ new/language/lang_russian/lang_admin.php2005-10-31 17:49:20.0 +0300 @@ -21,11 +21,11 @@ // // Translation performed by Alexey V. Borzov (borz_off) // [EMAIL PROTECTED] // -$lang['General'] = 'нАЫХЕ МЮЯРПНИЙХ'; +$lang['General'] = 'мЮЯРПНИЙХ'; $lang['Users'] = 'оНКЭГНБЮРЕКХ'; $lang['Groups'] = 'цПСООШ'; $lang['Forums'] = 'тНПСЛШ'; @@ -51,7 +51,7 @@ // // Index // -$lang['Admin'] = 'юДЛХМХЯРПХПНБЮМХЕ'; +$lang['Admin'] = 'сОПЮБКЕМХЕ тНПСЛНЛ'; $lang['Not_admin'] = 'с БЮЯ МЕР ОПЮБ МЮ ЮДЛХМХЯРПХПНБЮМХЕ'; $lang['Welcome_phpBB'] = 'дНАПН ОНФЮКНБЮРЭ МЮ phpBB'; $lang['Admin_intro'] = 'яОЮЯХАН ГЮ БШАНП phpBB Б ЙЮВЕЯРБЕ ПЕЬЕМХЪ ДКЪ БЮЬХУ ТНПСЛНБ. мЮ ЩРНИ ЯРПЮМХЖЕ ДЮМ ЙПЮРЙХИ НАГНП ПЮГКХВМШУ БНГЛНФМНЯРЕИ ЩРНИ ДНЯЙХ НАЗЪБКЕМХИ. бЕПМСРЭЯЪ МЮ ЩРС ЯРПЮМХЖС БШ ЛНФЕРЕ, Ы╦КЙМСБ МЮ ЯЯШКЙС uцКЮБМЮЪ ЯРПЮМХЖЮ/u Б КЕБНИ ОЮМЕКХ. дКЪ ОЕПЕУНДЮ МЮ ЯОХЯНЙ ТНПСЛНБ Ы╦КЙМХРЕ ОН КНЦНРХОС phpBB РЮЙФЕ Б КЕБНИ ОЮМЕКХ. нЯРЮКЭМШЕ ЯЯШКЙХ Б КЕБНИ ВЮЯРХ ЩРНЦН ЩЙПЮМЮ ОНГБНКЪР БЮЛ СОПЮБКЪРЭ БЯЕЛХ ЮЯОЕЙРЮЛХ БЮЬХУ ТНПСЛНБ, МЮ ЙЮФДНЛ ЩЙПЮМЕ АСДСР ДЮМШ ХМЯРПСЙЖХХ ОН ХЯОНКЭГНБЮМХЧ.'; @@ -73,7 +73,7 @@ $lang['Board_started'] = 'дЮРЮ ГЮОСЯЙЮ'; $lang['Avatar_dir_size'] = 'пЮГЛЕП ДХПЕЙРНПХХ Я ЮБЮРЮПЮЛХ'; $lang['Database_size'] = 'нАЗ╦Л ад'; -$lang['Gzip_compression'] ='ЯФЮРХЕ Gzip'; +$lang['Gzip_compression'] ='яФЮРХЕ Gzip'; $lang['Not_available'] = 'мЕДНЯРСОМН'; $lang['ON'] = 'бйк'; // This is for GZip compression @@ -238,12 +238,12 @@ $lang['Server_name_explain'] = 'хЛЪ ЯЕПБЕПЮ, МЮ ЙНРНПНЛ ГЮОСЫЕМШ ЩРХ ТНПСЛШ'; $lang['Script_path'] = 'оСРЭ Й ТНПСЛЮЛ'; $lang['Script_path_explain'] = 'оСРЭ Й ЙЮРЮКНЦС, ЯНДЕПФЮЫЕЛС phpBB, НРМНЯХРЕКЭМН ЙНПМЪ ЯЮИРЮ'; $lang['Server_port'] = 'оНПР БЕА-ЯЕПБЕПЮ'; $lang['Server_port_explain'] = 'оНПР, МЮ ЙНРНПНЛ ГЮОСЫЕМ БЮЬ БЕА-ЯЕПБЕП (НАШВМН 80, ХГЛЕМЪИРЕ bРНКЭЙН/b ЕЯКХ ЯЕПБЕП ПЮАНРЮЕР МЮ ДПСЦНЛ ОНПРС)'; $lang['Site_name'] = 'мЮГБЮМХЕ ЯЮИРЮ'; $lang['Site_desc'] = 'нОХЯЮМХЕ ЯЮИРЮ'; $lang['Board_disable'] = 'нРЙКЧВХРЭ ТНПСЛШ'; -$lang['Board_disable_explain'] = 'тНПСЛШ ЯРЮМСР МЕДНЯРСОМШЛХ ОНКЭГНБЮРЕКЪЛ. мЕ БШУНДХРЕ ОНЯКЕ НРЙКЧВЕМХЪ ТНПСЛНБ, ЯМНБЮ БНИРХ БШ МЕ ЯЛНФЕРЕ!'; +$lang['Board_disable_explain'] = 'тНПСЛШ ЯРЮМСР МЕДНЯРСОМШЛХ ОНКЭГНБЮРЕКЪЛ. юДЛХМХЯРПЮРНПШ ЛНЦСР ГЮИРХ МЮ ТНПСЛ, БНЯОНКЭГНБЮБЬХЯЭ оЮМЕКЭЧ юДЛХМХЯРПХПНБЮМХЪ'; $lang['Acct_activation'] = 'бЙКЧВХРЭ ЮЙРХБХГЮЖХЧ СВ╦РМШУ ГЮОХЯЕИ'; $lang['Acc_None'] = 'мЕР'; // These three entries are the type of activation $lang['Acc_User'] = 'оНКЭГНБЮРЕКЕЛ'; @@ -324,6 +324,16 @@ $lang['Session_length'] = 'дКХМЮ ЯЕЯЯХХ [ Б ЯЕЙСМДЮУ ]'; +// Visual Confirmation +$lang['Visual_confirm'] = 'бЙКЧВХРЭ БХГСЮКЭМНЕ ОНДРБЕПФДЕМХЕ'; +$lang['Visual_confirm_explain'] = 'рПЕАСЕР НР ОНКЭГНБЮРЕКЪ ББЕДЕМХЪ ЙНДЮ ОНДРБЕПФДЕМХЪ, СЙЮГЮММНЦН МЮ ЙЮПРХМЙЕ, ОПХ ПЕЦХЯРПЮЖХХ.'; + +// Autologin Keys - added 2.0.18 +$lang['Allow_autologin'] = 'пЮГПЕЬЮРЭ ЮБРНЛЮРХВЕЯЙХИ БУНД'; +$lang['Allow_autologin_explain'] = 'пЮГПЕЬЮРЭ КХ ОНКЭГНБЮРЕКЪЛ СЙЮГШБЮРЭ, УНРЪР КХ НМХ ЮБРНЛЮРХВЕЯЙХ БУНРХДЭ ОПХ ЙЮФДНЛ ОНЯЕЫЕМХХ ТНПСЛЮ'; +$lang['Autologin_time'] = 'яПНЙ СЯРЮПЕБЮМХЪ ЙКЧВЮ ЮБРНЛЮРХВЕЯЙНЦН БУНДЮ'; +$lang['Autologin_time_explain'] = 'яЙНКЭЙН ДМЕИ ОНЯКЕ ОНЯЕЫЕМХЪ ТНПСЛЮ АСДЕР ДЕИЯРБНБЮРЭ ЮБРНЛЮРХВЕЯЙХИ БУНД. дКЪ НРЙКЧВЕМХЪ ЩРНЦН НЦПЮМХВЕМХЪ СЙЮФХРЕ 0 (МНКЭ).'; + // // Forum Management // @@ -610,6 +617,7 @@ $lang['Save_Settings'] = 'яНУПЮМХРЭ МЮЯРПНИЙХ'; $lang['Stylesheet'] = 'тЮИК ЯРХКЕИ CSS'; +$lang['Stylesheet_explain'] = 'хЛЪ ТЮИКЮ ЯРХКЕИ CSS.'; $lang['Background_image'] = 'тНМНБНЕ ХГНАПЮФЕМХЕ'; $lang['Background_color'] = 'жБЕР ТНМЮ'; $lang['Theme_name'] = 'мЮГБЮМХЕ ЖБЕРНБНИ ЯУЕЛШ'; diff -u old/language/lang_russian/lang_main.php new/language/lang_russian/lang_main.php --- old/language/lang_russian/lang_main.php 2003-02-08 18:25:20.0 +0300 +++ new/language/lang_russian/lang_main.php 2005-10-31 17:49:20.0 +0300 @@ -21,24 +21,12 @@ // // Translation performed by Alexey V. Borzov (borz_off) //
