diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-10 15:17:07 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-10 15:17:07 +0200 |
| commit | b73901c3aedf4c9f5f6b77b5354b97701ba91e49 (patch) | |
| tree | a4e5ff7fc76052e4b3066e2cab4cbe1e5ba4887f /src/main/res/values | |
| parent | f8f5bcb2ae099240ecbc525b0e56119fe7c65e8d (diff) | |
| parent | fce613e4a6ff389feac23fb843c813276c78203b (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4631bd60..1af33587 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,6 @@ <string name="send_otr_message">Send OTR encrypted message</string> <string name="send_pgp_message">Send OpenPGP encrypted message</string> <string name="your_nick_has_been_changed">Your nickname has been changed</string> - <string name="download_image">Download Image</string> <string name="send_unencrypted">Send unencrypted</string> <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> <string name="openkeychain_required">OpenKeychain</string> @@ -320,12 +319,12 @@ <string name="checking_image">Checking image on HTTP host</string> <string name="image_file_deleted">The image file has been deleted</string> <string name="not_connected_try_again">You are not connected. Try again later</string> - <string name="check_image_filesize">Check image file size</string> + <string name="check_x_filesize">Check %s size</string> <string name="message_options">Message options</string> <string name="copy_text">Copy text</string> <string name="copy_original_url">Copy original URL</string> <string name="send_again">Send again</string> - <string name="image_url">Image URL</string> + <string name="file_url">File URL</string> <string name="message_text">Message text</string> <string name="url_copied_to_clipboard">URL copied to clipboard</string> <string name="message_copied_to_clipboard">Message copied to clipboard</string> @@ -479,4 +478,5 @@ <string name="none">None</string> <string name="recently_used">Most recently used</string> <string name="choose_quick_action">Choose quick action</string> + <string name="file_not_found_on_remote_host">File not found on remote server</string> </resources> |