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

Commit e62c2449 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-4.2.2_r1.2' of... 

Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/packages/apps/Contacts into cm-10.1

Android 4.2.2 release 1.2

Change-Id: Ieef9f5556c509b8d0a0520def648387d4adafe6b
parents b685d636 5bfbcaf9

res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <string name="starredList" msgid="4817256136413959463">"Označené hvězdičkou"</string>

    <string name="frequentList" msgid="7154768136473953056">"Časté"</string>

    <string name="strequentList" msgid="5640192862059373511">"Oblíbené"</string>

    <string name="viewContactTitle" msgid="7989394521836644384">"Informace o kontaktu"</string>

    <string name="viewContactTitle" msgid="7989394521836644384">"Kontaktní údaje"</string>

    <string name="viewContactDesription" msgid="214186610887547860">"Zobrazit kontakt"</string>

    <string name="editContactDescription" msgid="2947202828256214947">"Upravit kontakt"</string>

    <string name="insertContactDescription" msgid="4709878105452681987">"Vytvořit kontakt"</string>

res/values-da/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ 
    <string name="display_ungrouped" msgid="6885954210243119591">"Alle andre kontaktpersoner"</string>

    <string name="display_all_contacts" msgid="2031647544742889505">"Alle kontaktpersoner"</string>

    <string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"Hvis du fjerner \"<xliff:g id="GROUP">%s</xliff:g>\" fra synkroniseringen, fjernes alle ugrupperede kontaktpersoner fra synkroniseringen."</string>

    <string name="account_phone" product="tablet" msgid="7946049152658522054">"Kun tabletcomputer, ikke synkroniseret"</string>

    <string name="account_phone" product="tablet" msgid="7946049152658522054">"Kun tablet, ikke synkroniseret"</string>

    <string name="account_phone" product="default" msgid="3682950835276226870">"Kun telefon, ikke synkroniseret"</string>

    <string name="call_custom" msgid="7756571794763171802">"Ring til <xliff:g id="CUSTOM">%s</xliff:g>"</string>

    <string name="call_home" msgid="1990519474420545392">"Ring hjem"</string>

res/values-es-rUS/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ 
    <string name="add_new_account" msgid="5748627740680940264">"Agregar una cuenta nueva"</string>

    <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"No se realizó la llamada."</string>

    <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Para configurar el buzón de voz, ve a a Menú &gt; Configuración."</string>

    <string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo de avión."</string>

    <string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo avión."</string>

    <string name="menu_export_database" msgid="2659719297530170820">"Exportar archivos de base de datos"</string>

    <string name="action_menu_overflow_description" msgid="2303272250613084574">"Más opciones"</string>

    <string name="expand_collapse_name_fields_description" msgid="8682630859539604311">"Expandir o contraer campos de nombre"</string>

res/values-ja/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
    <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"表示できる連絡先がありません（アカウントを追加した直後の場合は、連絡先が同期されるまでに数分かかることがあります）。"\n\n"連絡先を追加するには、"<font fgcolor="#ffffffff"><b>"MENU"</b></font>"キーをタップして次の操作を行います:"\n\n<li>"携帯端末と同期可能な連絡先を使ってアカウントを追加またはセットアップする場合は["<font fgcolor="#ffffffff"><b>"アカウント"</b></font>"]をタップします"\n</li>\n<li>"連絡先の表示方法を変更するには["<font fgcolor="#ffffffff"><b>"表示オプション"</b></font>"]をタップします"\n</li>\n<li>"新しい連絡先を最初から作成する場合は["<font fgcolor="#ffffffff"><b>"連絡先を新規登録"</b></font>"]をタップします"\n</li>\n<li>"SDカードから連絡先をインポートする場合は["<font fgcolor="#ffffffff"><b>"インポート/エクスポート"</b></font>"]をタップします"\n</li></string>

    <string name="noFavoritesHelpText" msgid="3744655776704833277">"お気に入りはありません。"\n\n"お気に入りのリストに連絡先を追加するには: "\n\n<li>"["<b>"連絡先"</b>"]タブをタップします"\n</li>" "\n<li>"お気に入りに追加する連絡先をタップします"\n</li>" "\n<li>"連絡先名の横にあるスターをタップします"\n</li></string>

    <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"プッシュホン式キーパッドを使う"</string>

    <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"保留中の通話に戻る"</string>

    <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"通話に戻る"</string>

    <string name="dialer_addAnotherCall" msgid="4205688819890074468">"別の通話を追加"</string>

    <string name="callDetailTitle" msgid="5340227785196217938">"通話詳細"</string>

    <string name="toast_call_detail_error" msgid="7200975244804730096">"通話要求の詳細が読み込めませんでした。"</string>

res/values-pl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    <string name="starredList" msgid="4817256136413959463">"Oznaczony gwiazdką"</string>

    <string name="frequentList" msgid="7154768136473953056">"Częste"</string>

    <string name="strequentList" msgid="5640192862059373511">"Ulubione"</string>

    <string name="viewContactTitle" msgid="7989394521836644384">"Szczegóły kontaktu"</string>

    <string name="viewContactTitle" msgid="7989394521836644384">"Informacje kontaktowe"</string>

    <string name="viewContactDesription" msgid="214186610887547860">"Wyświetl kontakt"</string>

    <string name="editContactDescription" msgid="2947202828256214947">"Edytuj kontakt"</string>

    <string name="insertContactDescription" msgid="4709878105452681987">"Utwórz kontakt"</string>