aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--res/values-ca/arrays.xml4
-rw-r--r--res/values-ca/strings.xml15
-rw-r--r--res/values-de/arrays.xml4
-rw-r--r--res/values-de/strings.xml5
-rw-r--r--res/values-es/arrays.xml5
-rw-r--r--res/values-es/strings.xml3
-rw-r--r--res/values-eu/arrays.xml4
-rw-r--r--res/values-eu/strings.xml3
-rw-r--r--res/values-fr/arrays.xml4
-rw-r--r--res/values-fr/strings.xml3
-rw-r--r--res/values-gl/arrays.xml4
-rw-r--r--res/values-gl/strings.xml8
-rw-r--r--res/values-he/arrays.xml4
-rw-r--r--res/values-he/strings.xml4
-rw-r--r--res/values-nl/arrays.xml4
-rw-r--r--res/values-nl/strings.xml7
-rw-r--r--res/values-ru/arrays.xml4
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-sv/arrays.xml4
-rw-r--r--res/values-sv/strings.xml3
-rw-r--r--res/values/arrays.xml5
-rw-r--r--res/values/attrs.xml10
-rw-r--r--res/values/themes.xml6
23 files changed, 78 insertions, 38 deletions
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 47738ec3..ff1a0d4b 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mòbil</item>
<item>Telèfon</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b9b2c532..cfbe428b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -60,11 +60,11 @@
<string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
<string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
<string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
- <string name="pref_xmpp_resource">Recursos XMPP</string>
+ <string name="pref_xmpp_resource">Recursos XMPP</string>
<string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
- <string name="pref_accept_files">Acceptar fitxers</string>
- <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
- <string name="pref_notification_settings">Ajustos de notificacions</string>
+ <string name="pref_accept_files">Acceptar fitxers</string>
+ <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
+ <string name="pref_notification_settings">Ajustos de notificacions</string>
<string name="pref_notifications">Notificacions</string>
<string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
<string name="pref_vibrate">Vibra</string>
@@ -77,6 +77,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_advanced_options">Opcions avançades</string>
<string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
- <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
-
-</resources>
+ <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
+ <string name="pref_ui_options">Opcions de UI</string>
+
+</resources> \ No newline at end of file
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e095ed14..e468f478 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobile</item>
<item>Phone</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4267f483..e653147d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string name="app_name">Conversations</string>
<string name="action_settings">Einstellungen</string>
<string name="action_add">Neue Unterhaltung</string>
@@ -230,4 +231,6 @@
<string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
<string name="additional_information">Zusätzliche Informationen</string>
<string name="skip">Überspringen</string>
-</resources>
+ <string name="pref_ui_options">Benutzeroberfläche</string>
+
+</resources> \ No newline at end of file
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 48996a69..15231955 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Móvil</item>
<item>Teléfono</item>
@@ -26,6 +27,7 @@
<item>8 horas</item>
<item>Hasta nuevo aviso</item>
</string-array>
+
<integer-array name="mute_options_durations">
<item>1800</item>
<item>3600</item>
@@ -33,4 +35,5 @@
<item>28800</item>
<item>-1</item>
</integer-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 53e45ed1..d6fbc7cb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -254,4 +254,5 @@
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
<string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
<string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 21b20afb..eed87d35 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mugikorra</item>
<item>Telefonoa</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8b5d9254..2ca26c3d 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -230,5 +230,6 @@
<string name="server_info_session_established">Uneko saioa ezarri da</string>
<string name="additional_information">Informazio gehiago</string>
<string name="skip">Orain ez</string>
+ <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
-</resources>
+</resources> \ No newline at end of file
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 97842906..ae140796 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobile</item>
<item>Téléphone</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index df9ab3f5..e15ef416 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -207,5 +207,6 @@
<string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
<string name="add_back">Ajouter également</string>
<string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
+ <string name="pref_ui_options">Options d\'affichage</string>
-</resources>
+</resources> \ No newline at end of file
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 95c99077..19424a78 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Móvil</item>
<item>Teléfono</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ae488614..58116463 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -66,9 +66,9 @@
<string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
<string name="pref_xmpp_resource">Recurso</string>
<string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
- <string name="pref_accept_files">Aceptar arquivos</string>
+ <string name="pref_accept_files">Aceptar arquivos</string>
<string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string>
- <string name="pref_notification_settings">Axustes de notificación</string>
+ <string name="pref_notification_settings">Axustes de notificación</string>
<string name="pref_notifications">Notificacións</string>
<string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
<string name="pref_vibrate">Tremer</string>
@@ -125,4 +125,6 @@
<string name="save">Gardar</string>
<string name="passwords_do_not_match">As contrasinais non coinciden</string>
<string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
-</resources>
+ <string name="pref_ui_options">Opcións de interfaz</string>
+
+</resources> \ No newline at end of file
diff --git a/res/values-he/arrays.xml b/res/values-he/arrays.xml
index 1895dee5..28768d6c 100644
--- a/res/values-he/arrays.xml
+++ b/res/values-he/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>נייד</item>
<item>טלפון</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 65684cd7..fd8eaa0b 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -219,4 +219,6 @@
<string name="private_message">בפרטי</string>
<string name="private_message_to">בפרטי אל %s</string>
<string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
-</resources>
+ <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
+
+</resources> \ No newline at end of file
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 1a464a5a..9ced79f4 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobiel</item>
<item>Telefoon</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 97b67224..7b3faca9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -153,7 +153,7 @@
<string name="confirm_password">Bevestig wachtwoord</string>
<string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
<string name="invalid_jid">Dit is geen geldig Jabber ID</string>
- <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
+ <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
<string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string>
<string name="contact_status_online">online</string>
<string name="contact_status_free_to_chat">beschikbaar</string>
@@ -178,7 +178,6 @@
<string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
<string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
<string name="reception_failed">Ontvangen mislukt</string>
-
<string name="join_conference">Aan groepsconversatie deelnemen</string>
<string name="invite_contact">Contact uitnodigen</string>
<string name="your_fingerprint">Uw vingerafdruk</string>
@@ -229,4 +228,6 @@
<string name="server_info_session_established">Huidige sessie opgezet</string>
<string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string>
<string name="server_info_available">beschikbaar</string>
-</resources>
+ <string name="pref_ui_options">UI Opties</string>
+
+</resources> \ No newline at end of file
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index d73bdef5..d01d4eb9 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Мобильный</item>
<item>Телефон</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5009097a..9f3992f2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -229,5 +229,6 @@
<string name="save_as_bookmark">Сохранить закладку</string>
<string name="delete_bookmark">Удалить закладку</string>
<string name="bookmark_already_exists">Такая закладка уже существует</string>
+ <string name="pref_ui_options">Параметры интерфейса</string>
-</resources>
+</resources> \ No newline at end of file
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index c7cc9f2d..890e2915 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobile</item>
<item>Phone</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index abd99dbc..16ab59ee 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -231,5 +231,6 @@
<string name="pref_general">Generellt</string>
<string name="publish">Publicera</string>
<string name="private_message">privat meddelande</string>
+ <string name="pref_ui_options">UI inställningar</string>
-</resources>
+</resources> \ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1d2a5ac9..1a4fd25d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobile</item>
<item>Phone</item>
@@ -26,6 +27,7 @@
<item>8 hours</item>
<item>until further notice</item>
</string-array>
+
<integer-array name="mute_options_durations">
<item>1800</item>
<item>3600</item>
@@ -33,4 +35,5 @@
<item>28800</item>
<item>-1</item>
</integer-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 793b5604..2354a5e8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <attr name="TextSizeInfo" format="dimension"/>
- <attr name="TextSizeBody" format="dimension"/>
- <attr name="TextSizeHeadline" format="dimension"/>
-</resources>
+
+ <attr name="TextSizeInfo" format="dimension" />
+ <attr name="TextSizeBody" format="dimension" />
+ <attr name="TextSizeHeadline" format="dimension" />
+
+</resources> \ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e2d4dcbe..fa7973d2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,7 +9,7 @@
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item>
</style>
-
+
<style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
<item name="TextSizeInfo">14sp</item>
<item name="TextSizeBody">16sp</item>
@@ -27,9 +27,9 @@
<item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
<item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
</style>
-
+
<style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
- <item name="android:background">@drawable/actionbar_tab_indicator</item>
+ <item name="android:background">@drawable/actionbar_tab_indicator</item>
</style>
</resources> \ No newline at end of file