Alexander Brakowski 81d3c38130 solved merge conflicts int res/xml/profile_preferences.xml 10 lat temu
..
preferences.xml b8fff452a9 added settings fragment, and added a create new button to the action button to the action bar 10 lat temu
profile_preferences.xml 81d3c38130 solved merge conflicts int res/xml/profile_preferences.xml 10 lat temu
settings_preferences.xml 43ae701267 further translation work, especially in settings and profile manager 10 lat temu