diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-23 09:19:44 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-23 09:19:44 -0800 |
commit | 7d8583532e35cb55aad1b1d2f605ccc6b16a4339 (patch) | |
tree | 70d6e351ef352181cc4569a150c25b37129cb440 | |
parent | b8a837fced3211a3f63ce080331a5085ff83939a (diff) | |
parent | 15dfc2b7b02f79e9c508bf8d1cee2b8a3d5a1b34 (diff) | |
download | IM-donut-plus-aosp.tar.gz |
merge from donutdonut-plus-aosp
-rw-r--r-- | res/values-nb/strings.xml | 36 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index d0b10cf..ea8202e 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="im_label" msgid="6289028202073124911">"Nettprat"</string> - <string name="menu_cancel_signin" msgid="146078926243968887">"Avbryt innlogging"</string> + <string name="menu_cancel_signin" msgid="146078926243968887">"Avbryt pålogging"</string> <string name="menu_add_contact" msgid="6315091944808434095">"Legg til kontakt"</string> <string name="menu_remove_contact" msgid="3306468526492774925">"Fjern kontakt"</string> <string name="menu_block_contact" msgid="727204732836017804">"Blokker kontakt"</string> @@ -24,7 +24,7 @@ <string name="menu_view_accounts" msgid="2876518557188672305">"Kontoliste"</string> <string name="menu_settings" msgid="4609084900756093288">"Innstillinger"</string> <string name="menu_start_chat" msgid="6188262479212139863">"Start samtale"</string> - <string name="menu_sign_out" msgid="2456603636849489202">"Logg ut"</string> + <string name="menu_sign_out" msgid="2456603636849489202">"Logg av"</string> <string name="menu_view_profile" msgid="5883288134525529119">"Vis profil"</string> <string name="menu_end_conversation" msgid="3556567768336552622">"Avslutt samtale"</string> <string name="menu_view_contact_list" msgid="4630377976475003130">"Kontaktliste"</string> @@ -41,18 +41,18 @@ <string name="cancel" msgid="5115511021657936211">"Avbryt"</string> <string name="yes" msgid="4042588907115698888">"OK"</string> <string name="no" msgid="1791024164361629713">"Avbryt"</string> - <string name="signed_out_prompt" msgid="8832702403969474634">"De er blitt logget ut fra <xliff:g id="ACCOUNT">%1$s</xliff:g>."</string> - <string name="signed_out_prompt_with_error" msgid="7747094436931805456">"Du er blitt logget ut fra <xliff:g id="ACCOUNT">%1$s</xliff:g> fordi <xliff:g id="REASON">%2$s</xliff:g>."</string> + <string name="signed_out_prompt" msgid="8832702403969474634">"De er blitt logget av <xliff:g id="ACCOUNT">%1$s</xliff:g>."</string> + <string name="signed_out_prompt_with_error" msgid="7747094436931805456">"Du er blitt logget av <xliff:g id="ACCOUNT">%1$s</xliff:g> fordi <xliff:g id="REASON">%2$s</xliff:g>."</string> <string name="add_account" msgid="3402105687785864337">"Legg til <xliff:g id="ACCOUNT">%1$s</xliff:g>-konto"</string> <string name="label_username" msgid="8704597829337399952">"Brukernavn:"</string> <string name="label_password" msgid="7809879599377131899">"Passord:"</string> <string name="remember_password" msgid="4090719436666073946">"Husk passord."</string> - <string name="keep_me_signed_in" msgid="2883914867912933061">"Logg inn automatisk."</string> + <string name="keep_me_signed_in" msgid="2883914867912933061">"Logg på automatisk."</string> <string name="sign_up" msgid="7071654280992136839">"Mangler du konto?"</string> - <string name="check_auto_sign_in" msgid="308461891031463647">"Dette valget logger deg automatisk inn hver gang du åpner applikasjonen. For å avmerke valget, logg ut og fjern så haken ved «Logg inn automatisk»."</string> - <string name="sign_in" msgid="6204326200860136567">"Logg inn"</string> - <string name="signing_in_to" msgid="2689649632858697221">"Logger inn på <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> - <string name="signing_in_wait" msgid="987357161364666888">"Logger inn…"</string> + <string name="check_auto_sign_in" msgid="308461891031463647">"Dette valget logger deg automatisk på hver gang du åpner applikasjonen. For å avmerke valget, logg av og fjern så haken ved «Logg på automatisk»."</string> + <string name="sign_in" msgid="6204326200860136567">"Logg på"</string> + <string name="signing_in_to" msgid="2689649632858697221">"Logger på <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> + <string name="signing_in_wait" msgid="987357161364666888">"Logger på…"</string> <string name="bg_data_prompt_title" msgid="4861800723853178111">"Bakgrunnsdata deaktivert"</string> <string name="bg_data_prompt_message" msgid="2343305645142823544">"<xliff:g id="PROVIDER">%1$s</xliff:g> trenger at bakgrunnsdata er aktivert."</string> <string name="bg_data_prompt_ok" msgid="3443385427882751532">"Aktiver"</string> @@ -77,7 +77,7 @@ <string name="presence_busy" msgid="3425926873862063910">"Opptatt"</string> <string name="presence_away" msgid="2893687249265559744">"Borte"</string> <string name="presence_idle" msgid="3127526059878228229">"Inaktiv"</string> - <string name="presence_offline" msgid="7946842914359044731">"Avlogget"</string> + <string name="presence_offline" msgid="7946842914359044731">"Frakoblet"</string> <string name="presence_invisible" msgid="1485652711495491831">"Usynlig"</string> <string name="chat_with" msgid="8562954189958846831">"Samtale med <xliff:g id="USER">%1$s</xliff:g>"</string> <string name="me" msgid="8421609599685404593">"Meg"</string> @@ -85,16 +85,16 @@ <string name="contact_online" msgid="4241843267436748586">"<xliff:g id="USER">%1$s</xliff:g> er tilgjengelig"</string> <string name="contact_away" msgid="2333627320542883164">"<xliff:g id="USER">%1$s</xliff:g> er borte"</string> <string name="contact_busy" msgid="9175172991334146704">"<xliff:g id="USER">%1$s</xliff:g> er opptatt"</string> - <string name="contact_offline" msgid="7054903259540426223">"<xliff:g id="USER">%1$s</xliff:g> er avlogget"</string> + <string name="contact_offline" msgid="7054903259540426223">"<xliff:g id="USER">%1$s</xliff:g> er frakoblet"</string> <string name="contact_joined" msgid="6713312815095658394">"<xliff:g id="USER">%1$s</xliff:g> har blitt med i samtalen"</string> <string name="contact_left" msgid="3020686291216941829">"<xliff:g id="USER">%1$s</xliff:g> har forlatt samtalen"</string> <string name="time_stamp" format="date" msgid="8952691401963972802">"'Sendt '<xliff:g id="HOUR">hh</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>', '<xliff:g id="DATE">EEEE</xliff:g>"</string> <string name="send" msgid="2726588254020771734">"Send"</string> <string name="msg_sent_failed" msgid="4209970218075996979">"Kunne ikke sende meldingen."</string> <string name="disconnected_warning" msgid="6798248948843269795">"Mistet tilkoblingen til tjeneren. Meldingen vil bli sendt ved tilkobling."</string> - <string name="contact_offline_warning" msgid="8822964251595561504">"<xliff:g id="USER_0">%1$s</xliff:g> er avlogget. Meldinger du sender vil bli levert når <xliff:g id="USER_1">%1$s</xliff:g> kobler til."</string> + <string name="contact_offline_warning" msgid="8822964251595561504">"<xliff:g id="USER_0">%1$s</xliff:g> er frakoblet. Meldinger du sender vil bli levert når <xliff:g id="USER_1">%1$s</xliff:g> kobler til."</string> <string name="contact_not_in_list_warning" msgid="2411313232707156524">"<xliff:g id="USER">%1$s</xliff:g> er ikke i kontaktlisten."</string> - <string name="select_link_title" msgid="5020179468567358399">"Velg lenke"</string> + <string name="select_link_title" msgid="5020179468567358399">"Velg kobling"</string> <string name="empty_chat_list" msgid="7268903855432844937">"Ingen aktive samtaler."</string> <string name="add_contact_title" msgid="8541795892456911186">"Legg til kontakt"</string> <string name="input_contact_label" msgid="395294356081431462">"E-postadresse til den du ønsker å invitere:"</string> @@ -132,7 +132,7 @@ <string name="perm_label" msgid="203411797893865789">"start lynmeldingstjeneste"</string> <string name="perm_desc" msgid="6978187394092498941">"Tillater applikasjoner å starte lynmeldingstjenesten."</string> <string name="error" msgid="4778856523246532623">"NB"</string> - <string name="login_service_failed" msgid="3883751713470046349">"Kunne ikke logge inn på <xliff:g id="SERVICE">%1$s</xliff:g>. Prøv igjen senere."\n"(Detaljer: <xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string> + <string name="login_service_failed" msgid="3883751713470046349">"Kunne ikke logge på <xliff:g id="SERVICE">%1$s</xliff:g>. Prøv igjen senere."\n"(Detaljer: <xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string> <string name="add_list_failed" msgid="5659371594032378190">"Listen ble ikke lagt til."</string> <string name="block_contact_failed" msgid="5870952543258608424">"Kontakten ble ikke blokkert."</string> <string name="unblock_contact_failed" msgid="7761060327693183076">"Kontakten ble ikke avblokkert."</string> @@ -156,11 +156,11 @@ <string name="domain_not_supported" msgid="7715663042901606605">"Tjeneren støtter ikke videresending til domenet."</string> <string name="unknown_user" msgid="6680215792586778118">"Brukernavnet du skrev inn ble ikke gjenkjent."</string> <string name="recipient_blocked_the_user" msgid="8438323314518151118">"Beklager, du er blokkert av brukeren."</string> - <string name="session_expired" msgid="1999103420742299764">"Sesjonen har gått ut, logg inn på nytt."</string> - <string name="forced_logout" msgid="4914497176506037105">"du er logget inn på en annen klient."</string> - <string name="already_logged_in" msgid="1907391913706263174">"du allerede er logget inn på en annen klient."</string> + <string name="session_expired" msgid="1999103420742299764">"Sesjonen har gått ut, logg på på nytt."</string> + <string name="forced_logout" msgid="4914497176506037105">"du er pålogget med en annen klient."</string> + <string name="already_logged_in" msgid="1907391913706263174">"du allerede er pålogget med en annen klient."</string> <string name="msisdn_error" msgid="1477099919088266968">"Beklager, kan ikke lese telefonnummeret fra SIM-kortet. Kontakt operatøren for hjelp."</string> - <string name="not_signed_in" msgid="8894662143178849906">"Du er ikke logget inn."</string> + <string name="not_signed_in" msgid="8894662143178849906">"Du er ikke pålogget."</string> <string name="general_error" msgid="2784900425265121080">"Feilkode <xliff:g id="CODE">%1$d</xliff:g>"</string> <string-array name="default_smiley_names"> <item msgid="1496436377093882868">"Glad"</item> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 42c2c16..a926b9a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -53,7 +53,7 @@ <string name="sign_in" msgid="6204326200860136567">"登录"</string> <string name="signing_in_to" msgid="2689649632858697221">"正在登录 <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="signing_in_wait" msgid="987357161364666888">"正在登录..."</string> - <string name="bg_data_prompt_title" msgid="4861800723853178111">"背景数据已禁用"</string> + <string name="bg_data_prompt_title" msgid="4861800723853178111">"已停用背景数据"</string> <string name="bg_data_prompt_message" msgid="2343305645142823544">"<xliff:g id="PROVIDER">%1$s</xliff:g> 需要启用背景数据。"</string> <string name="bg_data_prompt_ok" msgid="3443385427882751532">"启用"</string> <string name="bg_data_prompt_cancel" msgid="7206105589826174638">"退出"</string> |