
Conflicts: res/values/strings.xml src/org/fdroid/fdroid/DB.java src/org/fdroid/fdroid/ManageRepo.java src/org/fdroid/fdroid/RepoXMLHandler.java src/org/fdroid/fdroid/Utils.java
Conflicts: res/values/strings.xml src/org/fdroid/fdroid/DB.java src/org/fdroid/fdroid/ManageRepo.java src/org/fdroid/fdroid/RepoXMLHandler.java src/org/fdroid/fdroid/Utils.java