diff options
Diffstat (limited to 'res')
27 files changed, 531 insertions, 358 deletions
diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/res/drawable-hdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..5f7c6eff --- /dev/null +++ b/res/drawable-hdpi/ic_action_edit_dark.png diff --git a/res/drawable-mdpi/ic_action_edit_dark.png b/res/drawable-mdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..650b4d89 --- /dev/null +++ b/res/drawable-mdpi/ic_action_edit_dark.png diff --git a/res/drawable-xhdpi/ic_action_edit_dark.png b/res/drawable-xhdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..8ab436d8 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_edit_dark.png diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/res/drawable-xxhdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..f2b2078b --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_edit_dark.png diff --git a/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml new file mode 100644 index 00000000..248a7822 --- /dev/null +++ b/res/layout/activity_choose_contact.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ListView + android:id="@+id/choose_contact_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:listitem="@layout/contact" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 15f09c7c..49b4cef3 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -2,147 +2,126 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/secondarybackground"> - -<LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" > - <TextView - style="@style/sectionHeader" + android:background="@color/primarybackground" > + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="8dp" - android:text="@string/muc_details_conference" - android:textColor="@color/primarytext"/> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/primarybackground" > - + android:orientation="vertical" > - <EditText - android:id="@+id/muc_subject" + <TextView + style="@style/sectionHeader" android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/muc_edit_subject" - android:background="@color/primarybackground" - android:ems="10" - android:hint="@string/muc_details_conference_subject" - android:inputType="textAutoComplete" - android:paddingBottom="12dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="12dp" /> - - <ImageButton - android:id="@+id/muc_edit_subject" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:layout_height="wrap_content" android:padding="8dp" - android:src="@drawable/ic_action_edit" /> - </RelativeLayout> - <TextView - android:id="@+id/muc_jabberid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:singleLine="true" - android:textSize="14sp" - android:textColor="@color/primarytext"/> + android:text="@string/muc_details_conference" /> - <TextView - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/muc_details_your_nickname" - android:textColor="@color/primarytext"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/primarybackground" > - + <TextView + android:id="@+id/muc_jabberid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:singleLine="true" + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primarytext" + android:textSize="14sp"/> - <EditText - android:id="@+id/muc_your_nick" + <TextView + style="@style/sectionHeader" android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/muc_edit_nick" - android:background="@color/primarybackground" - android:ems="10" - android:hint="@string/muc_details_your_nickname" - android:inputType="textEmailAddress" - android:paddingBottom="12dp" + android:layout_height="wrap_content" android:paddingLeft="8dp" android:paddingRight="8dp" - android:paddingTop="12dp" /> - - <ImageButton - android:id="@+id/muc_edit_nick" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:paddingTop="8dp" + android:text="@string/you" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" android:padding="8dp" - android:src="@drawable/ic_action_edit" /> - </RelativeLayout> - <TextView - android:id="@+id/muc_role" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:singleLine="true" - android:textSize="14sp" - android:textColor="@color/primarytext"/> - - <LinearLayout - android:id="@+id/muc_more_details" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/muc_participants_header" - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/muc_details_other_members" - android:textColor="@color/primarytext"/> + android:paddingBottom="8dp" > - <LinearLayout - android:id="@+id/muc_members" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle" - > - </LinearLayout> + <ImageView + android:id="@+id/your_photo" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentLeft="true" + android:src="@drawable/ic_profile" > + </ImageView> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/your_photo" + android:orientation="vertical" + android:paddingLeft="8dp" > + + <TextView + android:id="@+id/muc_your_nick" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textColor="@color/primarytext" + android:textSize="18sp" /> + + <TextView + android:id="@+id/muc_role" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textColor="@color/primarytext" + android:textSize="14sp" /> + </LinearLayout> + + <ImageButton + android:id="@+id/edit_nick_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?android:selectableItemBackground" + android:src="@drawable/ic_action_edit_dark" + android:padding="8dp"/> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/muc_more_details" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/muc_participants_header" + style="@style/sectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp" + android:text="@string/muc_details_other_members" /> + + <LinearLayout + android:id="@+id/muc_members" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:showDividers="middle" > + </LinearLayout> + </LinearLayout> + + <Button + android:id="@+id/invite" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="24dp" + android:text="@string/invite_contact" /> </LinearLayout> - <Button - android:layout_marginTop="24dp" - android:id="@+id/invite" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/invite_contacts" - android:layout_gravity="center_horizontal"/> -</LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml deleted file mode 100644 index fffe3266..00000000 --- a/res/layout/cert_warning.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="8dp"> - - <TextView - android:id="@+id/hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="#FFe92727" - android:textStyle="bold" - android:textSize="14sp" - android:text="Do not connect unless you know exactly what you are doing" - android:paddingTop="8dp" - android:paddingBottom="8dp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - android:text="The SHA1 fingerprint is:" /> - - <TextView - android:layout_gravity="center_horizontal" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:id="@+id/sha" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:typeface="monospace" - android:textStyle="bold" - android:textSize="18sp"/> - -</LinearLayout> diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml deleted file mode 100644 index 42f0fb88..00000000 --- a/res/layout/edit_contact_name.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="8dp"> - - <TextView - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/enter_new_name" - android:textColor="@color/primarytext" - android:textSize="18sp" /> - - <EditText - android:paddingTop="16dp" - android:paddingBottom="8dp" - android:id="@+id/editText1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="textPersonName" > - - <requestFocus /> - </EditText> - -</LinearLayout> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index b712c304..2d612984 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -81,7 +81,8 @@ android:layout_centerVertical="true" android:paddingLeft="24dp" android:textColor="@color/ondarktext" - android:textSize="14sp" /> + android:textSize="14sp" + android:layout_toLeftOf="@+id/snackbar_action"/> <TextView android:id="@+id/snackbar_action" diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml new file mode 100644 index 00000000..07a7ac3b --- /dev/null +++ b/res/layout/quickedit.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> + <EditText + android:id="@+id/editor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ems="10" + android:inputType="textPersonName" + android:textColor="@color/primarytext"> + + <requestFocus /> + </EditText> + +</LinearLayout> diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml new file mode 100644 index 00000000..3f402664 --- /dev/null +++ b/res/menu/choose_contact.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/action_search" + android:actionLayout="@layout/actionview_search" + android:icon="@drawable/ic_action_search" + android:showAsAction="collapseActionView|always" + android:title="@string/search"/> +</menu>
\ No newline at end of file diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 710a552e..215bbb66 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -2,62 +2,57 @@ <item android:id="@+id/action_add" - android:orderInCategory="10" android:icon="@drawable/ic_action_new" + android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_add" /> - + android:title="@string/action_add"/> <item android:id="@+id/action_security" + android:icon="@drawable/ic_action_not_secure" android:orderInCategory="20" android:showAsAction="always" - android:icon="@drawable/ic_action_not_secure" - android:title="@string/action_secure" /> - + android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" + android:icon="@drawable/ic_action_new_attachment" android:orderInCategory="30" android:showAsAction="always" - android:icon="@drawable/ic_action_new_attachment" - android:title="@string/attach_file" /> - + android:title="@string/attach_file"/> <item android:id="@+id/action_contact_details" android:orderInCategory="40" android:showAsAction="never" - android:title="@string/action_contact_details" /> - <item + android:title="@string/action_contact_details"/> + <item android:id="@+id/action_muc_details" + android:icon="@drawable/ic_action_group" android:orderInCategory="40" android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_group" - android:title="@string/action_muc_details" /> - <item + android:title="@string/action_muc_details"/> + <item android:id="@+id/action_invite" + android:orderInCategory="45" android:showAsAction="never" - android:title="@string/invite_contacts" /> - + android:title="@string/invite_contact"/> <item - android:id="@+id/action_archive" + android:id="@+id/action_clear_history" android:orderInCategory="50" android:showAsAction="never" - android:title="@string/action_end_conversation"/> - <item - android:id="@+id/action_clear_history" + android:title="@string/action_clear_history"/> + <item + android:id="@+id/action_archive" android:orderInCategory="60" android:showAsAction="never" - android:title="@string/action_clear_history"/> + android:title="@string/action_end_conversation"/> <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" - android:title="@string/action_accounts" - /> - + android:title="@string/action_accounts"/> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" android:title="@string/action_settings"/> -</menu> +</menu>
\ No newline at end of file diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml index 4f9b6da0..685109cd 100644 --- a/res/menu/muc_details.xml +++ b/res/menu/muc_details.xml @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item + android:id="@+id/action_edit_subject" + android:orderInCategory="10" + android:showAsAction="always" + android:icon="@drawable/ic_action_edit" + android:title="@string/action_edit_subject" /> + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 76e32e7d..41dffc6e 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -30,13 +30,7 @@ <string name="show_otr_key">Emprempta dactilar OTR</string> <string name="no_otr_fingerprint">No s\'ha generat una emprempta dactilar OTR. Simplement continua i comença una conversa xifrada.</string> <string name="start_conversation">Començar conversa</string> - <string name="invite_contacts">Convidar contactes</string> - <string name="invite_contacts_to_existing">Convidar a conferència existent</string> - <string name="new_conference">Crear nova conferència</string> <string name="cancel">Cancel·lar</string> - <string name="create_invite">Crear \u0026 Convidar</string> - <string name="new_conference_explained">Vols crear una nova conferència amb una adreça generada aleatòriament i convidar als contactes seleccionats a ella?</string> - <string name="no_open_mucs">No hi ha conferències existents</string> <string name="invitation_sent">Invitació enviada</string> <string name="account_offline">Compte desconnectat</string> <string name="cant_invite_while_offline">Has d\'estar connectat per convidar contactes a la conferència</string> @@ -60,7 +54,6 @@ <string name="delete_messages">Esborrar missatges</string> <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string> <string name="choose_presence">Selecciona recurs del contacte</string> - <string name="send_message_to_conference">Enviar missatge a conferència</string> <string name="send_plain_text_message">Enviar missatge de text</string> <string name="send_otr_message">Enviar missatge xifrat amb OTR</string> <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string> @@ -69,9 +62,6 @@ <string name="error_loading_image">Error carregant imatge (Fitxer no trobat)</string> <string name="image_offered_for_download"><i>Fitxer d\'imatge ofert per a descàrrega</i></string> <string name="not_connected">No connectat</string> - <string name="you_are_offline">Has d\'estar connectat per enviar %s però el teu compte associat a aquesta conversa està desconnectat.</string> - <string name="you_are_offline_blank">No pots executar aquesta acció estant desconnectat.</string> - <string name="files">fitxers</string> <string name="otr_messages">Missatges xifrats amb OTR</string> <string name="manage_account">Gestionar compte</string> <string name="contact_offline">El teu contacte està desconnectat</string> @@ -94,8 +84,6 @@ <string name="use_pgp_encryption">Usa xifratge amb OpenPGP</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…</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> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e4ad7817..8af1c066 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -45,10 +45,6 @@ <string name="show_otr_key">OTR Fingerabdruck</string> <string name="no_otr_fingerprint">Es wurde noch kein OTR-Fingerabdruck erzeugt. Beginne einfach eine verschlüsselte Unterhaltung um einen Fingerabdruck zu erzeugen.</string> <string name="start_conversation">Beginne Unterhaltung</string> - <string name="invite_contacts">Kontakte einladen</string> - <string name="invite_contacts_to_existing">Lade zu bestehender Konferenz ein</string> - <string name="new_conference">Erzeuge neue Konferenz</string> - <string name="new_contact">Neuen Kontakt erstellen</string> <string name="contacts">Kontakte</string> <string name="search_jabber_id">Jabber ID eingeben oder suchen</string> <string name="choose_account">Account auswählen</string> @@ -64,9 +60,6 @@ <string name="ok">OK</string> <string name="done">Erledigt</string> <string name="hide">Verstecken</string> - <string name="create_invite">Erzeugen \u0026 Einladen</string> - <string name="new_conference_explained">Möchtest du eine neue Konferenz mit einer zufälligen Adresse erstellen und die ausgewählten Kontakte zu dieser einladen?</string> - <string name="no_open_mucs">Keine bestehende Konferenz</string> <string name="invitation_sent">Einladung wurde versandt</string> <string name="account_offline">Account offline</string> <string name="cant_invite_while_offline">Du musst online sein um andere Leute zu einer Konferenz einzuladen</string> @@ -90,7 +83,6 @@ <string name="delete_messages">Nachrichten löschen</string> <string name="also_end_conversation">Diese Unterhaltung danach beenden</string> <string name="choose_presence">Choose presence to contact</string> - <string name="send_message_to_conference">Nachricht an Konferenz schicken</string> <string name="send_plain_text_message">Unverschlüsselt schreiben</string> <string name="send_otr_message">OTR-verschlüsselt schreiben</string> <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string> @@ -99,9 +91,6 @@ <string name="error_loading_image">Fehler beim laden des Bildes. (Datei wurde nicht gefunden)</string> <string name="image_offered_for_download"><i>Bild Datei zum Download angeboten</i></string> <string name="not_connected">Nicht verbunden</string> - <string name="you_are_offline">Du musst online sein um %s zu verschicken. Das mit dieser Unterhaltung verbundene Konto ist gerade offline.</string> - <string name="you_are_offline_blank">Du kannst diese Aktion nicht ausführen so lange du offline bist.</string> - <string name="files">Dateien</string> <string name="otr_messages">OTR-verschlüsselte Nachrichten</string> <string name="manage_account">Konto verwalten</string> <string name="contact_offline">Dein Kontakt ist offline</string> @@ -116,7 +105,6 @@ <string name="offering">angeboten…</string> <string name="waiting">warten…</string> <string name="no_pgp_key">Kein OpenPGP Schlüssel gefunden</string> - <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string> <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\n<small>Bitte sag deinem Kontakt er oder sie möge bitte OpenPGP einrichten.</small></string> <string name="contact_has_no_pgp_keys">Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\n<small>Bitte sag deinem Kontakt er oder sie möge bitte OpenPGP einrichten.</small></string> <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier um sie anzuzeigen und zu entschlüsseln.</i></string> @@ -127,8 +115,6 @@ <string name="use_pgp_encryption">OpenPGP verwenden</string> <string name="pref_xmpp_resource">XMPP resource</string> <string name="pref_xmpp_resource_summary">Der Name mit dem sich der Client selber identifiziert</string> - <string name="pref_accept_files">Dateiannahme</string> - <string name="pref_accept_files_summary">Datein die kleiner sind als … automatisch annehmen</string> <string name="pref_notification_settings">Benachrichtigungseinstellung</string> <string name="pref_notifications">Benachrichtigungen</string> <string name="pref_notifications_summary">Benachrichtige mich wenn eine neu Nachricht ankommt</string> @@ -156,7 +142,6 @@ <string name="pref_grant_presence_updates">Online Status</string> <string name="pref_grant_presence_updates_summary">Erlaube Kontakten die von Dir erstellt wurden deinen Status zu sehen und frage um Erlaubnis ihren zu sehen.</string> <string name="subscriptions">Abonnements</string> - <string name="subscription_updated">Abonnements aktualisiert</string> <string name="your_account">Dein Account</string> <string name="keys">Schlüssel</string> <string name="send_presence_updates">Anwesenheitsbenachrichtigungen senden</string> @@ -181,13 +166,10 @@ <string name="account_status_not_found">Server nicht gefunden</string> <string name="account_status_no_internet">Keine Internetverbindung</string> <string name="account_status_requires_tls">Server benötigt TLS</string> - <string name="account_status_error">Unbekanntes Zertifikat</string> <string name="account_status_regis_fail">Registrierung fehlgeschlagen</string> <string name="account_status_regis_conflict">Benutzername wird bereits verwendet</string> <string name="account_status_regis_success">Registrierung abgeschlossen</string> <string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string> - <string name="certif_no_trust">Nicht verbinden</string> - <string name="certif_trust">Dem Zertifikat vertrauen</string> <string name="encryption_choice_none">Klartext</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -206,7 +188,6 @@ <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string> <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löscht, gehen alle Gesprächsverläufe verloren</string> <string name="mgmt_account_account_offline">Das Konto ist offline</string> - <string name="attach_record_voice">Audio aufnehmen</string> <string name="account_settings_jabber_id">Jabber ID:</string> <string name="account_settings_password">Passwort:</string> <string name="account_settings_example_jabber_id">benutzer@domain.de</string> @@ -255,4 +236,4 @@ <string name="openpgp_click_to_decrypt">Hier klicken, um das Passwort einzugeben und die Nachricht zu entschlüsseln</string> <string name="reception_failed">Empfang ist fehlgeschlagen</string> <string name="no_muc_server_found">Es wurde kein Konferenzserver gefunden</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c8877534..bd8f84e2 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -22,6 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Compartir con Conversación</string> <string name="title_activity_start_conversation">Nueva Conversación</string> + <string name="title_activity_choose_contact">Elegir Contacto</string> <string name="just_now">ahora</string> <string name="minute_ago">hace 1 min</string> <string name="minutes_ago">hace %d min</string> @@ -38,6 +39,7 @@ <string name="visitor">Visitante</string> <string name="enter_new_name">Introduce un nuevo nombre:</string> <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string> + <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación de la conferencia asociada con este marcador no se eliminará.</string> <string name="untrusted_cert_hint">El servidor %s presenta un certificado no confiable, posiblemente auto firmado.</string> <string name="account_info">Información del servidor</string> <string name="register_account">Registrar nueva cuenta en servidor</string> @@ -46,10 +48,7 @@ <string name="show_otr_key">Clave OTR</string> <string name="no_otr_fingerprint">No se ha generado una clave OTR. Continúa y comienza una conversación encriptada</string> <string name="start_conversation">Comenzar conversación</string> - <string name="invite_contacts">Invitar contactos</string> - <string name="invite_contacts_to_existing">Invitar a conferencia existente</string> - <string name="new_conference">Crear nueva conferencia</string> - <string name="new_contact">Crear nuevo contacto</string> + <string name="invite_contact">Invitar contactos</string> <string name="contacts">Contactos</string> <string name="search_jabber_id">Busca o escribe identificador Jabber</string> <string name="choose_account">Seleccionar cuenta</string> @@ -65,9 +64,6 @@ <string name="ok">OK</string> <string name="done">Hecho</string> <string name="hide">Ocultar</string> - <string name="create_invite">Crear \u0026 Invitar</string> - <string name="new_conference_explained">¿Quieres crear una nueva conferencia con una dirección generada aleatoriamente e invitar a los contactos seleccionados a ella?</string> - <string name="no_open_mucs">No hay conferencias existentes</string> <string name="invitation_sent">Invitación enviada</string> <string name="account_offline">Cuenta desconectada</string> <string name="cant_invite_while_offline">Debes estar conectado para invitar a contactos a la conferencia</string> @@ -79,7 +75,7 @@ <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string> <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string> <string name="attach_file">Adjuntar</string> - <string name="not_in_roster">El contacto no está en tu lista. ¿Quieres añadirlo?</string> + <string name="not_in_roster">El contacto no está en tu lista. ¿Te gustaría añadirlo?</string> <string name="add_contact">Añadir contacto</string> <string name="send_failed">Error al enviar</string> <string name="send_rejected">rechazado</string> @@ -124,8 +120,6 @@ <string name="use_pgp_encryption">Usa encriptación con OpenPGP</string> <string name="pref_xmpp_resource">Recurso</string> <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string> - <string name="pref_accept_files">Aceptar archivos</string> - <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que…</string> <string name="pref_notification_settings">Ajustes de notificación</string> <string name="pref_notifications">Notificaciones</string> <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string> @@ -157,7 +151,6 @@ <string name="pref_grant_presence_updates">Suscripción de presencia</string> <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string> <string name="subscriptions">Suscripciones</string> - <string name="subscription_updated">Suscripción actualizada</string> <string name="your_account">Tu cuenta</string> <string name="keys">Claves</string> <string name="send_presence_updates">Enviar actualizaciones de presencia</string> @@ -182,13 +175,10 @@ <string name="account_status_not_found">Servidor no encontrado</string> <string name="account_status_no_internet">Sin conectividad</string> <string name="account_status_requires_tls">El servidor requiere TLS</string> - <string name="account_status_error">Certificado no confiable</string> <string name="account_status_regis_fail">Error en el registro</string> <string name="account_status_regis_conflict">El identificador ya está en uso</string> <string name="account_status_regis_success">Registro completado</string> <string name="account_status_regis_not_sup">El servidor no soporta registros</string> - <string name="certif_no_trust">No conectar</string> - <string name="certif_trust">Confiar en el certificado</string> <string name="encryption_choice_none">Texto plano</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -267,4 +257,13 @@ <string name="conference_address">Dirección de la Conferencia</string> <string name="conference_address_example">nombre@conferencia.ejemplo.com</string> <string name="save_as_bookmark">Guardar en marcadores</string> -</resources>
\ No newline at end of file + <string name="delete_bookmark">Eliminar marcador</string> + <string name="bookmark_already_exists">Este marcador ya exsite</string> + <string name="you">Tú</string> + <string name="action_edit_subject">Editar asunto de la conferencia</string> + <string name="conference_not_found">Conferencia no encontrada</string> + <string name="leave">Salir</string> + <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string> + <string name="add_back">Añadir contacto</string> + <string name="contact_has_read_up_to_this_point">Tu contacto ha leído hasta aquí</string> +</resources> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index df793735..d317e871 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -19,8 +19,10 @@ <string name="title_activity_settings">Ezarpenak</string> <string name="title_activity_conference_details">Konferentziaren xehetasunak</string> <string name="title_activity_contact_details">Kontaktuaren xehetasunak</string> - <string name="title_activity_conversations">Conversations</string> + <string name="title_activity_conversations">Elkarrizketak</string> <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string> + <string name="title_activity_start_conversation">Elkarrizketa hasi</string> + <string name="title_activity_choose_contact">Kontaktua hautatu</string> <string name="just_now">orain</string> <string name="minute_ago">min 1 lehenago</string> <string name="minutes_ago">%d min lehenago</string> @@ -37,6 +39,7 @@ <string name="visitor">Bisitaria</string> <string name="enter_new_name">Sartu izen berri bat:</string> <string name="remove_contact_text">%s zure zerrendatik ezabatu nahi duzu? Kontu honekin lotutako elkarrizketa ez da ezabatuko.</string> + <string name="remove_bookmark_text">%s laster marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string> <string name="untrusted_cert_hint">%s zerbitzariak konfiantzarik gabeko, agian bere buruak izenpetutako, ziurtagiri batekin aurkeztu zaitu.</string> <string name="account_info">Zerbitzariaren informazioa</string> <string name="register_account">Kontu berria zerbitzarian erregistratu</string> @@ -45,10 +48,7 @@ <string name="show_otr_key">OTR hatz-marka</string> <string name="no_otr_fingerprint">Ez da OTR hatz-markarik sortu. Aurrera joan eta enkriptatutako elkarrizketa hasi</string> <string name="start_conversation">Elkarrizketa hasi</string> - <string name="invite_contacts">Kontaktuak gonbidatu</string> - <string name="invite_contacts_to_existing">Existitzen den konferentzia batera gonbidatu</string> - <string name="new_conference">Konferentzia berria sortu</string> - <string name="new_contact">Kontaktu berria sortu</string> + <string name="invite_contact">Kontaktu bat gonbidatu</string> <string name="contacts">Kontaktuak</string> <string name="search_jabber_id">Bilatu edo sartu Jabber ID bat</string> <string name="choose_account">Kontua hautatu</string> @@ -64,9 +64,6 @@ <string name="ok">Ados</string> <string name="done">Eginda</string> <string name="hide">Ezkutatu</string> - <string name="create_invite">Sortu \u0026 Gonbidatu</string> - <string name="new_conference_explained">Ausazki sortutako helbide batekin konferentzia berri bat sortu eta hautatutako kontaktuak bertara gonbidatu nahi al dituzu?</string> - <string name="no_open_mucs">Ez da konferentziarik existitzen</string> <string name="invitation_sent">Gonbidapena bidali da</string> <string name="account_offline">Kontua lineaz kanpo</string> <string name="cant_invite_while_offline">Konektatuta egon behar zara jendea konferentzietara gonbidatzeko</string> @@ -123,8 +120,6 @@ <string name="use_pgp_encryption">OpenPGP enkriptazioa erabili</string> <string name="pref_xmpp_resource">XMPP baliabidea</string> <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string> - <string name="pref_accept_files">Fitxategiak onartu</string> - <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string> <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string> <string name="pref_notifications">Jakinarazpenak</string> <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string> @@ -156,7 +151,6 @@ <string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string> <string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string> <string name="subscriptions">Harpidetzak</string> - <string name="subscription_updated">Herpidetza eguneratuta</string> <string name="your_account">Zure kontua</string> <string name="keys">Gakoak</string> <string name="send_presence_updates">Presentzia eguneraketak bidali</string> @@ -181,13 +175,10 @@ <string name="account_status_not_found">Zerbitzaria ez da aurkitu</string> <string name="account_status_no_internet">Konektagarritasunik ez</string> <string name="account_status_requires_tls">Zerbitzariak TLS behar du</string> - <string name="account_status_error">Konfiantzarik gabeko ziurtagiria</string> <string name="account_status_regis_fail">Erregistroak huts egin du</string> <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string> <string name="account_status_regis_success">Erregistroa burutu da</string> <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string> - <string name="certif_no_trust">Ez konektatu</string> - <string name="certif_trust">Ziurtagiriaz fidatu</string> <string name="encryption_choice_none">Testu laua</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -200,10 +191,10 @@ <string name="mgmt_account_account_offline">Kontua lineaz kanpo dago</string> <string name="attach_record_voice">Ahotsa grabatu</string> <string name="account_settings">Kontuaren ezarpenak</string> - <string name="account_settings_jabber_id">Jabber IDa:</string> - <string name="account_settings_password">Pasahitza:</string> + <string name="account_settings_jabber_id">Jabber IDa</string> + <string name="account_settings_password">Pasahitza</string> <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string> - <string name="account_settings_confirm_password">Pasahitza egiaztatu:</string> + <string name="account_settings_confirm_password">Pasahitza egiaztatu</string> <string name="password">Pasahitza</string> <string name="confirm_password">Pasahitza egiaztatu</string> <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string> @@ -232,7 +223,7 @@ <string name="server_info_roster_versioning">Roster Versioning</string> <string name="server_info_carbon_messages">Carbon Messages</string> <string name="server_info_stream_management">Stream Management</string> - <string name="hours">orduak</string> + <string name="hours">ordu</string> <string name="mins">minutu</string> <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string> <string name="last_seen_now">azkenegoz ikusia orain</string> @@ -245,10 +236,35 @@ <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string> <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string> <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string> - <string name="edit_conference_details">Ukitu konferentziaren xehetasunak editatzeko</string> - <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string> - <string name="openpgp_click_to_decrypt">Sakatu hemen pasahitza sartu eta mezuak desenkriptatzeko</string> - <string name="reception_failed">Jasotzeak huts egin du</string> - <string name="no_muc_server_found">Ez da aurkitu konferentzia zerbitzari egokirik</string> + <string name="edit_conference_details">Ukitu konferentziaren xehetasunak editatzeko</string> + <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string> + <string name="openpgp_click_to_decrypt">Sakatu hemen pasahitza sartu eta mezuak desenkriptatzeko</string> + <string name="reception_failed">Jasotzeak huts egin du</string> + <string name="no_muc_server_found">Ez da aurkitu konferentzia zerbitzari egokirik</string> + <string name="your_fingerprint">Zure hatz-marka</string> + <string name="otr_fingerprint">OTR hatz-marka</string> + <string name="verify">Egiaztatu</string> + <string name="decrypt">Desenkriptatu</string> + <string name="conferences">Konferentziak</string> + <string name="search">Bilatu</string> + <string name="create_contact">Kontaktua sortu</string> + <string name="join_conference">Konferentziara batu</string> + <string name="delete_contact">Kontaktua ezabatu</string> + <string name="view_contact_details">Kontaktuaren xehetasunak ikusi</string> + <string name="create">Sortu</string> + <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string> + <string name="join">Batu</string> + <string name="conference_address">Konferentziaren helbidea</string> + <string name="conference_address_example">gela@conference.example.com</string> + <string name="save_as_bookmark">Gorde laster-marka bezala</string> + <string name="delete_bookmark">Laster-marka ezbatu</string> + <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string> + <string name="you">Zu</string> + <string name="action_edit_subject">Konferentziaren gaia editatu</string> + <string name="conference_not_found">Konferentzia ez da aurkitu</string> + <string name="leave">Alde egin</string> + <string name="contact_added_you">Kontaktua zure kontaktu zerrendara gehitu da</string> + <string name="add_back">Berriz gehitu</string> + <string name="contact_has_read_up_to_this_point">Zure kontaktuak puntu honetaraino irakurri du</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 1e21e9f5..e383ef22 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -45,10 +45,6 @@ <string name="show_otr_key">Empreinte OTR</string> <string name="no_otr_fingerprint">Empreinte OTR non générée. Essayez de démarrer une conversation sécurisée.</string> <string name="start_conversation">Démarrer une conversation</string> - <string name="invite_contacts">Inviter des contacts</string> - <string name="invite_contacts_to_existing">Inviter à une conférence</string> - <string name="new_conference">Créer une nouvelle conférence</string> - <string name="new_contact">Ajouter ce contact</string> <string name="contacts">Contacts</string> <string name="search_jabber_id">Rechercher un identifiant</string> <string name="choose_account">Choix du compte</string> @@ -64,9 +60,6 @@ <string name="ok">OK</string> <string name="done">Terminé</string> <string name="hide">Cacher</string> - <string name="create_invite">Créer \u0026 invitation</string> - <string name="new_conference_explained">Voulez-vous créer une nouvelle conférence avec une adresse générée aléatoirement et inviter les contacts sélectionnés à la rejoindre?</string> - <string name="no_open_mucs">Conférences non existantes</string> <string name="invitation_sent">Invitation envoyée</string> <string name="account_offline">Compte hors-ligne</string> <string name="cant_invite_while_offline">Vous devez être en ligne pour inviter des participants à une conférence.</string> @@ -98,9 +91,6 @@ <string name="error_loading_image">Impossible de télécharger l\'image (Fichier non trouvé)</string> <string name="image_offered_for_download"><i>Image proposée au téléchargement.</i></string> <string name="not_connected">Non connecté</string> - <string name="you_are_offline">Vous devez être en ligne pour envoyer %s mais votre compte utilisé dans cette conversation est hors-ligne.</string> - <string name="you_are_offline_blank">Vous devez être en ligne pour réaliser cette action.</string> - <string name="files">Fichiers</string> <string name="otr_messages">Messages chiffrés par OTR</string> <string name="manage_account">Gérer les comptes</string> <string name="contact_offline">Votre correspondant est hors-ligne.</string> @@ -126,8 +116,6 @@ <string name="use_pgp_encryption">Utiliser le chiffrement OpenPGP</string> <string name="pref_xmpp_resource">Ressource XMPP</string> <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string> - <string name="pref_accept_files">Accepter les fichiers</string> - <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string> <string name="pref_notification_settings">Paramètres de notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string> @@ -159,7 +147,6 @@ <string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string> <string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string> <string name="subscriptions">Publications</string> - <string name="subscription_updated">Publication mise à jour</string> <string name="your_account">Votre compte</string> <string name="keys">Clefs</string> <string name="send_presence_updates">Envoyer les mises à jour de présence</string> @@ -184,13 +171,10 @@ <string name="account_status_not_found">Serveur non trouvé</string> <string name="account_status_no_internet">Aucune connectivité</string> <string name="account_status_requires_tls">Le serveur requiert TLS</string> - <string name="account_status_error">Certificat non certifié</string> <string name="account_status_regis_fail">Enregistrement échoué</string> <string name="account_status_regis_conflict">Identifiant déjà utilisé</string> <string name="account_status_regis_success">Enregistrement réussi</string> <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string> - <string name="certif_no_trust">Annuler</string> - <string name="certif_trust">Croire ce certificat</string> <string name="encryption_choice_none">Texte clair</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index bbfa6017..a2064025 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -35,13 +35,7 @@ <string name="show_otr_key">Pegada dactilar OTR</string> <string name="no_otr_fingerprint">Non hai pegadas dactilares OTR. Continúa e comeza unha conversación cifrada</string> <string name="start_conversation">Comeza conversa</string> - <string name="invite_contacts">Invitar contactos</string> - <string name="invite_contacts_to_existing">Invitar a conferencia existente</string> - <string name="new_conference">Crear nova conferencia</string> <string name="cancel">Cancelar</string> - <string name="create_invite">Crear \u0026 Invitar</string> - <string name="new_conference_explained">¿Queres crear unha nueva conferencia con unha dirección xerada aleatoriamente e invitar aos contactos seleccionados a ela?</string> - <string name="no_open_mucs">Non hai conferencias existentes</string> <string name="invitation_sent">Invitación enviada</string> <string name="account_offline">Conta desconectada</string> <string name="cant_invite_while_offline">Debes estar conectado para invitar contactos á conferencia</string> @@ -65,7 +59,6 @@ <string name="delete_messages">Borrar mensaxes</string> <string name="also_end_conversation">Terminar esta conversa máis tarde</string> <string name="choose_presence">Selecciona recurso del contacto</string> - <string name="send_message_to_conference">Enviar mensaxe a conferencia</string> <string name="send_plain_text_message">Enviar mensaxe de texto</string> <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string> <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string> @@ -74,9 +67,6 @@ <string name="error_loading_image">Erro na carga da imaxen (Arquivo non atopado)</string> <string name="image_offered_for_download"><i>Arquivo de imaxe ofrecido para descarga</i></string> <string name="not_connected">Non conectado</string> - <string name="you_are_offline">Debes estar conectado para enviar %s pero a túa conta asociada a esta conversa está desconectada.</string> - <string name="you_are_offline_blank">Non podes executar esta acción estando desconectado</string> - <string name="files">arquivos</string> <string name="otr_messages">Mensaxes cifrados con OTR</string> <string name="manage_account">Xestionar conta</string> <string name="contact_offline">O teu contacto está desconectado</string> @@ -99,8 +89,6 @@ <string name="use_pgp_encryption">Usa cifrado con OpenPGP</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_summary">De forma automática aceptar arquivos menores de…</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> @@ -151,13 +139,10 @@ <string name="account_status_not_found">Servidor non atopado</string> <string name="account_status_no_internet">Sen conectividade</string> <string name="account_status_requires_tls">O servidor require TLS</string> - <string name="account_status_error">Certificado non confiable</string> <string name="account_status_regis_fail">Erro no rexistro</string> <string name="account_status_regis_conflict">O identificador xa está en uso</string> <string name="account_status_regis_success">Rexistro completado</string> <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string> - <string name="certif_no_trust">Non conectar</string> - <string name="certif_trust">Confiar no certificado</string> <string name="encryption_choice_none">Texto plano</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml new file mode 100644 index 00000000..1a464a5a --- /dev/null +++ b/res/values-nl/arrays.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string-array name="resources"> + <item>Mobiel</item> + <item>Telefoon</item> + <item>Tablet</item> + <item>Conversaties</item> + <item>Android</item> + </string-array> + <string-array name="filesizes"> + <item>nooit</item> + <item>256 KB</item> + <item>512 KB</item> + <item>1 MB</item> + </string-array> + <string-array name="filesizes_values"> + <item>0</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + </string-array> +</resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml new file mode 100644 index 00000000..104cb4b8 --- /dev/null +++ b/res/values-nl/strings.xml @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="app_name">Conversaties</string> + <string name="action_settings">Instellingen</string> + <string name="action_add">Nieuwe conversatie</string> + <string name="action_accounts">Beheer account</string> + <string name="action_refresh">Ververs contactenlijst</string> + <string name="action_end_conversation">Beëindig conversatie</string> + <string name="action_contact_details">Contact details</string> + <string name="action_muc_details">Gesprek details</string> + <string name="action_secure">Beveiligde conversatie</string> + <string name="action_add_account">Voeg account toe</string> + <string name="action_edit_contact">Verander naam</string> + <string name="action_add_phone_book">Voeg aan telefoonboek toe</string> + <string name="action_delete_contact">Verwijder uit lijst</string> + <string name="title_activity_contacts">Contacten</string> + <string name="title_activity_manage_accounts">Beheer Accounts</string> + <string name="title_activity_settings">Instellingen</string> + <string name="title_activity_conference_details">Groepsconversatie Details</string> + <string name="title_activity_contact_details">Contact Details</string> + <string name="title_activity_conversations">Conversaties</string> + <string name="title_activity_sharewith">Delen met Conversatie</string> + <string name="just_now">net</string> + <string name="minute_ago">1 min geleden</string> + <string name="minutes_ago">%d min geleden</string> + <string name="unread_conversations">ongelezen Conversaties</string> + <string name="sending">versturen…</string> + <string name="announce_pgp">Vernieuw PGP aankondiging</string> + <string name="encrypted_message">Bericht aan het ontsleutelen. Een moment geduld a.u.b.…</string> + <string name="conference_details">Groepsgesprek Details</string> + <string name="nick_in_use">Naam is al in gebruik</string> + <string name="admin">Beheerder</string> + <string name="owner">Eigenaar</string> + <string name="moderator">Moderator</string> + <string name="participant">Deelnemer</string> + <string name="visitor">Bezoeker</string> + <string name="enter_new_name">Voer een nieuwe naam in:</string> + <string name="remove_contact_text">Wilt u %s uit uw lijst verwijderen? De conversatie met deze account zal niet worden verwijderd.</string> + <string name="untrusted_cert_hint">De server %s gebruikte een onvertrouwd, mogelijk zelfgetekend, certificaat.</string> + <string name="account_info">Server Informatie</string> + <string name="register_account">Registreer nieuwe account op server</string> + <string name="share_with">Deel met</string> + <string name="ask_again"><u>Klik om opnieuw te vragen</u></string> + <string name="show_otr_key">OTR vingerafdruk</string> + <string name="no_otr_fingerprint">Geen OTR vingerafdruk gegenereerd. Start simpelweg een versleutelde conversatie</string> + <string name="start_conversation">Start Conversatie</string> + <string name="contacts">Contacten</string> + <string name="search_jabber_id">Zoek of voer Jabber ID in</string> + <string name="choose_account">Kies account</string> + <string name="multi_user_conference">Groepsconversatie met meerdere gebruikers</string> + <string name="trying_join_conference">Probeert U aan een groepsconversatie deel te nemen?</string> + <string name="cancel">Annuleer</string> + <string name="add">Voeg toe</string> + <string name="edit">Bewerk</string> + <string name="delete">Verwijder</string> + <string name="save">Sla op</string> + <string name="yes">Ja</string> + <string name="no">Nee</string> + <string name="ok">OK</string> + <string name="done">Klaar</string> + <string name="hide">Verberg</string> + <string name="invitation_sent">Uitnodiging verstuurd</string> + <string name="account_offline">Account niet verbonden</string> + <string name="cant_invite_while_offline">U moet online zijn om mensen uit te nodigen tot een groepsconversatie</string> + <string name="crash_report_title">Conversaties is gecrashed</string> + <string name="crash_report_message">Door het versturen van crash rapportages helpt u mee met de ontwikkeling van Conversaties.\n<b>Waarschuwing:</b> Deze app zal uw XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string> + <string name="send_now">Nu versturen</string> + <string name="send_never">Niet opnieuw vragen</string> + <string name="problem_connecting_to_account">Account verbinden mislukt</string> + <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string> + <string name="touch_to_fix">Raak hier aan om accounts te beheren</string> + <string name="attach_file">Voeg bestand bij</string> + <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wilt u het toevoegen?</string> + <string name="add_contact">Voeg contact toe</string> + <string name="send_failed">afleveren mislukt</string> + <string name="send_rejected">geweigerd</string> + <string name="receiving_image">Bezig met ontvangen van afbeelding. Een moment geduld a.u.b.…</string> + <string name="preparing_image">Bezig met voorbereiden van het versturen van afbeelding</string> + <string name="action_clear_history">Wis geschiedenis</string> + <string name="clear_conversation_history">Wis conversatie geschiedenis</string> + <string name="clear_histor_msg">Wilt U alle berichten in deze Conversatie verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string> + <string name="delete_messages">Verwijder berichten</string> + <string name="also_end_conversation">Beëindig deze conversatie na afloop</string> + <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string> + <string name="send_plain_text_message">Verstuur eenvoudig tekst bericht</string> + <string name="send_otr_message">Verstuur OTR versleuteld bericht</string> + <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string> + <string name="your_nick_has_been_changed">Uw naam is veranderd</string> + <string name="download_image">Download Afbeelding</string> + <string name="error_loading_image">Fout tijdens laden van afbeelding (Bestand niet gevonden)</string> + <string name="image_offered_for_download"><i>Afbeelding aangeboden voor downloaden</i></string> + <string name="not_connected">Niet Verbonden</string> + <string name="otr_messages">OTR versleutelde berichten</string> + <string name="manage_account">Beheer account</string> + <string name="contact_offline">Uw Contact is Offline</string> + <string name="contact_offline_otr">Het versturen van OTR versleutelde berichten aan offline contacten wordt helaas niet ondersteund.\nWilt u het bericht onversleuteld versturen?</string> + <string name="contact_offline_file">Het versturen van breichten aan offline contacten wordt helaas niet ondersteund.</string> + <string name="send_unencrypted">Verstuur onversleuteld</string> + <string name="decryption_failed">Ontsleutelen mislukt. Misschien hebt U niet de juiste private sleutel.</string> + <string name="openkeychain_required">OpenKeychain</string> + <string name="openkeychain_required_long">Conversaties gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversaties na installatie.)</small></string> + <string name="restart">Herstart</string> + <string name="install">Installeer</string> + <string name="offering">offering…</string> + <string name="waiting">wachten…</string> + <string name="no_pgp_key">Geen OpenPGP sleutel gevonden</string> + <string name="contact_has_no_pgp_key">Conversaties kan Uw berichten niet versleutelen omdat uw contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag uw contact om OpenPGP te configureren.</small></string> + <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string> + <string name="contacts_have_no_pgp_keys">Conversaties kan uw berichten niet versleutelen omdat uw contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag uw contacten om OpenPGP te configureren.</small></string> + <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string> + <string name="encrypted_image_received"><i>Versleutelde afbeelding ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string> + <string name="image_file"><i>Afbeelding ontvangen. Raak aan om te bekijken.</i></string> + <string name="otr_file_transfer">OTR versleuteling niet beschikbaar.</string> + <string name="otr_file_transfer_msg">Helaas is OTR versleuteling niet beschikbaar voor bestandsoverdracht. Kies OpenPGP versleuteling of geen versleuteling.</string> + <string name="use_pgp_encryption">Gebruik OpenPGP versleuteling</string> + <string name="pref_xmpp_resource">XMPP resource</string> + <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string> + <string name="pref_notification_settings">Notificatie Instellingen</string> + <string name="pref_notifications">Notificaties</string> + <string name="pref_notifications_summary">Notificatie als een nieuw bericht arriveert</string> + <string name="pref_vibrate">Trillen</string> + <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string> + <string name="pref_sound">Geluid</string> + <string name="pref_sound_summary">Speel ringtone af bij notificatie</string> + <string name="pref_conference_notifications">Groepsconversatie notificaties</string> + <string name="pref_conference_notifications_summary">Toon altijd notificaties als er nieuwe berichten arriveren in groepsconversaties in plaats van alleen bij highlighting</string> + <string name="pref_notification_grace_period">Notificatie uitstel periode</string> + <string name="pref_notification_grace_period_summary">Zet notificaties voor korte tijd uit als er een carbon copy wordt ontvangen</string> + <string name="pref_ui_options">UI Opties</string> + <string name="pref_use_phone_self_picture">Gebruik eigen afbeelding van telefoon</string> + <string name="pref_use_phone_self_picture_summary">Het is mogelijk niet meer duidelijk welke account U gebruikt in conversaties</string> + <string name="pref_conference_name">Groepsconversatie naam</string> + <string name="pref_conference_name_summary">Gebruik onderwerp van kamer om groepsconversaties te identificeren</string> + <string name="pref_advanced_options">Geadvanceerde Opties</string> + <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string> + <string name="pref_never_send_crash_summary">Door crash rapportages te versturen helpt U mee aan de ontwikkeling van Conversaties</string> + <string name="pref_confirm_messages">Bevestig Berichten</string> + <string name="pref_confirm_messages_summary">Laat uw contacten weten waneer U berichten hebt ontvangen en gelezen</string> + <string name="pref_show_last_seen">Toon voor het laatst gezien</string> + <string name="pref_show_last_seen_summary">Laat de tijd zien dat uw contact voor het laatst online gezien is</string> + <string name="openpgp_error">OpenKeychain rapporteerde een fout</string> + <string name="error_decrypting_file">I/O Fout tijdens ontsleutelen bestand</string> + <string name="error_copying_image_file">Fout tijdens kopiëren van afbeelding.</string> + <string name="accept">Accepteer</string> + <string name="error">Er is een fout opgetreden</string> + <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheid updates</string> + <string name="pref_grant_presence_updates_summary">Vantevoren toestemming verlenen en vragen aan contacten die U hebt aangemaakt</string> + <string name="subscriptions">Abonnementen</string> + <string name="your_account">Uw account</string> + <string name="keys">Sleutels</string> + <string name="send_presence_updates">Verstuur aanwezigheid updates</string> + <string name="receive_presence_updates">Ontvang aanwezigheid updates</string> + <string name="ask_for_presence_updates">Vraag naar aanwezigheid updates</string> + <string name="asked_for_presence_updates">Gevraagd om aanwezigheid updates</string> + <string name="attach_choose_picture">Kies afbeelding</string> + <string name="attach_take_picture">Neem foto</string> + <string name="preemptively_grant">Vantevoren toestemming verlenen voor abonneren</string> + <string name="error_not_an_image_file">Het bestand dat U gekozen hebt is geen afbeelding</string> + <string name="error_compressing_image">Fout tijdens converteren van afbeelding</string> + <string name="error_file_not_found">Bestand niet gevonden</string> + <string name="error_io_exception">Generieke I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string> + <string name="error_security_exception_during_image_copy">De app die U gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string> + <string name="account_status">Status:</string> + <string name="account_status_unknown">Onbekend</string> + <string name="account_status_disabled">Tijdelijk uitgezet</string> + <string name="account_status_online">Online</string> + <string name="account_status_connecting">Verbinden\u2026</string> + <string name="account_status_offline">Offline</string> + <string name="account_status_unauthorized">Niet gemachtigd</string> + <string name="account_status_not_found">Server niet gevonden</string> + <string name="account_status_no_internet">Geen verbinding</string> + <string name="account_status_requires_tls">Server vereist TLS</string> + <string name="account_status_regis_fail">Registratie mislukt</string> + <string name="account_status_regis_conflict">Gebruikersnaam bezet</string> + <string name="account_status_regis_success">Registratie compleet</string> + <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string> + <string name="encryption_choice_none">Onversleuteld</string> + <string name="encryption_choice_otr">OTR</string> + <string name="encryption_choice_pgp">OpenPGP</string> + <string name="mgmt_account_edit">Bewerk account</string> + <string name="mgmt_account_delete">Verwijder</string> + <string name="mgmt_account_disable">Tijdelijk uitzetten</string> + <string name="mgmt_account_enable">Aanzetten</string> + <string name="mgmt_account_are_you_sure">Weet U het zeker?</string> + <string name="mgmt_account_delete_confirm_text">Als U uw account verwijderd wordt Uw volledige conversatie geschiedenis gewist</string> + <string name="mgmt_account_account_offline">Account is offline</string> + <string name="attach_record_voice">Neem stem op</string> + <string name="account_settings">Account Instellingen</string> + <string name="account_settings_jabber_id">Jabber ID:</string> + <string name="account_settings_password">Wachtwoord:</string> + <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string> + <string name="account_settings_confirm_password">Bevestig wachtwoord:</string> + <string name="password">Wachtwoord</string> + <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="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> + <string name="contact_status_away">weg</string> + <string name="contact_status_extended_away">langdurig weg</string> + <string name="contact_status_do_not_disturb">niet storen</string> + <string name="contact_status_offline">offline</string> + <string name="muc_details_conference">groepsconversatie</string> + <string name="muc_details_conference_subject">Groepsconversatie Onderwerp</string> + <string name="muc_details_your_nickname">Uw naam</string> + <string name="muc_details_other_members">Andere Leden</string> + <string name="subscription_not_updated_offline">Account offline. Kon abonnement niet vernieuwen</string> + <string name="share_with_active_conversations">Actieve Conversaties</string> + <string name="server_info_statistics">Statistieken</string> + <string name="server_info_connection_age">Verbindingsduur</string> + <string name="server_info_session_age">Sessieduur</string> + <string name="server_info_packets_sent">Paketten verstuurd</string> + <string name="server_info_packets_received">Paketten ontvangen</string> + <string name="server_info_connected_accounts">Verbonden accounts</string> + <string name="server_info_server_features">Server Kenmerken</string> + <string name="server_info_roster_versioning">Roster Versioning</string> + <string name="server_info_carbon_messages">Carbon Berichten</string> + <string name="server_info_stream_management">Stream Management</string> + <string name="hours">uren</string> + <string name="mins">min</string> + <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string> + <string name="last_seen_now">zonet voor het laatst gezien</string> + <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string> + <string name="last_seen_mins">%d minuten geleden voor het laatst gezien</string> + <string name="last_seen_hour">1 uur geleden voor het laatst gezien</string> + <string name="last_seen_hours">%d uur geleden voor het laatst gezien</string> + <string name="last_seen_day">1 dag geleden voor het laatst gezien</string> + <string name="last_seen_days">%d dagen geleden voor het laatst gezien</string> + <string name="never_seen">nog nooit gezien</string> + <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string> + <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string> + <string name="edit_conference_details">Touch to edit conference details</string> + <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> + <string name="openpgp_click_to_decrypt">Raak hier aan om het wachtwoord in te voeren het bericht te ontsleutelen</string> + <string name="reception_failed">Ontvangen mislukt</string> + <string name="no_muc_server_found">Geen geschikte Groepsconversatie Server gevonden</string> +</resources> diff --git a/res/values-nl/styles.xml b/res/values-nl/styles.xml new file mode 100644 index 00000000..1468283e --- /dev/null +++ b/res/values-nl/styles.xml @@ -0,0 +1,19 @@ +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> + <item name="android:drawableBottom">@drawable/section_header</item> + <item name="android:drawablePadding">4dp</item> + <item name="android:layout_marginTop">8dp</item> + <item name="android:textSize">14sp</item> + <item name="android:textAllCaps">true</item> + <item name="android:textColor">#5b5b5b</item> + <item name="android:textStyle">bold</item> + </style> + + <style name="Divider"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">1.5dp</item> + <item name="android:background">#b7b7b7</item> + </style> + +</resources>
\ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 7ef9f67c..c6d954dc 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="invite_contact">Пригласить собеседника</string> <string name="you">Вы</string> <string name="conference_not_found">Конференция не найдена</string> @@ -13,7 +12,6 @@ <string name="leave">Покинуть</string> <string name="add_back">Добавить в ответ</string> <string name="contact_has_read_up_to_this_point">%s видела сообщения до этого момента</string> - <string name="app_name">Conversations</string> <string name="action_settings">Настройки</string> <string name="action_add">Новая беседа</string> @@ -59,10 +57,6 @@ <string name="show_otr_key">Контрольная сумма криптографического протокола OTR</string> <string name="no_otr_fingerprint">Нет созданных контрольных сумм криптографического протокола OTR. Просто начните новую зашифрованную беседу</string> <string name="start_conversation">Начать Беседу</string> - <string name="invite_contacts">Пригласить Пользователя</string> - <string name="invite_contacts_to_existing">Пригласить пользователя в существующую конференцию</string> - <string name="new_conference">Создать новую конференцию</string> - <string name="new_contact">Создать новый контакт</string> <string name="contacts">Контакты</string> <string name="search_jabber_id">Укажите уникальный идентификатор пользователя JID (Джаббер ID)</string> <string name="choose_account">Выберите аккаунт</string> @@ -78,9 +72,6 @@ <string name="ok">ОК</string> <string name="done">Готово</string> <string name="hide">Спрятать</string> - <string name="create_invite">Создать \u0026 Пригласить</string> - <string name="new_conference_explained">Вы хотите создать новую конференцию со случайным адресом и пригласить туда выбранных пользователей?</string> - <string name="no_open_mucs">Нет существующих конференций</string> <string name="invitation_sent">Приглашение отправлено</string> <string name="account_offline">Аккаунт не в сети</string> <string name="cant_invite_while_offline">Вы должны быть в сети, чтобы пригласить пользователей в конференцию</string> @@ -137,8 +128,6 @@ <string name="use_pgp_encryption">Использовать OpenPGP шифрование</string> <string name="pref_xmpp_resource">XMPP ресурс</string> <string name="pref_xmpp_resource_summary">Имя, которым Conversations идентифицирует себя</string> - <string name="pref_accept_files">Принимать файлы</string> - <string name="pref_accept_files_summary">Автоматически принимать файлы размером меньше…</string> <string name="pref_notification_settings">Настройки Уведомлений</string> <string name="pref_notifications">Уведомление</string> <string name="pref_notifications_summary">Уведомлять когда приходят новые сообщения</string> @@ -170,7 +159,6 @@ <string name="pref_grant_presence_updates">Предоставлять обновления присутствия</string> <string name="pref_grant_presence_updates_summary">Разрешить и запрашивать статус присутствия для созданных вами контактов</string> <string name="subscriptions">Подписки</string> - <string name="subscription_updated">Подписка обновлена</string> <string name="your_account">Ваш аккаунт</string> <string name="keys">Ключи</string> <string name="send_presence_updates">Анонсировать статус присутствия</string> @@ -195,13 +183,10 @@ <string name="account_status_not_found">Сервер не найден</string> <string name="account_status_no_internet">Нет соединения</string> <string name="account_status_requires_tls">Сервер требует использования криптографического протокола TLS</string> - <string name="account_status_error">Неподтвержденный сертификат</string> <string name="account_status_regis_fail">Регистрация не удалась</string> <string name="account_status_regis_conflict">Имя пользователя уже используется</string> <string name="account_status_regis_success">Регистрация завершена</string> <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string> - <string name="certif_no_trust">Не подключаться</string> - <string name="certif_trust">Принять сертификат</string> <string name="encryption_choice_none">Без шифрования</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4ede1c10..b6477939 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <color name="primary" type="color">#ff259b24</color> + <color name="primarydark" type="color">#ff0a7e07</color> <color name="primarytext" type="color">#de000000</color> <color name="secondarytext" type="color">#8a000000</color> <color name="ondarktext" type="color">#fffafafa</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index 10a3f0e2..c636be79 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> + <string name="title_activity_choose_contact">Choose contact</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> <string name="minutes_ago">%d mins ago</string> @@ -37,19 +38,17 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="enter_new_name">Enter a new name:</string> - <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</string> + <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string> + <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string> <string name="account_info">Server Info</string> <string name="register_account">Register new account on server</string> <string name="share_with">Share with</string> <string name="ask_again"><u>Click to ask again</u></string> <string name="show_otr_key">OTR fingerprint</string> - <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string> + <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead and start an encrypted conversation</string> <string name="start_conversation">Start Conversation</string> - <string name="invite_contacts">Invite Contacts</string> - <string name="invite_contacts_to_existing">Invite to existing conference</string> - <string name="new_conference">Create new conference</string> - <string name="new_contact">Create new contact</string> + <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> <string name="search_jabber_id">Search or enter Jabber ID</string> <string name="choose_account">Choose account</string> @@ -65,9 +64,6 @@ <string name="ok">OK</string> <string name="done">Done</string> <string name="hide">Hide</string> - <string name="create_invite">Create \u0026 Invite</string> - <string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string> - <string name="no_open_mucs">No existing conferences</string> <string name="invitation_sent">Invitation sent</string> <string name="account_offline">Account offline</string> <string name="cant_invite_while_offline">You have to be online to invite people to conferences</string> @@ -149,7 +145,7 @@ <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> <string name="pref_show_last_seen">Display last seen</string> <string name="pref_show_last_seen_summary">Display the latest time a contact has been seen online</string> - <string name="openpgp_error">OpenKeychain reporeted an error</string> + <string name="openpgp_error">OpenKeychain reported an error</string> <string name="error_decrypting_file">I/O Error decrypting file</string> <string name="error_copying_image_file">Error copying image file.</string> <string name="accept">Accept</string> @@ -157,7 +153,6 @@ <string name="pref_grant_presence_updates">Grant presence updates</string> <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> <string name="subscriptions">Subscriptions</string> - <string name="subscription_updated">Subscription updated</string> <string name="your_account">Your account</string> <string name="keys">Keys</string> <string name="send_presence_updates">Send presence updates</string> @@ -182,13 +177,10 @@ <string name="account_status_not_found">Server not found</string> <string name="account_status_no_internet">No connectivity</string> <string name="account_status_requires_tls">Server requires TLS</string> - <string name="account_status_error">Untrusted cerficate</string> <string name="account_status_regis_fail">Registration failed</string> <string name="account_status_regis_conflict">Username already in use</string> <string name="account_status_regis_success">Registration completed</string> <string name="account_status_regis_not_sup">Server does not support registration</string> - <string name="certif_no_trust">Don\'t connect</string> - <string name="certif_trust">Trust certificate</string> <string name="encryption_choice_none">Plain text</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -269,4 +261,11 @@ <string name="save_as_bookmark">Save as bookmark</string> <string name="delete_bookmark">Delete bookmark</string> <string name="bookmark_already_exists">This bookmark already exists</string> + <string name="you">You</string> + <string name="action_edit_subject">Edit conference subject</string> + <string name="conference_not_found">Conference not found</string> + <string name="leave">Leave</string> + <string name="contact_added_you">Contact added you to contact list</string> + <string name="add_back">Add back</string> + <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1468283e..a827fe36 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -6,14 +6,14 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:textSize">14sp</item> <item name="android:textAllCaps">true</item> - <item name="android:textColor">#5b5b5b</item> + <item name="android:textColor">@color/primarytext</item> <item name="android:textStyle">bold</item> </style> <style name="Divider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> + <item name="android:background">@color/divider</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 0c4ddc39..97f1db8f 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -8,8 +8,8 @@ </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> - <item name="android:background">#259b24</item> - <item name="android:backgroundStacked">#0a7e07</item> + <item name="android:background">@color/primary</item> + <item name="android:backgroundStacked">@color/primarydark</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:icon">@android:color/transparent</item> </style> |
