diff options
| author | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
| commit | fb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (patch) | |
| tree | cf0fb5a62aefaf34fd8e134fa20c91fe641c0898 /src/main/res/values-eu/strings.xml | |
| parent | 25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff) | |
| parent | c4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff) | |
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/utils/FileUtils.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-de/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ru/strings.xml
Diffstat (limited to 'src/main/res/values-eu/strings.xml')
| -rw-r--r-- | src/main/res/values-eu/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index f04fd284..605af928 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -312,6 +312,7 @@ <string name="checking_x">%s egiaztatzen HTTP ostalarian</string> <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string> <string name="check_x_filesize">Egiaztatu %sren neurria</string> + <string name="check_x_filesize_on_host">Egiaztatu %1$sren neurria %2$s ostalarian</string> <string name="message_options">Mezuaren aukerak</string> <string name="copy_text">Testua kopiatu</string> <string name="copy_original_url">Jatorrizko URLa kopiatu</string> @@ -502,6 +503,8 @@ <string name="pref_away_when_screen_off_summary">Zure baliabidea urrun bezala markatzen du pantaila itzalita dagoenean</string> <string name="pref_xa_on_silent_mode">Ez eskuragarri modu isilean</string> <string name="pref_xa_on_silent_mode_summary">Zure baliabidea ez eskuragarri bezala markatzen du gailua modu isilean dagoenean</string> + <string name="pref_treat_vibrate_as_silent">Dardara modu isila bezala tratatu</string> + <string name="pref_treat_vibrate_as_silent_summary">Zure baliabidea ez eskuragarri bezala markatzen du gailua dardara moduan dagoenean</string> <string name="pref_show_connection_options">Konexioaren ezarpen luzatuak</string> <string name="pref_show_connection_options_summary">Ostalariaren izena eta ataka ezarpenak erakutsi kontu bat ezartzerakoan</string> <string name="hostname_example">xmpp.adibidea.com</string> @@ -557,4 +560,7 @@ <string name="selection_too_large">Hautatutako zatia handiegia da</string> <string name="no_accounts">(Ez dago kontu aktiborik)</string> <string name="this_field_is_required">Datu hau beharrezkoa da</string> + <string name="no_keys_just_confirm">Kontaktu honetaz fidatzen zara dagoeneko. \'Eginda\' hautatuz %s konferentzia honen kidea dela egiaztatzen duzu besterik gabe.</string> + <string name="select_image_and_crop">Irudia hautatu eta moztu</string> + <string name="this_account_is_disabled">Kontu hau ezgaitu duzu</string> </resources> |