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.php 2003-02-08 18:25:20.000000000 +0300 +++ new/language/lang_russian/lang_admin.php 2005-10-31 17:49:20.000000000 +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.000000000 +0300 +++ new/language/lang_russian/lang_main.php 2005-10-31 17:49:20.000000000 +0300 @@ -21,24 +21,12 @@ // // Translation performed by Alexey V. Borzov (borz_off) // [EMAIL PROTECTED] // // Âíèìàíèå! Ìîé e-mail óêàçàí çäåñü äëÿ òîãî, ÷òîáû ìîæíî áûëî ñîîáùàòü ìíå î ïðîáëåìàõ â // ïåðåâîäå. Çà òåõíè÷åñêîé ïîääåðæêîé îáðàùàéòåñü, ïîæàëóéñòà, íà ñîîòâåòñòâóþùèé // ôîðóì íà http://www.phpbb.com/ // Åñòü õîðîøèé øàíñ íàðâàòüñÿ íà ãðóáûé îòâåò èëè íå ïîëó÷èòü íèêàêîãî îòâåòà, åñëè // äîñòàâàòü ìåíÿ ïî e-mail'ó. Ñïàñèáî çà ïîíèìàíèå. // // Êðàòêàÿ èíôîðìàöèÿ î ïðîáëåìàõ ñ ðóññêèì ÿçûêîì: // // 1) Åñëè âìåñòî ðóññêèõ áóêâ âûëåçàþò ñèìâîëû &####;, òî âûêèíüòå èç øàáëîíà // overall_header.tpl ñòðîêó <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"> // 2) Åñëè íå ðàáîòàåò ïîèñê ïî ðóññêîìó òåêñòó, òî ðàñêîììåíòèðóéòå ñëåäóþùóþ ñòðîêó // (ìîæåò íå ñðàáîòàòü, åñëè íåò ñîîòâåòñòâóþùåé ëîêàëè: ïðîêîíñóëüòèðóéòåñü ó ñâîåãî // ñèñòåìíîãî àäìèíèñòðàòîðà): +setlocale(LC_ALL, 'ru_RU.CP1251'); -// setlocale(LC_ALL, 'ru_RU.CP1251'); $lang['ENCODING'] = 'windows-1251'; $lang['DIRECTION'] = 'ltr'; $lang['LEFT'] = 'left'; @@ -52,11 +40,11 @@ $lang['Forum'] = 'Ôîðóì'; $lang['Category'] = 'Êàòåãîðèÿ'; $lang['Topic'] = 'Òåìà'; -$lang['Topics'] = 'Òåìû'; +$lang['Topics'] = 'Òåì'; $lang['Replies'] = 'Îòâåòîâ'; $lang['Views'] = 'Ïðîñìîòðîâ'; $lang['Post'] = 'Ñîîáùåíèå'; // ??? -$lang['Posts'] = 'Ñîîáùåíèÿ'; // ??? +$lang['Posts'] = 'Ñîîáùåíèé'; // ??? $lang['Posted'] = 'Äîáàâëåíî'; $lang['Username'] = 'Èìÿ'; $lang['Password'] = 'Ïàðîëü'; @@ -120,7 +108,7 @@ $lang['Admin_panel'] = 'Ïåðåéòè â àäìèíèñòðàòîðñêèé ðàçäåë'; -$lang['Board_disable'] = 'Èçâèíèòå, ýòè ôîðóìû îòêëþ÷åíû. Ïîïðîáóéòå çàéòè ïîïîçæå'; +$lang['Board_disable'] = 'Èçâèíèòå, ýòè ôîðóìû îòêëþ÷åíû. Ïîïðîáóéòå çàéòè ÷åðåç íåêîòîðîå âðåìÿ.'; // @@ -140,7 +128,7 @@ $lang['Guest_users_zero_total'] = 'ãîñòåé: 0'; $lang['Guest_users_total'] = 'ãîñòåé: %d'; $lang['Guest_user_total'] = 'ãîñòåé: %d'; -$lang['Record_online_users'] = 'Áîëüøå âñåãî ïîñåòèòåëåé (<b>%s</b>) çäåñü áûëî %s'; // first %s = number of users, second %s is the date. +$lang['Record_online_users'] = 'Áîëüøå âñåãî ïîñåòèòåëåé îäíîâðåìåííî (<b>%s</b>) çäåñü áûëî %s.'; // first %s = number of users, second %s is the date. $lang['Admin_online_color'] = '%sÀäìèíèñòðàòîð%s'; $lang['Mod_online_color'] = '%sÌîäåðàòîð%s'; @@ -660,6 +647,15 @@ // +// Visual confirmation system strings +// +$lang['Confirm_code_wrong'] = 'Ââåäåííûé Âàìè êîä ïîäòâåðæäåíèÿ íåâåðåí.'; +$lang['Too_many_registers'] = 'Âû ñîâåðøèëè ñëèøêîì ìíîãî ïîïûòîê ðåãèñòðàöèè ïîëüçîâàòåëåé. Ïîïðîáóéòå ïîâòîðèòü ïîçäíåå.'; +$lang['Confirm_code_impaired'] = 'Åñëè Âû íå ìîæåòå ïî êàêèì-ëèáî ïðè÷èíàì ðàñïîçíàòü êîä ïîäòâåðæäåíèÿ, ïîæàëóéñòà, îáðàòèòåñü çà ïîìîùüþ ê %sÀäìèíèñòðàòîðó%s.'; +$lang['Confirm_code'] = 'Êîä ïîäòâåðæäåíèÿ'; +$lang['Confirm_code_explain'] = 'Ïîæàëóéñòà ââåäèòå êîä, îòîáðàæåííûé íà ðèñóíêå. Êîä ÿâëÿåòñÿ ðåãèñòðî-çàâèñèìûì.'; + +// // Memberslist // $lang['Select_sort_method'] = 'Óïîðÿäî÷èòü ïî'; @@ -970,30 +967,30 @@ $lang['datetime']['Thu'] = '×ò'; $lang['datetime']['Fri'] = 'Ïò'; $lang['datetime']['Sat'] = 'Ñá'; -$lang['datetime']['January'] = 'ßíâàðü'; -$lang['datetime']['February'] = 'Ôåâðàëü'; -$lang['datetime']['March'] = 'Ìàðò'; -$lang['datetime']['April'] = 'Àïðåëü'; -$lang['datetime']['May'] = 'Ìàé'; -$lang['datetime']['June'] = 'Èþíü'; -$lang['datetime']['July'] = 'Èþëü'; -$lang['datetime']['August'] = 'Àâãóñò'; -$lang['datetime']['September'] = 'Ñåíòÿáðü'; -$lang['datetime']['October'] = 'Îêòÿáðü'; -$lang['datetime']['November'] = 'Íîÿáðü'; -$lang['datetime']['December'] = 'Äåêàáðü'; +$lang['datetime']['January'] = 'ßíâàðÿ'; +$lang['datetime']['February'] = 'Ôåâðàëÿ'; +$lang['datetime']['March'] = 'Ìàðòà'; +$lang['datetime']['April'] = 'Àïðåëÿ'; +$lang['datetime']['May'] = 'Ìàÿ'; +$lang['datetime']['June'] = 'Èþíÿ'; +$lang['datetime']['July'] = 'Èþëÿ'; +$lang['datetime']['August'] = 'Àâãóñòà'; +$lang['datetime']['September'] = 'Ñåíòÿáðÿ'; +$lang['datetime']['October'] = 'Îêòÿáðÿ'; +$lang['datetime']['November'] = 'Íîÿáðÿ'; +$lang['datetime']['December'] = 'Äåêàáðÿ'; $lang['datetime']['Jan'] = 'ßíâ'; $lang['datetime']['Feb'] = 'Ôåâ'; $lang['datetime']['Mar'] = 'Ìàð'; $lang['datetime']['Apr'] = 'Àïð'; -$lang['datetime']['May'] = 'Ìàé'; +$lang['datetime']['May'] = 'Ìàÿ'; $lang['datetime']['Jun'] = 'Èþí'; $lang['datetime']['Jul'] = 'Èþë'; $lang['datetime']['Aug'] = 'Àâã'; $lang['datetime']['Sep'] = 'Ñåí'; $lang['datetime']['Oct'] = 'Îêò'; $lang['datetime']['Nov'] = 'Íîÿ'; $lang['datetime']['Dec'] = 'Äåê'; // // Errors (not related to a @@ -1007,8 +1004,96 @@ $lang['An_error_occured'] = 'Ïðîèçîøëà îøèáêà'; $lang['A_critical_error'] = 'Ïðîèçîøëà êðèòè÷åñêàÿ îøèáêà'; +$lang['Admin_reauthenticate'] = 'Äëÿ ïåðåõîäà â ðåæèì àäìèíèñòðèðîâàíèÿ Âàì íåîáõîäèìî ïîâòîðíî àâòîðèçîâàòüñÿ.'; + // // That's all Folks! // -------------------------------------------------
signature.asc
Description: This is a digitally signed message part
