diff options
author | lookshe <github@lookshe.org> | 2016-05-26 17:46:58 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-05-26 17:46:58 +0200 |
commit | 327cfb8ae52443c3cb7ff7f09a753300365a306c (patch) | |
tree | 02ed62c978685ce7f481d98ed4d2bd3c508587a6 /src/main/res/values-ro-rRO | |
parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
parent | 33218ec32a47292a46d574e5107164b8e8a72e40 (diff) |
Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4
Conflicts:
README.md
art/render.rb
build.gradle
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
src/main/java/eu/siacs/conversations/entities/Bookmark.java
src/main/java/eu/siacs/conversations/entities/Contact.java
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/entities/Message.java
src/main/java/eu/siacs/conversations/parser/IqParser.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
src/main/res/layout/activity_contact_details.xml
src/main/res/layout/message_received.xml
src/main/res/layout/message_sent.xml
src/main/res/values-bg/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-tr-rTR/strings.xml
Diffstat (limited to '')
-rw-r--r-- | src/main/res/values-ro-rRO/strings.xml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index d799e1c2..6c158fa4 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Accepta fisiere</string> <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string> <string name="pref_accept_files_size_summary">Accepta automat fisiere mai mici decat...</string> + <string name="pref_attachments">Atasamente</string> + <string name="pref_return_to_previous">Partajare rapida</string> + <string name="pref_return_to_previous_summary">Intoarcere la activitatea precedenta in loc sa deschizi conversatia, dupa ce ai partajat ceva</string> <string name="pref_notification_settings">Notificare</string> <string name="pref_notifications">Notificari</string> <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string> <string name="pref_vibrate">Vibreaza</string> + <string name="pref_vibrate_summary">Vibreaza cand un nou mesaj este primit</string> + <string name="pref_led">Notificare LED</string> + <string name="pref_led_summary">Clipeste lumina de notificare atunci cand un nou mesaj este primit</string> + <string name="pref_sound">Ton de apel</string> + <string name="pref_sound_summary">Notificare sonora atunci cand un nou mesaj este primit</string> <string name="pref_notification_grace_period">Perioada de gratie notificari </string> <string name="pref_notification_grace_period_summary">Opreste notificari pentru o scurta perioada dupa ce o copie a mesajului a fost primita</string> <string name="pref_advanced_options">Optiuni avansate</string> @@ -543,6 +551,7 @@ <string name="shared_file_with_x">Partajeaza fisierul cu %s...</string> <string name="shared_image_with_x">Partajeaza imaginea cu %s.</string> <string name="shared_images_with_x">Partajeaza imaginile cu %s.</string> + <string name="shared_text_with_x">Partajeaza textul cu %s</string> <string name="no_storage_permission">Conversations are nevoie de acces la stocarea externa</string> <string name="sync_with_contacts">Sincronizeaza cu contactele</string> <string name="sync_with_contacts_long">Conversations doreste sa potriveasta lista de contacte XMPP cu cea din dispozitiv pentru a putea afisa numule lor complete si avatarele.\n\nConversations doar v-a citi si potrivi local fara sa le incarce catre vreun server.\n\nUrmeaza sa fii intrebat daca doresti sa permiti accesul la contacte.</string> @@ -571,4 +580,24 @@ Emitent</string> <string name="no_keys_just_confirm">Deja ai incredere in acest contact. Selectand \'gata\' doar confirmi ca %s ia parte la conferinta.</string> <string name="select_image_and_crop">Selecteaza imaginea si decupeaza</string> <string name="this_account_is_disabled">Ai dezactivat acest cont</string> + <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fisier invalid</string> + <string name="no_application_to_share_uri">Nu s-a gasit nici o aplicatie care sa partajeze URI</string> + <string name="share_uri_with">Partajeaza URI cu...</string> + <string name="welcome_text">XMPP este un protocol independent ce nu depinde de un anume furnizor. Aveți posibilitatea sa utilizati acest client cu orice server XMPP doriti.\nTotusi pentru confortul dumneavoastra am facilitat crearea unui cont pe conversations.im; un furnizor potrivit pentru utilizarea cu aplicatia Conversations.</string> + <string name="magic_create_text">Va vom ghida prin procesul de creare al unui cont pe conversations.im.\nCand alegeti conversations.im ca furnizor veti putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastra Jabber.</string> + <string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string> + <string name="create_account">Creeaza cont</string> + <string name="use_own_provider">Foloseste furnizorul meu</string> + <string name="pick_your_username">Alege un nume de utilizator</string> + <string name="pref_manually_change_presence">Schimba manual setarea de prezenta</string> + <string name="pref_manually_change_presence_summary">Atinge-ti avatarul pentru a-ti schimba starea de prezenta</string> + <string name="change_presence">Schimba setarea de prezenta</string> + <string name="status_message">Mesaj de status</string> + <string name="all_accounts_on_this_device">Seteaza pentru toate conturile de pe acest dispozitiv</string> + <string name="presence_chat">Disponibil pentru conversatie</string> + <string name="presence_online">Conectat</string> + <string name="presence_away">Plecat</string> + <string name="presence_xa">Indisponibil</string> + <string name="presence_dnd">Ocupat</string> + <string name="secure_password_generated">O parola sigura a fost generata</string> </resources> |