From f7ec30a586f9378adb2fdf25cc73cf749c51a498 Mon Sep 17 00:00:00 2001 From: Philippe Rigovanov Date: Mon, 23 Jun 2014 01:55:45 +0400 Subject: [PATCH 1/5] Update ru.coffee --- app/locale/ru.coffee | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 7d1b28701..829df6a88 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -219,8 +219,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # next_links: "add any personal or social links." # next_photo: "add an optional professional photo." # next_active: "mark yourself open to offers to show up in searches." -# example_blog: "Blog" -# example_personal_site: "Personal Site" + example_blog: "Блог" + example_personal_site: "Персональный сайт" # links_header: "Personal Links" # links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog." # links_name: "Link Name" @@ -231,16 +231,16 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # basics_active_help: "Want interview offers right now?" # basics_job_title: "Desired Job Title" # basics_job_title_help: "What role are you looking for?" -# basics_city: "City" + basics_city: "Город" # basics_city_help: "City you want to work in (or live in now)." -# basics_country: "Country" + basics_country: "Страна" # basics_country_help: "Country you want to work in (or live in now)." # basics_visa: "US Work Status" # basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship?" # basics_looking_for: "Looking For" -# basics_looking_for_full_time: "Full-time" -# basics_looking_for_part_time: "Part-time" -# basics_looking_for_remote: "Remote" + basics_looking_for_full_time: "Полная занятость" + basics_looking_for_part_time: "Частичная занятость" + basics_looking_for_remote: "Удаленная работа" # basics_looking_for_contracting: "Contracting" # basics_looking_for_internship: "Internship" # basics_looking_for_help: "What kind of developer position do you want?" @@ -266,9 +266,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # work_employer_help: "Name of your employer." # work_role: "Job Title" # work_role_help: "What was your job title or role?" -# work_duration: "Duration" + work_duration: "Продолжительность" # work_duration_help: "When did you hold this gig?" -# work_description: "Description" + work_description: "Описание" # work_description_help: "What did you do there? (140 chars; optional)" education: "Образование" # education_header: "Recount your academic ordeals" @@ -279,21 +279,21 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # education_degree_help: "What was your degree and field of study?" # education_duration: "Dates" # education_duration_help: "When?" -# education_description: "Description" + education_description: "Описание" # education_description_help: "Highlight anything about this educational experience. (140 chars; optional)" our_notes: "Наши заметки" projects: "Проекты" -# projects_header: "Add 3 projects" -# projects_header_2: "Projects (Top 3)" + projects_header: "Добавьте 3 проекта" + projects_header_2: "Проекты (3 самых лучших)" # projects_blurb: "Highlight your projects to amaze employers." -# project_name: "Project Name" + project_name: "Название Проекта" # project_name_help: "What was the project called?" -# project_description: "Description" + project_description: "Описание" # project_description_help: "Briefly describe the project." # project_picture: "Picture" # project_picture_help: "Upload a 230x115px or larger image showing off the project." -# project_link: "Link" -# project_link_help: "Link to the project." + project_link: "Ссылка" + project_link_help: "Ссылка на проект." # player_code: "Player Code" employers: @@ -302,7 +302,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io." # who: "Who Are the Players?" # who_blurb: "CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans." -# how: "How Do We Find Developers?" + how: "Как Мы Находим Разработчиков?" # how_blurb: "We host competitive tournaments to attract competitive software engieneers. We then use in-house algorithms to identify the best players among the top 5% of tournament winners." # why: "Why Hire Through Us?" # why_blurb_1: "We will save you time. Every CodeCombateer we feaure is " @@ -433,12 +433,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi cast_spell: "Произнести текущее заклинание." # continue_script: "Continue past current script." # skip_scripts: "Skip past all skippable scripts." -# toggle_playback: "Toggle play/pause." -# scrub_playback: "Scrub back and forward through time." + toggle_playback: "Включить проигрывание/паузу." + scrub_playback: "Перемотка назад и вперед во времени." # single_scrub_playback: "Scrub back and forward through time by a single frame." # scrub_execution: "Scrub through current spell execution." -# toggle_debug: "Toggle debug display." -# toggle_grid: "Toggle grid overlay." + toggle_debug: "Включить отображение отладки." + toggle_grid: "Включить наложение сетки." # toggle_pathfinding: "Toggle pathfinding overlay." # beautify: "Beautify your code by standardizing its formatting." # move_wizard: "Move your Wizard around the level." @@ -448,7 +448,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi av_entities_sub_title: "Сущности" av_entities_users_url: "Пользователи" av_entities_active_instances_url: "Активные экземпляры" -# av_entities_employer_list_url: "Employer List" + av_entities_employer_list_url: "Список работодателей" av_other_sub_title: "Другое" av_other_debug_base_url: "База (для отладки base.jade)" u_title: "Список пользователей" @@ -514,9 +514,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi new_article_title: "Создать новую статью" new_thang_title: "Создать новый тип объектов" new_level_title: "Создать новый уровень" -# new_article_title_login: "Log In to Create a New Article" + new_article_title_login: "Войти чтобы создать новую статью" # new_thang_title_login: "Log In to Create a New Thang Type" -# new_level_title_login: "Log In to Create a New Level" + new_level_title_login: "Войти чтобы создать новый уровень" # new_achievement_title: "Create a New Achievement" # new_achievement_title_login: "Log In to Create a New Achievement" article_search_title: "Искать статьи" @@ -815,8 +815,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # prizes: "Prizes" # total_value: "Total Value" # in_cash: "in cash" -# custom_wizard: "Custom CodeCombat Wizard" -# custom_avatar: "Custom CodeCombat avatar" + custom_wizard: "Изменить CodeCombat волшебника" + custom_avatar: "Изменить CodeCombat аватар" # heap: "for six months of \"Startup\" access" # credits: "credits" # one_month_coupon: "coupon: choose either Rails or HTML" @@ -873,7 +873,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # thangs: "Thangs" # level_session: "Your Session" # opponent_session: "Opponent Session" -# article: "Article" + article: "Статья" # user_names: "User Names" # thang_names: "Thang Names" files: "Файлы" From 1fee6c7186ea567c1801ddd2a262a30ce52fca10 Mon Sep 17 00:00:00 2001 From: Philippe Rigovanov Date: Mon, 23 Jun 2014 02:10:40 +0400 Subject: [PATCH 2/5] Update server.coffee Removed unnecessary return statement in server.coffee. Functions will always return their final value. --- server.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.coffee b/server.coffee index 6021f2865..c59890489 100644 --- a/server.coffee +++ b/server.coffee @@ -12,7 +12,7 @@ module.exports.startServer = -> app = createAndConfigureApp() http.createServer(app).listen(app.get('port')) log.info("Express SSL server listening on port " + app.get('port')) - return app + app createAndConfigureApp = -> serverSetup.setupLogging() From f2898e3bc0291c139cb059e096cd36956f0cc8d4 Mon Sep 17 00:00:00 2001 From: Philippe Rigovanov Date: Thu, 26 Jun 2014 00:56:41 +0400 Subject: [PATCH 3/5] Update diplomat.jade added myself to diplomats --- app/templates/contribute/diplomat.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/contribute/diplomat.jade b/app/templates/contribute/diplomat.jade index 845da167d..e2e6a756c 100644 --- a/app/templates/contribute/diplomat.jade +++ b/app/templates/contribute/diplomat.jade @@ -72,7 +72,7 @@ block content li Slovak - Anon li Persian - Reza Habibi (Rehb) li Czech - vanous - li Russian - fess89, ser-storchak, Mr A + li Russian - fess89, ser-storchak, Mr A, a1ip li Ukrainian - fess89 li Italian - flauta li Norwegian - bardeh From e138d2eed61ae264264e0601f7ce282834dccd2d Mon Sep 17 00:00:00 2001 From: Philippe Rigovanov Date: Fri, 27 Jun 2014 04:11:46 +0400 Subject: [PATCH 4/5] Update ru.coffee With fixes from [M-r-A](https://github.com/M-r-A) --- app/locale/ru.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 829df6a88..894370bf9 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -286,7 +286,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi projects_header: "Добавьте 3 проекта" projects_header_2: "Проекты (3 самых лучших)" # projects_blurb: "Highlight your projects to amaze employers." - project_name: "Название Проекта" + project_name: "Название проекта" # project_name_help: "What was the project called?" project_description: "Описание" # project_description_help: "Briefly describe the project." @@ -302,7 +302,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io." # who: "Who Are the Players?" # who_blurb: "CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans." - how: "Как Мы Находим Разработчиков?" + how: "Как мы находим разработчиков?" # how_blurb: "We host competitive tournaments to attract competitive software engieneers. We then use in-house algorithms to identify the best players among the top 5% of tournament winners." # why: "Why Hire Through Us?" # why_blurb_1: "We will save you time. Every CodeCombateer we feaure is " @@ -433,7 +433,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi cast_spell: "Произнести текущее заклинание." # continue_script: "Continue past current script." # skip_scripts: "Skip past all skippable scripts." - toggle_playback: "Включить проигрывание/паузу." + toggle_playback: "Переключить проигрывание/паузу." scrub_playback: "Перемотка назад и вперед во времени." # single_scrub_playback: "Scrub back and forward through time by a single frame." # scrub_execution: "Scrub through current spell execution." @@ -514,7 +514,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi new_article_title: "Создать новую статью" new_thang_title: "Создать новый тип объектов" new_level_title: "Создать новый уровень" - new_article_title_login: "Войти чтобы создать новую статью" + new_article_title_login: "Войти, чтобы создать новую статью" # new_thang_title_login: "Log In to Create a New Thang Type" new_level_title_login: "Войти чтобы создать новый уровень" # new_achievement_title: "Create a New Achievement" @@ -815,8 +815,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # prizes: "Prizes" # total_value: "Total Value" # in_cash: "in cash" - custom_wizard: "Изменить CodeCombat волшебника" - custom_avatar: "Изменить CodeCombat аватар" + custom_wizard: "Изменить волшебника CodeCombat" + custom_avatar: "Изменить аватар CodeCombat" # heap: "for six months of \"Startup\" access" # credits: "credits" # one_month_coupon: "coupon: choose either Rails or HTML" From dd6209cd998524db524790c1e7d41755e366a888 Mon Sep 17 00:00:00 2001 From: Philippe Rigovanov Date: Fri, 27 Jun 2014 04:33:05 +0400 Subject: [PATCH 5/5] Update ru.coffee With @M-r-A fixes --- app/locale/ru.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 894370bf9..1305e22b1 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -264,7 +264,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # work_blurb: "List your relevant work experience, most recent first." # work_employer: "Employer" # work_employer_help: "Name of your employer." -# work_role: "Job Title" + work_role: "Должность" # work_role_help: "What was your job title or role?" work_duration: "Продолжительность" # work_duration_help: "When did you hold this gig?" @@ -275,7 +275,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # education_blurb: "List your academic ordeals." # education_school: "School" # education_school_help: "Name of your school." -# education_degree: "Degree" + education_degree: "Степень" # education_degree_help: "What was your degree and field of study?" # education_duration: "Dates" # education_duration_help: "When?" @@ -871,7 +871,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi components: "Компоненты" # thang: "Thang" # thangs: "Thangs" -# level_session: "Your Session" + level_session: "Ваша сессия" # opponent_session: "Opponent Session" article: "Статья" # user_names: "User Names"