Skip to content

Commit

Permalink
Merge branch 'release/1.0.21'
Browse files Browse the repository at this point in the history
  • Loading branch information
felliott committed Dec 22, 2017
2 parents 1d6b638 + a4be93f commit 93676a0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/components/language-picker/countries.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const languagesForProduction = [
"ar", "bg", "cs", "da", "de", "el", "en", "es", "es-co", "et", "fi", "fr",
"he", "hi", "hr", "hu", "id", "is", "it", "ja", "ka", "ko", "lt", "lv",
"mk", "mr", "ms", "nl", "no", "pl", "pt", "pt-pt", "ro", "ru",
"sk", "sl", "sr", "th", "tr", "uk", "vi", "zh", "zh-hk"
"sk", "sl", "sr", "sv", "th", "tr", "uk", "vi", "zh", "zh-hk"
];


Expand Down
12 changes: 6 additions & 6 deletions app/locales/fi/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ export default {
"label": "Oliko kuvailemasi tilanne kokonaisuudessaan myönteinen vai kielteinen kokemus?",
"options": {
"extremelyNeg": "Erittäin kielteinen",
"extremelyPos": "Erittäin kielteinen",
"extremelyPos": "Erittäin myönteinen",
"fairlyNeg": "Melko kielteinen",
"fairlyPos": "Melko kielteinen",
"fairlyPos": "Melko myönteinen",
"neither": "Ei myönteinen eikä kielteinen",
"quiteNeg": "Hyvin kielteinen",
"quitePos": "Hyvin kielteinen",
"quitePos": "Hyvin myönteinen",
"somewhatNeg": "Jokseenkin kielteinen",
"somewhatPos": "Jokseenkin kielteinen"
"somewhatPos": "Jokseenkin myönteinen"
}
},
"10": {
Expand Down Expand Up @@ -813,7 +813,7 @@ export default {
"label": "Pyydämme sinua nyt arvioimaan, kuinka samaa tai eri mieltä olet seuraavista väitteistä.",
"options": {
"believeLittle": "Jokseenkin samaa mieltä",
"believeStrong": "Vahvasti eri mieltä",
"believeStrong": "Vahvasti samaa mieltä",
"disbelieveLittle": "Jokseenkin eri mieltä",
"disbelieveStrong": "Vahvasti eri mieltä",
"neutral": "Ei mielipidettä",
Expand Down Expand Up @@ -1103,4 +1103,4 @@ export default {
"personalityFeedbackButton": "Siirry palautteeseen persoonallisuudestani",
"title": "Kiitos!"
}
};
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "isp",
"version": "1.0.20",
"version": "1.0.21",
"description": "International Situations Project (ISP)",
"private": true,
"directories": {
Expand Down

0 comments on commit 93676a0

Please sign in to comment.