Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix recaptch weblate conflict

Browse source
This commit is contained in:
Christian Schabesberger 2017-01-09 22:46:07 +01:00
commit b3225bebe6
3 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/values/strings.xml
View file

@ -171,7 +171,7 @@
<string name="msg_url_malform">Malformed URL or Internet not available</string>
<string name="msg_running">NewPipe Downloading</string>
<string name="msg_running_detail">Tap for details</string>
<string name="msg_wait">Please wait...</string>
<string name="msg_wait">Please wait…</string>
<string name="msg_copied">Copied to clipboard.</string>
<string name="no_available_dir">Please select an available download directory.</string>
@ -269,9 +269,9 @@
"when a user tries to pick up one of cards.\n\n"
</string>
<string name="action_settings">Settings</string>
<string name="reCaptchaActivity">reCaptcha</string>
<string name="reCaptcha_title">reCaptcha Challenge</string>
<string name="recaptcha_request_toast">ReCaptcha Challenge requested</string>
<string name="reCaptchaActivity">reCAPTCHA</string>
<string name="reCaptcha_title">reCAPTCHA Challenge</string>
<string name="recaptcha_request_toast">reCAPTCHA Challenge requested</string>
<!-- End of GigaGet's Strings -->