summaryrefslogtreecommitdiffstats
path: root/res/values-fi
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-16 00:47:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-16 00:47:22 +0000
commit628d83e736f2f9e606327f3debe2930bb24a83e9 (patch)
tree2e4ba8ceb1a3b58ce5394f15defeb376c473d103 /res/values-fi
parent1d050220a0564b02bc1f4c33c5984a684a47bfa5 (diff)
parentc85ca8ad20c7eb0b784687bd15f803674845db3d (diff)
downloadpackages_apps_Settings-628d83e736f2f9e606327f3debe2930bb24a83e9.zip
packages_apps_Settings-628d83e736f2f9e606327f3debe2930bb24a83e9.tar.gz
packages_apps_Settings-628d83e736f2f9e606327f3debe2930bb24a83e9.tar.bz2
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Diffstat (limited to 'res/values-fi')
-rw-r--r--res/values-fi/arrays.xml17
-rw-r--r--res/values-fi/strings.xml3
2 files changed, 13 insertions, 7 deletions
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 2c02c6f..4f2c0d7 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -338,12 +338,17 @@
<item msgid="2560532955514699713">"Keskipitkä"</item>
<item msgid="2372711992605524591">"Pitkä"</item>
</string-array>
- <!-- no translation found for captioning_typeface_selector_titles:3 (7247838127505318669) -->
- <!-- no translation found for captioning_typeface_selector_titles:4 (4478414822462359763) -->
- <!-- no translation found for captioning_typeface_selector_titles:5 (7502451783483660829) -->
- <!-- no translation found for captioning_typeface_selector_titles:6 (639503332147461010) -->
- <!-- no translation found for captioning_typeface_selector_titles:7 (7967169925231332424) -->
- <!-- no translation found for captioning_typeface_selector_titles:8 (561832997193039673) -->
+ <string-array name="captioning_typeface_selector_titles">
+ <item msgid="1319652728542138112">"Oletus"</item>
+ <item msgid="1016452621833735880">"Sans Serif"</item>
+ <item msgid="2496277987934654454">"Sans Serif, tiivistetty"</item>
+ <item msgid="7247838127505318669">"Sans Serif Monospace"</item>
+ <item msgid="4478414822462359763">"Serif"</item>
+ <item msgid="7502451783483660829">"Serif Monospace"</item>
+ <item msgid="639503332147461010">"Casual"</item>
+ <item msgid="7967169925231332424">"Kursiivi"</item>
+ <item msgid="561832997193039673">"Isot kirjaimet"</item>
+ </string-array>
<string-array name="captioning_font_size_selector_titles">
<item msgid="4800919809575254054">"Hyvin pieni"</item>
<item msgid="6781094565687692782">"Pieni"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 465b07b..38de950 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2452,7 +2452,8 @@
<string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Ei käytössä"</string>
<string name="screen_pinning_title" msgid="2292573232264116542">"Näytön kiinnitys"</string>
- <string name="screen_pinning_description" msgid="3022868253807792488">"Kun asetus on käytössä, voit asettaa laitteen tilaan, joka pitää nykyisen näytön näkyvissä.\n\nNäytön kiinnittäminen:\n\n1. Ota asetus käyttöön.\n\n2. Avaa sovellus.\n\n3. Kosketa Viimeaikaiset-painiketta.\n\n4. Kosketa kiinnityskuvaketta."</string>
+ <!-- no translation found for screen_pinning_description (7091642350452605379) -->
+ <skip />
<string name="managed_user_title" msgid="8101244883654409696">"Työprofiili"</string>
<string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
<string name="display_auto_rotate_title" msgid="6176450657107806043">"Kun laite käännetään"</string>