diff options
| author | Nick Kralevich <nnk@google.com> | 2014-11-15 07:30:37 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-11-15 07:30:37 -0800 |
| commit | cbfae3c85bc45154499bf67ec8e9d092c9fb32fd (patch) | |
| tree | afe4f342934b78bf40d63aee1b56325b17629664 /res/values-nb/strings.xml | |
| parent | f38df57cbdfaa2c0d20cac997fdc69406c37d4a9 (diff) | |
| parent | 54245fe0b59e2baa6b5b6af35f675a2a765761e7 (diff) | |
| download | Mms-cbfae3c85bc45154499bf67ec8e9d092c9fb32fd.tar.gz | |
resolved conflicts for merge of 54245fe0 to lmp-mr1-dev-plus-aosp
Change-Id: I7fb5edf704b8ef48c97c86f05a4a752f24154ea7
Diffstat (limited to 'res/values-nb/strings.xml')
| -rw-r--r-- | res/values-nb/strings.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index dfb581e8..b7cd3e65 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -182,8 +182,6 @@ <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Lyd"</string> <string name="pref_messages_to_save" msgid="3202539743892934926">"Angi antall meldinger som skal lagres"</string> <string name="silent_ringtone" msgid="7981237991326592780">"Stille"</string> - <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Spør hvilket SIM-kort som skal brukes hver gang en melding sendes"</string> - <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string> <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autohent"</string> <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hent meldinger automatisk"</string> <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatisk henting ved bruk i utlandet"</string> @@ -355,11 +353,4 @@ <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging er ikke SMS-appen din"</string> <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> er SMS-appen din"</string> <string name="banner_sms_promo_message" msgid="3536714414252763826">"Du kan endre dette i innstillingene."</string> - <string name="sub_select_dialog_title" msgid="8210168935409702285">"Velg SIM-kort"</string> - <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string> - <string name="empty_sim_name" msgid="1008631117599170591">"SIM-spor <xliff:g id="SUBID">%1$d</xliff:g>"</string> - <string name="subSelect_negative" msgid="6139403806707801822">"Avbryt"</string> - <string name="sub_name_container" msgid="4802195955108231738">" <xliff:g id="SUBNAME">%1$s</xliff:g> "</string> - <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string> - <string name="selected_sim_invalid" msgid="2309319911434202998">"SIM-kortet som er valgt for øyeblikket, er ikke satt inn. Velg standard SIM-kort i systeminnstillingene."</string> </resources> |