user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:43:20 +09:00
parent 94d258ddbb
commit c0bce4f3b1
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/values/strings.xml
View File

@@ -127,21 +127,14 @@
<string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
<string name="settings_dark_mode_title">Dark mode</string>
<string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
<<<<<<< HEAD
<string name="settings_nomedia_title">Hide image from gallery</string>
<string name="settings_nomedia_summary">Hides image from gallery</string>
=======
>>>>>>> origin/development
<string name="settings_lock_none">None</string>
<string name="settings_lock_pattern">Pattern</string>
<string name="settings_lock_pin" translatable="false">PIN</string>
<string name="settings_lock_password">Password</string>
<<<<<<< HEAD
<string name="settings_lock_biometrics">Biometrics</string>
=======
<string name="settings_lock_biomatrics">Biomatrics</string>
>>>>>>> origin/development
<string name="settings_lock_fingerprint">Fingerprint</string>
<string name="settings_lock_enabled">Enabled</string>
<string name="settings_lock_confirm">Input same lock once more to confirm Lock</string>