Skip to content

Commit

Permalink
Merge branch 'main' into fix-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
SachaG authored Jul 18, 2024
2 parents 669470f + df2fa18 commit 67e37f6
Show file tree
Hide file tree
Showing 12 changed files with 1,928 additions and 579 deletions.
340 changes: 297 additions & 43 deletions common.yml

Large diffs are not rendered by default.

28 changes: 26 additions & 2 deletions countries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ translations:
t: Belarus
- key: options.country.BRA
t: Brazil
- key: options.country.BGR
t: Bulgaria
- key: options.country.CAN
t: Canada
- key: options.country.CRI
t: Costa Rica
- key: options.country.CHE
t: Switzerland
- key: options.country.CHL
Expand All @@ -34,26 +38,38 @@ translations:
t: Colombia
- key: options.country.CIV
t: Côte d'Ivoire
- key: options.country.CYP
t: Cyprus
- key: options.country.CZE
t: Czechia
- key: options.country.DEU
t: Germany
- key: options.country.DNK
t: Denmark
- key: options.country.EGY
t: Egypt
- key: options.country.ETH
t: Ethiopia
- key: options.country.FIN
t: Finland
- key: options.country.FRA
t: France
- key: options.country.DEU
t: Germany
- key: options.country.GHA
t: Ghana
- key: options.country.GBR
t: United Kingdom
- key: options.country.HKG
t: Hong Kong
- key: options.country.HUN
t: Hungary
- key: options.country.IND
t: India
- key: options.country.IDN
t: Indonesia
- key: options.country.IRL
t: Ireland
- key: options.country.ISL
t: Iceland
- key: options.country.IRN
t: Iran
- key: options.country.IRQ
Expand All @@ -66,8 +82,12 @@ translations:
t: Japan
- key: options.country.KEN
t: Kenya
- key: options.country.LUX
t: Luxembourg
- key: options.country.KOR
t: South Korea
- key: options.country.MDA
t: Moldova
- key: options.country.MEX
t: Mexico
- key: options.country.MMR
Expand Down Expand Up @@ -98,6 +118,8 @@ translations:
t: Spain
- key: options.country.SWE
t: Sweden
- key: options.country.TWN
t: Taiwan
- key: options.country.TZA
t: Tanzania
- key: options.country.THA
Expand All @@ -108,6 +130,8 @@ translations:
t: Uganda
- key: options.country.UKR
t: Ukraine
- key: options.country.ARE
t: United Arab Emirates
- key: options.country.USA
t: United States of America
- key: options.country.VNM
Expand Down
50 changes: 25 additions & 25 deletions legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -812,55 +812,55 @@ translations:
# age
- key: user_info.age
t: Age
- key: user_info.age.description
- key: user_info.age.question
t: How old are you, in years?

# years of experience
- key: user_info.years_of_experience
t: Years of Experience
- key: user_info.years_of_experience.description
- key: user_info.years_of_experience.question
t: How long have you been working or studying in this field, in years?

# company size
- key: user_info.company_size
t: Company Size
- key: user_info.company_size.description
- key: user_info.company_size.question
t: How big is your company, in number of employees?

# salary ranges
- key: user_info.yearly_salary
t: Yearly Salary
- key: user_info.yearly_salary.description
- key: user_info.yearly_salary.question
t: Your yearly salary in U.S. dollar.

# job title
- key: user_info.job_title
t: Job Title
- key: user_info.job_title.description
- key: user_info.job_title.question
t: How do you introduce yourself to others?

# javascript proficiency
- key: user_info.javascript_proficiency
t: JavaScript Proficiency
- key: user_info.javascript_proficiency.description
- key: user_info.javascript_proficiency.question
t: How proficient are you at JavaScript?

# css proficiency
- key: user_info.css_proficiency
t: CSS Proficiency
- key: user_info.css_proficiency.description
- key: user_info.css_proficiency.question
t: How proficient are you at CSS?

# backend proficiency
- key: user_info.backend_proficiency
t: Back-end Proficiency
- key: user_info.backend_proficiency.description
- key: user_info.backend_proficiency.question
t: How proficient are you at back-end development?

# gender
- key: user_info.gender
t: Gender
- key: user_info.gender.description
- key: user_info.gender.question
t: >
Which of the following options describes you, if any? Please pick one.
- key: user_info.gender.note
Expand All @@ -872,7 +872,7 @@ translations:
# race & ethnicity
- key: user_info.race_ethnicity
t: Race & Ethnicity
- key: user_info.race_ethnicity.description
- key: user_info.race_ethnicity.question
t: >
Which of the following options describe you, if any? Please check all that apply.
- key: user_info.race_ethnicity.note
Expand All @@ -888,7 +888,7 @@ translations:
# disability status
- key: user_info.disability_status
t: Disability Status
- key: user_info.disability_status.description
- key: user_info.disability_status.question
t: >
Which of the following disabilities do you experience, if any? Please check all that apply.
Note that this can include temporary disabilities or injuries.
Expand Down Expand Up @@ -930,7 +930,7 @@ translations:
- key: user_info.industry_sector
t: Industry Sector
- key: user_info.industry_sector.description
- key: user_info.industry_sector.question
t: Which industry sector(s) do you work in?
- key: user_info.industry_sector.others
t: Other Industry Sectors
Expand All @@ -940,7 +940,7 @@ translations:
# degree
- key: user_info.higher_education_degree
t: Higher Education Degree
- key: user_info.higher_education_degree.description
- key: user_info.higher_education_degree.question
t: Do you have a higher education degree?

# email_temporary (receive updates?)
Expand All @@ -961,7 +961,7 @@ translations:

- key: tools_others.libraries
t: Libraries
- key: tools_others.libraries.description
- key: tools_others.libraries.question
t: Which libraries do you regularly use?
- key: tools_others.libraries.others
t: Other Libraries
Expand All @@ -970,7 +970,7 @@ translations:

- key: tools_others.text_editors
t: Text Editors
- key: tools_others.text_editors.description
- key: tools_others.text_editors.question
t: Which text editor(s) do you regularly use?
- key: tools_others.text_editors.others
t: Other Text Editors
Expand All @@ -979,7 +979,7 @@ translations:

- key: tools_others.utilities
t: Utilities
- key: tools_others.utilities.description
- key: tools_others.utilities.question
t: Which utilities or tools do you regularly use?
- key: tools_others.utilities.others
t: Other Utilities
Expand All @@ -988,7 +988,7 @@ translations:

- key: tools_others.browsers
t: Browsers
- key: tools_others.browsers.description
- key: tools_others.browsers.question
t: Which browser(s) do you primarily work in during initial development?
- key: tools_others.browsers.others
t: Other Browsers
Expand All @@ -997,7 +997,7 @@ translations:

- key: tools_others.build_tools
t: Build Tools
- key: tools_others.build_tools.description
- key: tools_others.build_tools.question
t: Which build tools do you use?
- key: tools_others.build_tools.others
t: Other Build Tools
Expand All @@ -1006,7 +1006,7 @@ translations:

- key: tools_others.non_js_languages
t: Non-JavaScript Languages
- key: tools_others.non_js_languages.description
- key: tools_others.non_js_languages.question
t: Which other programming languages do you use?
- key: tools_others.non_js_languages.others
t: Other Languages
Expand All @@ -1015,7 +1015,7 @@ translations:

- key: tools_others.javascript_flavors
t: JavaScript Flavors
- key: tools_others.javascript_flavors.description
- key: tools_others.javascript_flavors.question
t: Languages that compile to JavaScript
- key: tools_others.javascript_flavors.others
t: Other JavaScript Flavors
Expand All @@ -1029,7 +1029,7 @@ translations:
# first steps
- key: resources.first_steps
t: First Learning Methods
- key: resources.first_steps.description
- key: resources.first_steps.question
t: When first starting out, how did you initially learn coding?
- key: resources.first_steps.others
t: Other First Learning Methods
Expand All @@ -1039,7 +1039,7 @@ translations:
# blogs & magazines
- key: resources.blogs_news_magazines
t: Blogs & Magazines
- key: resources.blogs_news_magazines.description
- key: resources.blogs_news_magazines.question
t: Which blogs/magazines/etc. do you read?
- key: resources.blogs_news_magazines.others
t: Other Blogs & Magazines
Expand All @@ -1049,7 +1049,7 @@ translations:
# sites & courses
- key: resources.sites_courses
t: Sites & Courses
- key: resources.sites_courses.description
- key: resources.sites_courses.question
t: Which sites/courses/etc. do you consult?
- key: resources.sites_courses.others
t: Other Sites & Courses
Expand All @@ -1059,7 +1059,7 @@ translations:
# podcasts
- key: resources.podcasts
t: Podcasts
- key: resources.podcasts.description
- key: resources.podcasts.question
t: Which programming-related podcasts do you listen to?
- key: resources.podcasts.others
t: Other Podcasts
Expand All @@ -1085,7 +1085,7 @@ translations:
# other surveys
- key: resources.other_surveys
t: Other Surveys
- key: resources.other_surveys.description
- key: resources.other_surveys.question
t: Which other developer surveys do you participate in?
- key: resources.other_surveys.others
t: Additional surveys not mentioned above
Loading

0 comments on commit 67e37f6

Please sign in to comment.