Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead3ac85 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 4dd2f26d 376bb3be

res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ 
    <string name="email_home" msgid="8573740658148184279">"E-mail domů"</string>

    <string name="email_mobile" msgid="2042889209787989814">"E-mail na mobil"</string>

    <string name="email_work" msgid="2807430017302722689">"E-mail do práce"</string>

    <string name="email_other" msgid="8093933498541795832">"E-mail ostatní"</string>

    <string name="email_other" msgid="8093933498541795832">"E-mail (další)"</string>

    <string name="email_custom" msgid="7548003991586214105">"E-mail <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="email" msgid="5668400997660065897">"E-mail"</string>

    <string name="map_home" msgid="1243547733423343982">"Zobrazit adresu domů"</string>

res/values-es/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ 
    <string name="email_home" msgid="8573740658148184279">"Enviar email a casa"</string>

    <string name="email_mobile" msgid="2042889209787989814">"Enviar email al móvil"</string>

    <string name="email_work" msgid="2807430017302722689">"Enviar email a trabajo"</string>

    <string name="email_other" msgid="8093933498541795832">"Enviar email a otro"</string>

    <string name="email_other" msgid="8093933498541795832">"Enviar correo electrónico"</string>

    <string name="email_custom" msgid="7548003991586214105">"Correo electrónico <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="email" msgid="5668400997660065897">"Correo electrónico"</string>

    <string name="map_home" msgid="1243547733423343982">"Ver dirección de casa"</string>
@@ -403,12 +403,12 @@ 
    <string name="postal_region" msgid="6045263193478437672">"Provincia/Estado"</string>

    <string name="postal_postcode" msgid="572136414136673751">"Código postal"</string>

    <string name="postal_country" msgid="7638264508416368690">"País"</string>

    <string name="name_given" msgid="1687286314106019813">"Nombre de pila"</string>

    <string name="name_given" msgid="1687286314106019813">"Nombre"</string>

    <string name="name_family" msgid="3416695586119999058">"Apellidos"</string>

    <string name="name_prefix" msgid="59756378548779822">"Prefijo del nombre"</string>

    <string name="name_middle" msgid="8467433655992690326">"Segundo nombre"</string>

    <string name="name_suffix" msgid="3855278445375651441">"Sufijo del nombre"</string>

    <string name="name_phonetic_given" msgid="6853570431394449191">"Nombre de pila fonético"</string>

    <string name="name_phonetic_given" msgid="6853570431394449191">"Nombre fonético"</string>

    <string name="name_phonetic_middle" msgid="8643721493320405200">"Segundo nombre fonético"</string>

    <string name="name_phonetic_family" msgid="462095502140180305">"Apellido fonético"</string>

    <string name="split_label" msgid="8262112659919449087">"Desagrupar"</string>

res/values-fr/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
    <string name="select_group_title" msgid="7955698611959835612">"Groupes"</string>

    <string name="groupEmpty" msgid="6661950109828194595">"Votre groupe \"<xliff:g id="GROUPNAME">%s</xliff:g>\" est vide."</string>

    <string name="showAllGroups" msgid="5164410117611094297">"Tous les contacts"</string>

    <string name="showFilterPhones" msgid="4184858075465653970">"Uniquement les contacts avec un téléphone"</string>

    <string name="showFilterPhones" msgid="4184858075465653970">"Contacts avec un n° de tél."</string>

    <string name="showFilterPhonesDescrip" msgid="6644443248815191067">"Afficher uniquement les contacts avec un numéro de téléphone"</string>

    <string name="headerContactGroups" msgid="2426134991932503843">"Choisissez les contacts à afficher."</string>

  <plurals name="groupDescrip">
@@ -172,7 +172,7 @@ 
    <string name="socialStreamIconLabel" msgid="4367712449555075376">"Social"</string>

    <string name="contactsIconLabel" msgid="7666609097606552806">"Contacts"</string>

    <string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoris"</string>

    <string name="dialerIconLabel" msgid="6500826552823403796">"Tel."</string>

    <string name="dialerIconLabel" msgid="6500826552823403796">"Tél."</string>

    <string name="recentCallsIconLabel" msgid="1419116422359067949">"Appels"</string>

    <string name="liveFolderAll" msgid="4789010460767506206">"Tous les contacts"</string>

    <string name="liveFolderFavorites" msgid="3100957542927222282">"Contacts suivis"</string>
@@ -199,7 +199,7 @@ 
    <string name="noContactsHelpTextWithSync" msgid="3734101165712848179">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte comportant des contacts que vous pourrez synchroniser sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer une entrée ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter."</b></font>\n</li></string>

    <string name="noContactsNoSimHelpText" msgid="6553845386917463292">"Vous n\'avez aucun contact à afficher."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter."</b></font>\n</li></string>

    <string name="noContactsNoSimHelpTextWithSync" msgid="1122296298361373488">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte comportant des contacts que vous pourrez synchroniser sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer une entrée ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter."</b></font>\n</li></string>

    <string name="noFavoritesHelpText" msgid="3744655776704833277">"Vous ne disposez d\'aucun favori."\n\n"Pour ajouter un contact à la liste de favoris :"\n\n" "<li>"Appuyez sur l\'onglet "<b>"Contacts"</b>"."\n</li>" "\n<li>"Appuyez sur le contact à ajouter à vos favoris."\n</li>" "\n<li>"Appuyez sur l\'étoile en regard du nom du contact."\n</li></string>

    <string name="noFavoritesHelpText" msgid="3744655776704833277">"Aucun favori."\n\n"Pour ajouter un contact à la liste de favoris :"\n\n" "<li>"Appuyez sur l\'onglet "<b>"Contacts"</b>"."\n</li>" "\n<li>"Appuyez sur le contact à ajouter à vos favoris."\n</li>" "\n<li>"Appuyez sur l\'étoile en regard du nom du contact."\n</li></string>

    <string name="seclectSyncGroups_title" msgid="1235432026231325655">"Sélectionner les groupes à synchroniser"</string>

    <string name="liveFolder_all_label" msgid="5961411940473276616">"Tous les contacts"</string>

    <string name="liveFolder_favorites_label" msgid="2674341514070517105">"Suivis"</string>

res/values-it/strings.xml

+25 −25
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <string name="menu_editContact" msgid="3452858480713561396">"Modifica contatto"</string>

    <string name="menu_deleteContact" msgid="1916555454274101750">"Elimina contatto"</string>

    <string name="menu_call" msgid="3992595586042260618">"Chiama contatto"</string>

    <string name="menu_sendSMS" msgid="5535886767547006515">"Invia SMS a n. contatto"</string>

    <string name="menu_sendSMS" msgid="5535886767547006515">"Invia SMS a contatto"</string>

    <string name="menu_sendEmail" msgid="7293508859242926187">"Invia email"</string>

    <string name="menu_viewAddress" msgid="1814744325763202024">"Indirizzo su mappa"</string>

    <string name="menu_makeDefaultNumber" msgid="4838759253316649534">"Rendi numero predefinito"</string>
@@ -336,12 +336,12 @@ 
    <string name="account_phone" msgid="4025734638492419713">"Solo su telefono (non sincronizzato)"</string>

    <string name="label_email_display_name" msgid="5537802602754309600">"Nome visualizzato"</string>

    <string name="call_custom" msgid="7756571794763171802">"Chiama n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="call_home" msgid="1990519474420545392">"Chiama n. casa"</string>

    <string name="call_mobile" msgid="7502236805487609178">"Chiama n. cellulare"</string>

    <string name="call_work" msgid="5328785911463744028">"Chiama n. ufficio"</string>

    <string name="call_fax_work" msgid="7467763592359059243">"Chiama n. fax ufficio"</string>

    <string name="call_home" msgid="1990519474420545392">"Chiama casa"</string>

    <string name="call_mobile" msgid="7502236805487609178">"Chiama cellulare"</string>

    <string name="call_work" msgid="5328785911463744028">"Chiama ufficio"</string>

    <string name="call_fax_work" msgid="7467763592359059243">"Chiama fax ufficio"</string>

    <string name="call_fax_home" msgid="8342175628887571876">"Chiama n. fax casa"</string>

    <string name="call_pager" msgid="9003902812293983281">"Chiama n. cercapersone"</string>

    <string name="call_pager" msgid="9003902812293983281">"Chiama cercapersone"</string>

    <string name="call_other" msgid="5605584621798108205">"Chiama altro"</string>

    <string name="call_callback" msgid="1910165691349426858">"Chiama n. callback"</string>

    <string name="call_car" msgid="3280537320306436445">"Chiama n. automobile"</string>
@@ -349,18 +349,18 @@ 
    <string name="call_isdn" msgid="1541590690193403411">"Chiama n. ISDN"</string>

    <string name="call_main" msgid="6082900571803441339">"Chiama n. principale"</string>

    <string name="call_other_fax" msgid="7777261153532968503">"Chiama n. altro fax"</string>

    <string name="call_radio" msgid="8296755876398357063">"Chiama n. segnale cellulare"</string>

    <string name="call_telex" msgid="2223170774548648114">"Chiama n. telex"</string>

    <string name="call_radio" msgid="8296755876398357063">"Chiama radiotelefono"</string>

    <string name="call_telex" msgid="2223170774548648114">"Chiama telex"</string>

    <string name="call_tty_tdd" msgid="8951266948204379604">"Chiama n. TTY/TDD"</string>

    <string name="call_work_mobile" msgid="8707874281430105394">"Chiama n. cellulare ufficio"</string>

    <string name="call_work_pager" msgid="3419348514157949008">"Chiama n. cercapersone ufficio"</string>

    <string name="call_work_mobile" msgid="8707874281430105394">"Chiama cellulare lavoro"</string>

    <string name="call_work_pager" msgid="3419348514157949008">"Chiama cercapersone ufficio"</string>

    <string name="call_assistant" msgid="2141641383068514308">"Chiama <xliff:g id="ASSISTANT">%s</xliff:g>"</string>

    <string name="call_mms" msgid="6274041545876221437">"Chiama n. MMS"</string>

    <string name="sms_custom" msgid="5932736853732191825">"Invia SMS a n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="sms_home" msgid="7524332261493162995">"Invia SMS a n. casa"</string>

    <string name="sms_mobile" msgid="5200107250451030769">"Invia SMS a n. cellulare"</string>

    <string name="sms_work" msgid="2269624156655267740">"Invia SMS a n. ufficio"</string>

    <string name="sms_fax_work" msgid="8028189067816907075">"Invia SMS a n. fax ufficio"</string>

    <string name="sms_mobile" msgid="5200107250451030769">"Invia SMS a cellulare"</string>

    <string name="sms_work" msgid="2269624156655267740">"Invia SMS a ufficio"</string>

    <string name="sms_fax_work" msgid="8028189067816907075">"Invia SMS a fax ufficio"</string>

    <string name="sms_fax_home" msgid="9204042076306809634">"Invia SMS a n. fax casa"</string>

    <string name="sms_pager" msgid="7730404569637015192">"Invia SMS a n. cercapersone"</string>

    <string name="sms_other" msgid="5131921487474531617">"Invia SMS ad altro"</string>
@@ -370,11 +370,11 @@ 
    <string name="sms_isdn" msgid="8153785037515047845">"Invia SMS a n. ISDN"</string>

    <string name="sms_main" msgid="8621625784504541679">"Invia SMS a n. principale"</string>

    <string name="sms_other_fax" msgid="3930666870074006114">"Invia SMS a n. altro fax"</string>

    <string name="sms_radio" msgid="3329166673433967820">"Invia SMS a n. segnale cellulare"</string>

    <string name="sms_radio" msgid="3329166673433967820">"Invia SMS a radiotelefono"</string>

    <string name="sms_telex" msgid="9034802430065267848">"Invia SMS a n. telex"</string>

    <string name="sms_tty_tdd" msgid="6782284969132531532">"Invia SMS a n. TTY/TDD"</string>

    <string name="sms_work_mobile" msgid="2459939960512702560">"Invia SMS a n. cellulare ufficio"</string>

    <string name="sms_work_pager" msgid="5566924423316960597">"Invia SMS a n. cercapersone ufficio"</string>

    <string name="sms_work_mobile" msgid="2459939960512702560">"Invia SMS a cellulare lavoro"</string>

    <string name="sms_work_pager" msgid="5566924423316960597">"Invia SMS a cercapersone ufficio"</string>

    <string name="sms_assistant" msgid="2773424339923116234">"Invia SMS ad <xliff:g id="ASSISTANT">%s</xliff:g>"</string>

    <string name="sms_mms" msgid="4069352461380762677">"Invia SMS a n. MMS"</string>

    <string name="email_home" msgid="8573740658148184279">"Invia email a ind. casa"</string>
@@ -383,18 +383,18 @@ 
    <string name="email_other" msgid="8093933498541795832">"Invia email ad altro"</string>

    <string name="email_custom" msgid="7548003991586214105">"Invia email a ind. <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="email" msgid="5668400997660065897">"Email"</string>

    <string name="map_home" msgid="1243547733423343982">"Visualizza indirizzo di casa"</string>

    <string name="map_home" msgid="1243547733423343982">"Visualizza indirizzo casa"</string>

    <string name="map_work" msgid="1360474076921878088">"Visualizza indirizzo ufficio"</string>

    <string name="map_other" msgid="5560707927535653892">"Visualizza altro indirizzo"</string>

    <string name="map_custom" msgid="6184363799976265281">"Visualizza indirizzo <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="chat_aim" msgid="2588492205291249142">"Chatta tramite AIM"</string>

    <string name="chat_msn" msgid="8041633440091073484">"Chatta tramite Windows Live"</string>

    <string name="chat_yahoo" msgid="6629211142719943666">"Chatta tramite Yahoo"</string>

    <string name="chat_skype" msgid="1210045020427480566">"Chatta tramite Skype"</string>

    <string name="chat_qq" msgid="4294637812847719693">"Chatta tramite QQ"</string>

    <string name="chat_gtalk" msgid="981575737258117697">"Chatta tramite Google Talk"</string>

    <string name="chat_icq" msgid="8438405386153745775">"Chatta tramite ICQ"</string>

    <string name="chat_jabber" msgid="7561444230307829609">"Chatta tramite Jabber"</string>

    <string name="chat_aim" msgid="2588492205291249142">"Chatta su AIM"</string>

    <string name="chat_msn" msgid="8041633440091073484">"Chatta su Windows Live"</string>

    <string name="chat_yahoo" msgid="6629211142719943666">"Chatta su Yahoo"</string>

    <string name="chat_skype" msgid="1210045020427480566">"Chatta su Skype"</string>

    <string name="chat_qq" msgid="4294637812847719693">"Chatta su QQ"</string>

    <string name="chat_gtalk" msgid="981575737258117697">"Chatta su Google Talk"</string>

    <string name="chat_icq" msgid="8438405386153745775">"Chatta su ICQ"</string>

    <string name="chat_jabber" msgid="7561444230307829609">"Chatta su Jabber"</string>

    <string name="chat" msgid="9025361898797412245">"Chatta"</string>

    <string name="postal_street" msgid="8133143961580058972">"Indirizzo postale"</string>

    <string name="postal_pobox" msgid="4431938829180269821">"Casella postale"</string>

res/values-ko/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ 
    <string name="call_fax_work" msgid="7467763592359059243">"직장 팩스로 전화걸기"</string>

    <string name="call_fax_home" msgid="8342175628887571876">"집 팩스로 전화걸기"</string>

    <string name="call_pager" msgid="9003902812293983281">"호출기로 전화걸기"</string>

    <string name="call_other" msgid="5605584621798108205">"기타 연락처로 전화걸기"</string>

    <string name="call_other" msgid="5605584621798108205">"다른 연락처로 전화걸기"</string>

    <string name="call_callback" msgid="1910165691349426858">"콜백 번호로 전화 걸기"</string>

    <string name="call_car" msgid="3280537320306436445">"카폰으로 전화걸기"</string>

    <string name="call_company_main" msgid="6105120947138711257">"회사 기본전화로 전화걸기"</string>
@@ -363,7 +363,7 @@ 
    <string name="sms_fax_work" msgid="8028189067816907075">"직장 팩스로 문자 보내기"</string>

    <string name="sms_fax_home" msgid="9204042076306809634">"집 팩스로 문자 보내기"</string>

    <string name="sms_pager" msgid="7730404569637015192">"호출기로 문자 보내기"</string>

    <string name="sms_other" msgid="5131921487474531617">"기타 연락처로 문자 보내기"</string>

    <string name="sms_other" msgid="5131921487474531617">"다른 연락처로 문자 보내기"</string>

    <string name="sms_callback" msgid="5004824430094288752">"콜백 번호로 문자 보내기"</string>

    <string name="sms_car" msgid="7444227058437359641">"카폰으로 문자 보내기"</string>

    <string name="sms_company_main" msgid="118970873419678087">"회사 기본전화로 문자 보내기"</string>
@@ -380,7 +380,7 @@ 
    <string name="email_home" msgid="8573740658148184279">"집으로 이메일 보내기"</string>

    <string name="email_mobile" msgid="2042889209787989814">"모바일로 이메일 보내기"</string>

    <string name="email_work" msgid="2807430017302722689">"직장으로 이메일 보내기"</string>

    <string name="email_other" msgid="8093933498541795832">"기타 연락처로 이메일 보내기"</string>

    <string name="email_other" msgid="8093933498541795832">"다른 연락처로 이메일 보내기"</string>

    <string name="email_custom" msgid="7548003991586214105">"이메일(<xliff:g id="CUSTOM">%s</xliff:g>)"</string>

    <string name="email" msgid="5668400997660065897">"이메일"</string>

    <string name="map_home" msgid="1243547733423343982">"집 주소 보기"</string>