diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 20:35:32 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 20:35:32 -0800 |
commit | d8c29b8f2327a2df83e606e286d053cfce28ba16 (patch) | |
tree | 84633dc0628aadf6e9ef9d1f516daeb55794e128 /res/values-nb | |
parent | d35875e92b00910f43b4227f22b673a66ca59c6d (diff) | |
parent | 9738c9f6a386eb782d1e98962c6407304eb98f33 (diff) | |
download | packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.zip packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.tar.gz packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.tar.bz2 |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0
Android 6.0.1 release 22
Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff
Diffstat (limited to 'res/values-nb')
-rw-r--r-- | res/values-nb/strings.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 4f609e3..df9b559 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -2512,6 +2512,7 @@ <string name="keywords_default_apps" msgid="3581727483175522599">"standardapper"</string> <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer optimaliseringer hvilemodus app ventemodus"</string> <string name="keywords_color_mode" msgid="4670570451841540200">"krystallklar rgb srgb farge naturlig standard"</string> + <string name="keywords_color_temperature" msgid="2688947724153266364">"fargetemperatur D65 D73 hvit gul blå varm kjølig"</string> <string name="keywords_lockscreen" msgid="4806191868723291541">"dra passord mønster PIN-kode"</string> <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string> <string name="write_tag" msgid="8571858602896222537">"Skriv"</string> @@ -2677,9 +2678,9 @@ <string name="encrypt_require_pin" msgid="2063945047845243752">"Krev PIN-kode for å starte enheten"</string> <string name="encrypt_require_pattern" msgid="6898479411004015810">"Krev mønster for å starte enheten"</string> <string name="encrypt_require_password" msgid="8770628366276570518">"Krev passord for å starte enheten"</string> - <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei takk"</string> - <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei takk"</string> - <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei takk"</string> + <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei, takk"</string> + <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei, takk"</string> + <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei, takk"</string> <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vil du kreve PIN-kode?"</string> <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vil du kreve mønster?"</string> <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vil du kreve passord?"</string> @@ -2900,4 +2901,10 @@ </string-array> <string name="picture_color_mode" msgid="4560755008730283695">"Fargemodus for bilder"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Bruk sRGB"</string> + <!-- no translation found for color_temperature (2070126836910615605) --> + <skip /> + <!-- no translation found for color_temperature_desc (4793729830226404052) --> + <skip /> + <!-- no translation found for color_temperature_toast (4974218172133854827) --> + <skip /> </resources> |