moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 01:32:17 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

Browse Source
This commit is contained in:
iNPUTmice 2014-06-02 21:27:58 +02:00
commit 3db0f688fb
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values-ca/strings.xml
View File

@ -109,7 +109,7 @@
<string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
<string name="pref_ui_options">Opcions de UI</string>
<string name="pref_use_phone_self_picture">Utilitza l\'avatar de l\'usuari del mòbil</string>
<string name="pref_use_phone_sefl_picture_summary">Podries no diferenciar quin compte estàs usant a la conversa</string>
<string name="pref_use_phone_self_picture_summary">Podries no diferenciar quin compte estàs usant a la conversa</string>
<string name="pref_conference_name">Nom de la conferència</string>
<string name="pref_conference_name_summary">Utilitza l\'assumpte de la sala per identificar Conferències</string>
<string name="pref_advanced_options">Opcions avançades</string>

2
res/values-de/strings.xml
View File

@ -112,7 +112,7 @@
<string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach erhalt einer Nachricht die von einem anderen Client von Dir kommt.</string>
<string name="pref_ui_options">Aussehen</string>
<string name="pref_use_phone_self_picture">Benutze Dein Kontaktbild</string>
<string name="pref_use_phone_sefl_picture_summary">Wenn du mehrere Accounts hast bist du eventuell nicht mehr in der Lage diese auseinander zu halten.</string>
<string name="pref_use_phone_self_picture_summary">Wenn du mehrere Accounts hast bist du eventuell nicht mehr in der Lage diese auseinander zu halten.</string>
<string name="pref_conference_name">Konferenznamen</string>
<string name="pref_conference_name_summary">Benutze das Thema der Konferenz als Name in der Überschicht</string>
<string name="pref_advanced_options">Erweiterte Optionen</string>

2
res/values-es/strings.xml
View File

@ -138,7 +138,7 @@
<string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
<string name="pref_ui_options">Opciones de interfaz</string>
<string name="pref_use_phone_self_picture">Usar foto del teléfono</string>
<string name="pref_use_phone_sefl_picture_summary">Podrías no ser capaz de distinguir que cuenta está utlizando en una conversación</string>
<string name="pref_use_phone_self_picture_summary">Podrías no ser capaz de distinguir que cuenta está utlizando en una conversación</string>
<string name="pref_conference_name">Nombre de la conferencia</string>
<string name="pref_conference_name_summary">Usa el nombre de la sala para identificar Conferencias</string>
<string name="pref_advanced_options">Opciones avanzadas</string>

2
res/values-eu/strings.xml
View File

@ -136,7 +136,7 @@
<string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
<string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
<string name="pref_use_phone_self_picture">Telefonoaren kontaktu argazkia erabili</string>
<string name="pref_use_phone_sefl_picture_summary">Baliteke elkarrizketa batean zein kontu erabiltzen ari zaren gehiago ez bereiztea</string>
<string name="pref_use_phone_self_picture_summary">Baliteke elkarrizketa batean zein kontu erabiltzen ari zaren gehiago ez bereiztea</string>
<string name="pref_conference_name">Konferentziaren izena</string>
<string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko</string>
<string name="pref_advanced_options">Aukera aurreratuak</string>

2
res/values-fr/strings.xml
View File

@ -112,7 +112,7 @@
<string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
<string name="pref_ui_options">Options d\'affichage</string>
<string name="pref_use_phone_self_picture">Utiliser les images des contacts</string>
<string name="pref_use_phone_sefl_picture_summary">Vous pourriez ne plus être capable de distinguer quel compte vous utilisez dans une conversation.</string>
<string name="pref_use_phone_self_picture_summary">Vous pourriez ne plus être capable de distinguer quel compte vous utilisez dans une conversation.</string>
<string name="pref_conference_name">Nom de la conférence</string>
<string name="pref_conference_name_summary">Identifier la conférence par son sujet</string>
<string name="pref_advanced_options">Options avancées</string>

2
res/values-gl/strings.xml
View File

@ -114,7 +114,7 @@
<string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
<string name="pref_ui_options">Opcións de interfaz</string>
<string name="pref_use_phone_self_picture">Usar a foto do teléfono</string>
<string name="pref_use_phone_sefl_picture_summary">Poderías non ser capaz de distinguir que conta estase a utlizar nunha conversa</string>
<string name="pref_use_phone_self_picture_summary">Poderías non ser capaz de distinguir que conta estase a utlizar nunha conversa</string>
<string name="pref_conference_name">Nome dea conferencia</string>
<string name="pref_conference_name_summary">Usa o nome da sala para identificar Conferencias</string>
<string name="pref_advanced_options">Opcións avanzadas</string>

2
res/values/strings.xml
View File

@ -139,7 +139,7 @@
<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
<string name="pref_ui_options">UI Options</string>
<string name="pref_use_phone_self_picture">Use Phones self contact picture</string>
<string name="pref_use_phone_sefl_picture_summary">You may no longer be able to distinguish which account you are using in a conversation</string>
<string name="pref_use_phone_self_picture_summary">You may no longer be able to distinguish which account you are using in a conversation</string>
<string name="pref_conference_name">Conference name</string>
<string name="pref_conference_name_summary">Use room’s subject to identify Conferences</string>
<string name="pref_advanced_options">Advanced Options</string>

2
res/xml/preferences.xml
View File

@ -59,7 +59,7 @@
<CheckBoxPreference
android:key="show_phone_selfcontact_picture"
android:title="@string/pref_use_phone_self_picture"
android:summary="@string/pref_use_phone_sefl_picture_summary"
android:summary="@string/pref_use_phone_self_picture_summary"
android:defaultValue="true"/>
<CheckBoxPreference
android:key="use_subject_in_muc"