Merge branch 'develop' of https://github.com/stom79/mastalab into develop

This commit is contained in:
stom79 2018-05-12 11:11:31 +02:00
commit 536336375b
1 changed files with 5 additions and 5 deletions

View File

@ -331,9 +331,9 @@
<item>Ez</item>
</string-array>
<string-array name="settings_theme">
<item>Dark</item>
<item>Light</item>
<item>Black</item>
<item>Iluna</item>
<item>Argia</item>
<item>Beltza</item>
</string-array>
<string-array name="settings_resize_picture">
<item>Ez</item>
@ -484,6 +484,6 @@ Eskerrik asko Stéphane logoagatik. </string>
<string name="poxy_port">Ataka</string>
<string name="poxy_login">Saioa</string>
<string name="poxy_password">Pasahitza</string>
<string name="set_theme">Theme:</string>
<string name="set_compact_mode">Compact mode</string>
<string name="set_theme">Itxura:</string>
<string name="set_compact_mode">Modu trinkoa</string>
</resources>