am 299bb028: resolved conflicts for merge of 6f55d386 to stage-korg-master
* commit '299bb02887bf49144b248409f54fde6bf07d42b6':
Contacts: fix a small grammatical error in the German translation
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2cb7023..675eba3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,7 +46,7 @@
<string name="menu_sendEmail" msgid="7293508859242926187">"Enviar email"</string>
<string name="menu_viewAddress" msgid="1814744325763202024">"Dirección en mapa"</string>
<string name="menu_makeDefaultNumber" msgid="4838759253316649534">"Convertir en número predeterminado"</string>
- <string name="menu_makeDefaultEmail" msgid="2599044610375789994">"Establecer como dirección de correo electrónico predeterminada"</string>
+ <string name="menu_makeDefaultEmail" msgid="2599044610375789994">"Establecer como dirección de email predeterminada"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"Dividir"</string>
<string name="contactsSplitMessage" msgid="5253490235863170269">"Contactos divididos"</string>
<string name="splitConfirmation_title" msgid="6716467920283502570">"Dividir contacto"</string>
@@ -81,7 +81,7 @@
<string name="pickerNewContactHeader" msgid="7750705279843568147">"Crear contacto nuevo"</string>
<string name="selectLabel" msgid="4255424123394910733">"Seleccionar etiqueta"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Teléfono"</string>
- <string name="emailLabelsGroup" msgid="8389931313045344406">"Correo electrónico"</string>
+ <string name="emailLabelsGroup" msgid="8389931313045344406">"Email"</string>
<string name="imLabelsGroup" msgid="3898238486262614027">"MI"</string>
<string name="postalLabelsGroup" msgid="1618078212734693682">"Dirección postal"</string>
<string-array name="otherLabels">
@@ -335,9 +335,9 @@
<string name="sms_mms" msgid="4069352461380762677">"Enviar un mensaje de texto a MMS"</string>
<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_work" msgid="2807430017302722689">"Enviar email al trabajo"</string>
<string name="email_other" msgid="3454004077967657109">"Enviar email"</string>
- <string name="email_custom" msgid="7548003991586214105">"Correo electrónico <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+ <string name="email_custom" msgid="7548003991586214105">"Enviar email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="email" msgid="5668400997660065897">"Email"</string>
<string name="map_home" msgid="1243547733423343982">"Ver dirección de casa"</string>
<string name="map_work" msgid="1360474076921878088">"Ver dirección del trabajo"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4954a0e..d942949 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -36,7 +36,7 @@
<string name="menu_search" msgid="9147752853603483719">"Ara"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Yeni kişi"</string>
<string name="menu_viewContact" msgid="2795575601596468581">"Kişiyi görüntüle"</string>
- <string name="menu_callNumber" msgid="5142851348489387516">"Şunu sesli ara: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="menu_callNumber" msgid="5142851348489387516">"Ara: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Sık kullanılanlara ekle"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Sık kullanılanlardan kaldır"</string>
<string name="menu_editContact" msgid="3452858480713561396">"Kişiyi düzenle"</string>
@@ -140,7 +140,7 @@
<string name="liveFolderFavorites" msgid="3100957542927222282">"Yıldızlı kişiler"</string>
<string name="liveFolderPhone" msgid="3739376066610926780">"Telefon numarası olan kişiler"</string>
<string name="menu_sendTextMessage" msgid="6937343460284499306">"Kısa mesaj gönder"</string>
- <string name="recentCalls_callNumber" msgid="1756372533999226126">"Şunu sesli ara: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="recentCalls_callNumber" msgid="1756372533999226126">"Ara: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Önce numarayı düzenle"</string>
<string name="recentCalls_addToContact" msgid="1429899535546487008">"Kişilere ekle"</string>
<string name="recentCalls_removeFromRecentList" msgid="401662244636511330">"Çağrı kaydından kaldır"</string>