Merge branch 'master' into super-fdroid

Conflicts: AndroidManifest.xml lint.xml src/org/fdroid/fdroid/AppDetails.java
2014-04-25 20:15:54 +02:00 · 2014-04-25 20:15:54 +02:00 · 1f154adf42
commit 1f154adf42
parent 9fd22c92ff d287dca854
204 changed files with 10981 additions and 3975 deletions
--- a/.classpath
+++ b/.classpath
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPinning"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MemorizingActivity"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/UniversalImageLoader"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
--- a/.fdmeta
+++ b/.fdmeta
@ -0,0 +1,7 @@
+Web Site:https://f-droid.org
+Source Code:https://gitorious.org/f-droid/fdroidclient
+Issue Tracker:https://f-droid.org/repository/issues
+
+Donate:https://f-droid.org/about
+FlattrID:343053
+Bitcoin:15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,4 @@
 /local.properties
-/.classpath
 /bin/
 /gen/
 /build/
@ -9,3 +8,4 @@
 /.idea/
 /*.iml
 out
+/.settings/
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,12 @@
 [submodule "extern/Universal-Image-Loader"]
-	path = extern/Universal-Image-Loader
+	path = extern/UniversalImageLoader
 	url = https://github.com/nostra13/Android-Universal-Image-Loader
-    ignore = dirty
+	ignore = dirty
+[submodule "extern/MemorizingTrustManager"]
+	path = extern/MemorizingTrustManager
+	url = https://github.com/ge0rg/MemorizingTrustManager.git
+	ignore = dirty
+[submodule "extern/AndroidPinning"]
+	path = extern/AndroidPinning
+	url = https://github.com/binaryparadox/AndroidPinning.git
+	ignore = dirty
--- a/Android.mk
+++ b/Android.mk
@ -0,0 +1,23 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_PACKAGE_NAME := F-Droid
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := \
+  $(call all-java-files-under, src) \
+  $(call all-java-files-under, extern/MemorizingTrustManager/src) \
+  $(call all-java-files-under, extern/AndroidPinning/src) \
+  $(call all-java-files-under, extern/UniversalImageLoader/library/src )
+
+res_dirs = res extern/MemorizingTrustManager/res extern/AndroidPinning/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
+
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages org.fdroid.fdroid:de.duenndns.ssl:org.thoughtcrime.ssl.pinning
+
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PACKAGE)
+
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.fdroid.fdroid"
    android:installLocation="auto"
-    android:versionCode="570"
-    android:versionName="0.57-test" >
+    android:versionCode="640"
+    android:versionName="0.64-test" >

    <uses-sdk
        android:minSdkVersion="5"
@ -17,14 +17,26 @@
        android:smallScreens="true"
        android:xlargeScreens="true" />

+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
    <uses-feature
        android:name="android.hardware.touchscreen"
        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.bluetooth"
+        android:required="false" />

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.NFC" />
    
    <!-- These permissions are only granted when F-Droid is installed as a system app! -->
    <uses-permission android:name="android.permission.DELETE_PACKAGES" />
@ -36,9 +48,31 @@
        android:label="@string/app_name"
        android:allowBackup="true"
        android:theme="@style/AppThemeDark"
-        android:supportsRtl="false" >
+        android:supportsRtl="true" >
+
+        <provider
+            android:authorities="org.fdroid.fdroid.data.AppProvider"
+            android:name="org.fdroid.fdroid.data.AppProvider"
+            android:exported="false"/>
+
+        <provider
+            android:authorities="org.fdroid.fdroid.data.RepoProvider"
+            android:name="org.fdroid.fdroid.data.RepoProvider"
+            android:exported="false"/>
+
+        <provider
+            android:authorities="org.fdroid.fdroid.data.ApkProvider"
+            android:name="org.fdroid.fdroid.data.ApkProvider"
+            android:exported="false"/>
+
+        <provider
+            android:authorities="org.fdroid.fdroid.data.InstalledAppProvider"
+            android:name="org.fdroid.fdroid.data.InstalledAppProvider"
+            android:exported="false"/>
+
        <activity
            android:name=".FDroid"
+            android:launchMode="singleTop"
            android:configChanges="keyboardHidden|orientation|screenSize" >

            <intent-filter>
@ -66,9 +100,8 @@
        </activity>
        <activity
            android:name=".ManageRepo"
-            android:allowTaskReparenting="true"
            android:label="@string/menu_manage"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
            android:parentActivityName=".FDroid" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
@ -104,6 +137,12 @@
                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
+                <!--
+                Some QR Code scanners don't respect custom schemes like fdroidrepo://,
+                so this is a workaround, since the local repo URL is all uppercase in
+                the QR Code for sending the local repo to another device.
+                -->
+                <data android:path="/FDROID/REPO" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@ -111,15 +150,47 @@
                <category android:name="android.intent.category.BROWSABLE" />
                <category android:name="android.intent.category.DEFAULT" />

+                <!--
+                Android's scheme matcher is case-sensitive, so include
+                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
+                QR Codes have a special ALL CAPS mode that uses a reduced
+                character set, making for more compact QR Codes.
+                -->
+                <data android:scheme="fdroidrepo" />
+                <data android:scheme="FDROIDREPO" />
+                <data android:scheme="fdroidrepos" />
+                <data android:scheme="FDROIDREPOS" />
+            </intent-filter>
+            <!-- Handle NFC tags detected from outside our application -->
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!--
+                URIs that come in via NFC have scheme/host normalized to all lower case
+                https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_NDEF_DISCOVERED
+                -->
                <data android:scheme="fdroidrepo" />
                <data android:scheme="fdroidrepos" />
            </intent-filter>
-        </activity>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />

+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/vnd.org.fdroid.fdroid.repo" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".NfcNotEnabledActivity"
+            android:noHistory="true" />
        <activity
            android:name=".views.RepoDetailsActivity"
-            android:label="@string/menu_manage" />
- 
+            android:label="@string/menu_manage"
+            android:parentActivityName=".ManageRepo"
+            android:windowSoftInputMode="stateHidden" />
+
        <activity
            android:name=".AppDetails"
            android:label="@string/app_details"
@ -204,6 +275,9 @@
                android:name="android.app.searchable"
                android:resource="@xml/searchable" />
        </activity>
+        
+        <!--Used for SSL TOFU, supported by extern/MemorizingTrustManager lib -->
+        <activity android:name="de.duenndns.ssl.MemorizingActivity" />

        <receiver android:name=".StartupReceiver" >
            <intent-filter>
@ -212,10 +286,22 @@
                <category android:name="android.intent.category.HOME" />
            </intent-filter>
        </receiver>
-        <receiver android:name=".PackageReceiver" >
+        <receiver android:name=".PackageAddedReceiver" >
            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_UPGRADED" />
+
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".PackageUpgradedReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_CHANGED" />
+
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".PackageRemovedReceiver" >
+            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_REMOVED" />

                <data android:scheme="package" />
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,57 @@
 ### Upcoming release

+* Fix crash on startup for devices with more than 500 installed apps
+
+* Send apps to other devices directly from the App Details screen via NFC or Bluetooth
+
+* Improved performance for devices with many installed apps
+
+* Improve ellipsizing and spacing in the app lists
+
+* Start translating the category lists
+
+* Keep track of installed apps internally, rather than asking Android each time
+
+* Fix some crashes
+
+* Translation updates
+
+### 0.63 (2014-04-07)
+
+* Support for Network Service Discovery of local FDroid repos on Android 4.1+
+  from the repository management screen
+
+* Always remember the selected category in the list of apps
+
+* Send FDroid via Bluetooth to any device that supports receiving APKs via
+  Bluetooth (stock Android blocks APKs, most ROMs allow them)
+
+* NFC support: beam repo configs from the repo detail view (Android 4.0+),
+  beam the FDroid.apk from FDroid's main screen (Android 4.1+)
+
+* Support for repositories using self-signed HTTPS certificates through
+  a Trust-on-first-use popup
+
+* Support for TLS Subject-Public-Key-Identifier pinning
+
+* Add native Right-to-Left support on devices running 4.2 and later
+
+* Filter app compatibility by maxSdkVersion too
+
+* Major internal changes to enable F-Droid to handle repos with thousands
+  of apps without slowing down too much. These internal changes will also make
+  new features easier to implement.
+
+* Various fixes to layout issues introduced in 0.58
+
+* Translation updates
+
+### 0.58 (2014-01-11)
+
+* Download icons with a resolution that matches the device's screen density,
+  which saves resources on smaller devices and gets rid of unnecessary
+  blurriness on larger devices
+
 * Tweaked some layouts, especially the app lists and their compact layout

 * App lists now show more useful version information: current version names,
@ -10,13 +62,13 @@
 * Slightly increase performance in repo index XML handling by mapping apps
  with a HashMap, as opposed to doing linear searches

-* More info on App Details: The category in which the app was found, all the
-  categories the app is in and the Android version required to run each one of
-  its versions available.
+* More app info shown in App Details: The category in which the app was found
+  and all the categories the app is in, as well as the Android version
+  required to run each one of its versions available

 * The preferences screen now uses descriptive summaries, which means that you
  can see what the checkbox preferences actually mean and what the edit and
-  list preferences are set at.
+  list preferences are set at

 * Support for dogecoin donation method added (wow)

@ -27,6 +79,14 @@

 * Fixed a crash when trying to access a non-existing app

+* F-Droid registers with Android to receive F-Droid URIs https://\*/fdroid/repo
+  and fdroidrepos://
+
+* support including signing key fingerprint in repo URIs
+
+* when adding new repos that include the fingerprint, check to see whether
+  that repo exists in F-Droid already, and if the fingerprints match
+
 * Other minor bug fixes

 * Lots of translation updates
@ -34,6 +94,7 @@
 ### 0.55 (2013-11-11)

 * Fixed problems with category selection and permission lists on Android 2.X devices.
+
 * Lots of translation updates, including new Norwegian translation.

 ### 0.54 (2013-11-05)
--- a/README.md
+++ b/README.md
@ -10,19 +10,42 @@ Building from source

 The only required tools are the Android SDK and Apache Ant.

+Once you have checked out the version you wish to build, run:
+
 ```
 git submodule update --init
-android update project -p .
-android update project -p extern/Universal-Image-Loader/library
+./ant-prepare.sh # This runs 'android update' on the libs and the main project
 ant clean release
 ```

+The project itself supports Gradle, but some of the libraries it uses don't.
+Hence it is currently not possible to build F-Droid with Gradle in a clean way
+without manual interaction.
+
+Building as part of a ROM
+-------------------------
+
+Add the following lines to your repo manifest:
+
+```
+<remote name="fdroid" fetch="https://git.gitorious.org/f-droid" />
+<remote name="github" fetch="https://github.com/" />
+
+<project path="packages/apps/fdroidclient" name="fdroidclient.git" remote="fdroid" revision="0.62" />
+
+<project path="packages/apps/fdroidclient/extern/UniversalImageLoader" name="nostra13/Android-Universal-Image-Loader" remote="github" revision="b1b49e51f2c43b119edca44691daf9ab6c751158" />
+<project path="packages/apps/fdroidclient/extern/AndroidPinning" name="binaryparadox/AndroidPinning" remote="github" revision="ce84a19e753bbcc3304525f763edb7d7f3b62429" />
+<project path="packages/apps/fdroidclient/extern/MemorizingTrustManager" name="ge0rg/MemorizingTrustManager" remote="github" revision="a705441ac53b9e1aba9f00f3f59aab81da6fbc9e" />
+```
+
+Adding F-Droid is then just a matter of adding `F-Droid` to your `PRODUCT_PACKAGES`.

 Direct download
 ---------------

 You can [download the application](https://f-droid.org/FDroid.apk) directly
-from our site.
+from our site or [browse it in the
+repo](https://f-droid.org/app/org.fdroid.fdroid).


 Contributing
@ -36,12 +59,32 @@ and our [Forums](https://f-droid.org/forums/).
 Translating
 -----------

-The `locale` dir is automatically updated via the
-[android2po](https://github.com/miracle2k/android2po) tool, and translations
-are pulled from our Pootle translation server at
-[f-droid.org/translate](https://f-droid.org/translate). You should only add or
-remove strings in the `res/values/` dir, since all the `res/values-*` dirs are
-also generated automatically.
+The `res/values-*` dirs are kept up to date automatically via [MediaWiki's
+Translate Extension](http://www.mediawiki.org/wiki/Extension:Translate). See
+[our translation page](https://f-droid.org/wiki/page/Special:Translate) if you
+would like to contribute.
+
+
+Running the test suite
+----------------------
+
+FDroid client includes a embedded Android Test Project for running tests.  It
+is in the `test/` subfolder.  To run the tests from the command line, do:
+
+```
+git submodule update --init
+./ant-prepare.sh # This runs 'android update' on the libs and the main project
+ant clean emma debug install test
+```
+
+You can also run the tests in Eclipse. Here's how:
+
+1. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/` directory.
+2. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/test/` directory
+3. If **fdroid-test** has errors, right-click on it, select *Properties*, the
+*Java Build Path*, then click on the *Projects* tab.
+4. Click on the *Add...* button and select `fdroidclient/`
+5. Right-click on the **fdroid-test** project, then *Run As...* -> *Android JUnit Test*


 License
--- a/ant-prepare.sh
+++ b/ant-prepare.sh
@ -0,0 +1,10 @@
+#!/bin/bash -ex
+
+android update lib-project --path extern/UniversalImageLoader/library
+android update lib-project --path extern/AndroidPinning
+android update lib-project --path extern/MemorizingTrustManager
+android update project --path . --name F-Droid
+
+# technically optional, needed for the tests
+cd test
+android update test-project --path . --main ..
--- a/build.properties
+++ b/build.properties
--- a/build.gradle
+++ b/build.gradle
@ -3,7 +3,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:0.7.+'
+		classpath 'com.android.tools.build:gradle:0.9.1'
 	}
 }

@ -11,16 +11,47 @@ apply plugin: 'android'

 dependencies {
 	compile files('libs/android-support-v4.jar')
+	compile project(':extern:AndroidPinning')
+	compile project(':extern:UniversalImageLoader:library')
+	compile project(':extern:MemorizingTrustManager')
+}
+
+project(':extern:UniversalImageLoader:library') {
+	buildscript {
+		repositories {
+			mavenCentral()
+		}
+		dependencies {
+			classpath 'com.android.tools.build:gradle:0.9.1'
+		}
+	}
+
+	apply plugin: 'android'
+
+	android {
+		compileSdkVersion 16
+		buildToolsVersion '19.0.3'
+
+		sourceSets {
+			main {
+				manifest.srcFile 'AndroidManifest.xml'
+				java.srcDirs = ['src']
+				resources.srcDirs = ['src']
+				aidl.srcDirs = ['src']
+				renderscript.srcDirs = ['src']
+			}
+		}
+	}
 }

 android {
 	compileSdkVersion 19
-	buildToolsVersion "19.0.1"
+	buildToolsVersion '19.0.3'

 	sourceSets {
 		main {
 			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src', 'extern/Universal-Image-Loader/library/src']
+			java.srcDirs = ['src']
 			resources.srcDirs = ['src']
 			aidl.srcDirs = ['src']
 			renderscript.srcDirs = ['src']
@ -28,14 +59,13 @@ android {
 			assets.srcDirs = ['assets']
 		}

-		instrumentTest.setRoot('tests')
+		instrumentTest.setRoot('test')
 	}

 	buildTypes {
 		release {
 			runProguard true
-			proguardFile 'proguard-project.txt'
-			proguardFile getDefaultProguardFile('proguard-android.txt')
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
 		}
 	}

--- a/custom_rules.xml
+++ b/custom_rules.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="custom_rules">
+
+  <target name="javadoc" description="Generate Javadocs">
+    <javadoc sourcepath="${source.dir}"
+             destdir="${out.dir}/javadoc"
+             packagenames="org.fdroid.*"
+             windowtitle="${ant.project.name}"
+             doctitle="${ant.project.name}" />
+  </target>
+
+</project>
--- a/extern/AndroidPinning
+++ b/extern/AndroidPinning
@ -0,0 +1 @@
+Subproject commit ce84a19e753bbcc3304525f763edb7d7f3b62429
--- a/extern/MemorizingTrustManager
+++ b/extern/MemorizingTrustManager
@ -0,0 +1 @@
+Subproject commit a705441ac53b9e1aba9f00f3f59aab81da6fbc9e
--- a/extern/Universal-Image-Loader
+++ b/extern/Universal-Image-Loader
@ -1 +0,0 @@
-Subproject commit 1c2a91e464b49874068a8bf2a6e39d39aae9208a
--- a/extern/UniversalImageLoader
+++ b/extern/UniversalImageLoader
@ -0,0 +1 @@
+Subproject commit ee50fd1ce77d866a89374a5ff0886be6e179feb2
--- a/libs/README.android-support-v4.txt
+++ b/libs/README.android-support-v4.txt
@ -1,5 +1,5 @@
-The Android support library v4 is currently at *revision 19* from the Android SDK.
-This reversion was released on October 2013.
+The Android support library v4 is currently at *revision 19.1* from the Android SDK.
+This reversion was released on March 2014.

 See NOTICE.android-support-v4.txt for license.
 See http://developer.android.com/tools/extras/support-library.html for further info.
--- a/libs/android-support-v4.jar
+++ b/libs/android-support-v4.jar
--- a/lint.xml
+++ b/lint.xml
@ -5,6 +5,9 @@
        <ignore path="res/values/no_trans.xml" />
        <ignore path="res/values/default_repo.xml" />
    </issue>
+    <issue id="UnusedResources" severity="ignore" >
+        <ignore path="res/values/default_repo.xml" />
+    </issue>
    <issue id="ProtectedPermission">
        <ignore path="AndroidManifest.xml" />
    </issue>
--- a/project.properties
+++ b/project.properties
@ -2,4 +2,6 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.

 target=android-19

-android.library.reference.1=extern/Universal-Image-Loader/library
+android.library.reference.1=extern/UniversalImageLoader/library
+android.library.reference.2=extern/MemorizingTrustManager
+android.library.reference.3=extern/AndroidPinning
--- a/res/drawable-hdpi/ic_repo_app_default.png
+++ b/res/drawable-hdpi/ic_repo_app_default.png
--- a/res/drawable-ldpi/ic_repo_app_default.png
+++ b/res/drawable-ldpi/ic_repo_app_default.png
--- a/res/drawable-mdpi/ic_repo_app_default.png
+++ b/res/drawable-mdpi/ic_repo_app_default.png
--- a/res/drawable-xhdpi/ic_repo_app_default.png
+++ b/res/drawable-xhdpi/ic_repo_app_default.png
--- a/res/drawable-xxhdpi/ic_repo_app_default.png
+++ b/res/drawable-xxhdpi/ic_repo_app_default.png
--- a/res/layout-land/appdetails.xml
+++ b/res/layout-land/appdetails.xml
@ -16,6 +16,7 @@
            android:layout_height="wrap_content"
            android:padding="5dp"
            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
            android:orientation="vertical" >

 			<TextView
@ -35,16 +36,19 @@

                <ImageView
                    android:id="@+id/icon"
+                    android:contentDescription="@string/app_icon"
                    android:layout_width="56dp"
                    android:layout_height="56dp"
                    android:padding="4dp"
-                    android:scaleType="fitCenter" />
+					android:scaleType="fitCenter"
+					/>

 				<RelativeLayout
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:padding="4dp"
 					android:layout_toRightOf="@id/icon"
+					android:layout_toEndOf="@id/icon"
 					android:orientation="vertical" >

 					<TextView
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@ -3,7 +3,9 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:paddingLeft="8dp"
+	android:paddingStart="8dp"
 	android:paddingRight="8dp"
+	android:paddingEnd="8dp"
 	android:paddingTop="6dp"
 	android:paddingBottom="6dp"
 	android:baselineAligned="false"
@ -21,6 +23,7 @@

 		<TextView android:id="@+id/version"
 			android:paddingLeft="5dp"
+			android:paddingStart="5dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />

@ -39,6 +42,7 @@
 		<TextView android:id="@+id/sitec"
 			android:text="@string/about_sitec"
 			android:paddingLeft="5dp"
+			android:paddingStart="5dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />

@ -58,6 +62,7 @@
 		<TextView android:id="@+id/mailc"
 			android:text="@string/about_mailc"
 			android:paddingLeft="5dp"
+			android:paddingStart="5dp"
 			android:autoLink="email"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
--- a/res/layout/addrepo.xml
+++ b/res/layout/addrepo.xml
@ -37,6 +37,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:drawableLeft="@android:drawable/ic_dialog_alert"
+        android:drawableStart="@android:drawable/ic_dialog_alert"
        android:drawablePadding="20dp"
        android:padding="20dp"
        android:text="@string/repo_delete_to_overwrite"
--- a/res/layout/apklistitem.xml
+++ b/res/layout/apklistitem.xml
@ -31,6 +31,7 @@
  <TextView android:id="@+id/buildtype"
 		android:textSize="13sp"
 		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_marginBottom="4sp" />
@ -39,6 +40,7 @@
 		android:textSize="13sp"
 		android:layout_below="@id/buildtype"
 		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_marginBottom="4sp" />
@ -47,7 +49,9 @@
 		android:textSize="13sp"
 		android:layout_below="@id/buildtype"
 		android:layout_toLeftOf="@id/size"
+		android:layout_toStartOf="@id/size"
 		android:layout_marginRight="16sp"
+		android:layout_marginEnd="16sp"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />

@ -55,6 +59,15 @@
 		android:textSize="13sp"
 		android:layout_below="@id/size"
 		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content" />
+
+  <TextView android:id="@+id/incompatible_reasons"
+		android:textSize="13sp"
+		android:layout_below="@id/added"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />

--- a/res/layout/appdetails.xml
+++ b/res/layout/appdetails.xml
@ -6,25 +6,32 @@
 	android:baselineAligned="false"
 	android:orientation="vertical" >

-	<LinearLayout
-		android:id="@+id/header"
+	<RelativeLayout
+		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="4dp"
-		android:orientation="horizontal" >
+		android:baselineAligned="false" >

 		<ImageView
 			android:id="@+id/icon"
+			android:contentDescription="@string/app_icon"
 			android:layout_width="56dp"
 			android:layout_height="56dp"
+			android:layout_centerVertical="true"
 			android:padding="4dp"
-			android:scaleType="fitCenter" />
+			android:scaleType="fitCenter"
+			/>

 		<RelativeLayout
 			android:layout_width="fill_parent"
-			android:layout_height="56dp"
-			android:padding="6dp"
-			android:orientation="vertical" >
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toRightOf="@id/icon"
+			android:layout_toEndOf="@id/icon"
+			android:padding="5dp"
+			android:baselineAligned="false"
+			android:orientation="vertical"
+			>

 			<TextView
 				android:id="@+id/license"
@ -32,42 +39,59 @@
 				android:layout_height="wrap_content"
 				android:layout_alignParentTop="true"
 				android:layout_alignParentRight="true"
-				android:paddingTop="3sp"
-				android:paddingBottom="3sp"
-				android:layout_marginLeft="8sp"
-				android:textSize="13sp" />
-
-			<TextView
-				android:id="@+id/categories"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentBottom="true"
-				android:layout_alignParentRight="true"
-				android:layout_marginLeft="8sp"
-				android:textSize="13sp" />
+				android:layout_alignParentEnd="true"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_marginLeft="6sp"
+				android:layout_marginStart="6sp"
+				android:textSize="12sp"
+				/>

 			<TextView
 				android:id="@+id/title"
-				android:textSize="18sp"
+				android:textSize="17sp"
 				android:textStyle="bold"
 				android:singleLine="true"
 				android:ellipsize="end"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentLeft="true"
-				android:layout_toLeftOf="@id/license" />
+				android:layout_alignParentStart="true"
+				android:textAlignment="viewStart"
+				android:layout_toLeftOf="@id/license"
+				android:layout_toStartOf="@id/license" />
+
+			<TextView
+				android:id="@+id/categories"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_alignParentRight="true"
+				android:layout_alignParentEnd="true"
+				android:layout_marginLeft="6sp"
+				android:layout_marginStart="6sp"
+				android:layout_below="@id/title"
+				android:textSize="12sp" />

 			<TextView
 				android:id="@+id/status"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textSize="13sp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:textSize="12sp"
 				android:layout_alignParentLeft="true"
-				android:layout_alignParentBottom="true"
-				android:layout_toLeftOf="@id/categories" />
+				android:layout_alignParentStart="true"
+				android:textAlignment="viewStart"
+				android:layout_toLeftOf="@id/categories"
+				android:layout_toStartOf="@id/categories"
+				android:layout_below="@id/title" />
+
+

 		</RelativeLayout>
-	</LinearLayout>
+	</RelativeLayout>

 	<ListView
 		android:id="@android:id/list"
--- a/res/layout/appinfo.xml
+++ b/res/layout/appinfo.xml
@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:paddingBottom="10dp"
+	android:paddingTop="4dp"
+	android:paddingBottom="8dp"
 	android:baselineAligned="false"
 	android:orientation="vertical" >

@ -16,7 +17,7 @@
 		android:id="@+id/appid"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:textSize="13sp" />
+		android:textSize="12sp" />

 	<TextView
 		android:id="@+id/signature"
@ -37,6 +38,7 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="8sp"
+		android:textSize="13sp"
 		android:singleLine="false" />
 	
 	<TextView
@ -51,6 +53,7 @@
 		android:id="@+id/permissions_list"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:textSize="13sp"
 		android:singleLine="false" />

 </LinearLayout>
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@ -1,72 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
+	android:padding="10dp"
 	android:baselineAligned="false" >

 	<!-- Actual icon size is dependent on preferences and set in
 		AppListAdapater.java:layoutIcon() -->
-	<ImageView android:id="@+id/icon"
+	<ImageView
+		android:id="@+id/icon"
+		android:contentDescription="@string/app_icon"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:layout_gravity="center_vertical"
 		android:scaleType="fitCenter"
-		android:layout_width="64dp"
-		android:layout_height="64dp"
-		android:padding="8dp"
-		android:layout_centerVertical="true" />
+		/>

-	<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:paddingLeft="3dp"
-		android:paddingRight="8dp"
-		android:layout_toRightOf="@id/icon"
-		android:layout_centerVertical="true"
+		android:layout_height="wrap_content"
+		android:paddingLeft="10dp"
+		android:paddingStart="10dp"
+		android:layout_gravity="center_vertical"
 		android:baselineAligned="false" >

-		<TextView android:id="@+id/status"
-			android:singleLine="true"
-			android:ellipsize="end"
-			android:paddingTop="3sp"
-			android:paddingBottom="3sp"
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="10sp"
-			android:layout_alignParentTop="true"
-			android:layout_alignParentRight="true" />
+			android:baselineAligned="false"
+			android:layout_marginBottom="3dp"
+			>

-		<TextView android:id="@+id/license"
-			android:singleLine="true"
-			android:textSize="13sp"
-			android:ellipsize="end"
-			android:layout_width="wrap_content"
+			<TextView android:id="@+id/name"
+				android:textSize="17sp"
+				android:textStyle="bold"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_weight="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:textAlignment="viewStart"
+				/>
+
+			<TextView android:id="@+id/status"
+				android:textSize="13sp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_weight="1"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="8dp"
+				android:layout_marginStart="8dp"
+				android:layout_gravity="center_vertical"
+				android:textAlignment="viewEnd"
+				/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="10sp"
-			android:layout_alignParentBottom="true"
-			android:layout_alignParentRight="true" />
+			android:baselineAligned="false"
+			>

-		<TextView android:id="@+id/name"
-			android:textSize="17sp"
-			android:textStyle="bold"
-			android:paddingBottom="3sp"
-			android:singleLine="true"
-			android:ellipsize="end"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_toLeftOf="@id/status" />
+			<TextView android:id="@+id/summary"
+				android:textSize="13sp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_weight="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:textAlignment="viewStart"
+				/>

-		<TextView android:id="@+id/summary"
-			android:singleLine="true"
-			android:ellipsize="end"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/name"
-			android:gravity="center_vertical"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentBottom="true"
-			android:layout_toLeftOf="@id/license" />
+			<TextView android:id="@+id/license"
+				android:textSize="12sp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_weight="1"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="6sp"
+				android:layout_marginStart="6sp"
+				android:layout_gravity="center_vertical"
+				android:textAlignment="viewEnd"
+				/>

-	</RelativeLayout>
+		</LinearLayout>

-</RelativeLayout>
+	</LinearLayout>
+
+</LinearLayout>
--- a/res/layout/repo_item.xml
+++ b/res/layout/repo_item.xml
@ -12,10 +12,14 @@
     http://syedasaraahmed.wordpress.com/2012/10/03/android-onitemclicklistener-not-responding-clickable-rowitem-of-custom-listview/
    -->

-    <ImageView android:id="@+id/img"
+	<ImageView
+		android:id="@+id/img"
+		android:contentDescription="@string/repo_icon"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true" />
+        android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		/>

    <TextView android:id="@+id/repo_name"
        android:textSize="21sp"
@ -25,7 +29,9 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_toRightOf="@id/img"
-        android:layout_alignParentLeft="true"/>
+        android:layout_toEndOf="@id/img"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"/>

    <TextView android:id="@+id/repo_unsigned"
        android:textSize="14sp"
--- a/res/layout/repodetails.xml
+++ b/res/layout/repodetails.xml
@ -4,9 +4,13 @@
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
    android:paddingTop="@dimen/padding_top"
    android:paddingLeft="@dimen/padding_side"
-    android:paddingRight="@dimen/padding_side">
+    android:paddingStart="@dimen/padding_side"
+    android:paddingRight="@dimen/padding_side"
+    android:paddingEnd="@dimen/padding_side">

    <!-- Editable URL of this repo -->
    <TextView
@ -15,6 +19,7 @@
        android:id="@+id/label_repo_url"
        android:text="@string/repo_url"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:layout_alignParentTop="true" />
    <EditText
        android:layout_width="fill_parent"
@ -31,6 +36,7 @@
        android:text="@string/repo_name"
        android:layout_below="@id/input_repo_url"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:paddingTop="@dimen/form_label_top"/>
    <TextView
        android:layout_width="wrap_content"
@ -47,6 +53,7 @@
        android:text="@string/repo_description"
        android:layout_below="@id/text_repo_name"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:paddingTop="@dimen/form_label_top"/>
    <TextView
        android:layout_width="wrap_content"
@ -64,6 +71,7 @@
        android:text="@string/repo_num_apps"
        android:layout_below="@id/text_description"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:paddingTop="@dimen/form_label_top" />
    <TextView
        android:layout_width="wrap_content"
@ -79,6 +87,7 @@
        android:text="@string/repo_last_update"
        android:layout_below="@id/text_num_apps"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:paddingTop="@dimen/form_label_top" />
    <TextView
        android:layout_width="wrap_content"
@ -90,25 +99,26 @@
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:id="@+id/label_signature"
-        android:text="@string/repo_signature"
+        android:id="@+id/label_repo_fingerprint"
+        android:text="@string/repo_fingerprint"
        android:layout_below="@id/text_last_update"
        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
        android:paddingTop="@dimen/form_label_top" />
    <TextView
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:singleLine="false"
        android:scrollHorizontally="false"
-        android:id="@+id/text_signature"
-        android:layout_below="@id/label_signature" android:textStyle="bold"/>
+        android:id="@+id/text_repo_fingerprint"
+        android:layout_below="@id/label_repo_fingerprint" android:textStyle="bold"/>
    <TextView
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:singleLine="false"
        android:scrollHorizontally="false"
-        android:id="@+id/text_signature_description"
-        android:layout_below="@id/text_signature"/>
+        android:id="@+id/text_repo_fingerprint_description"
+        android:layout_below="@id/text_repo_fingerprint"/>

    <!-- The last time this repo was updated -->
    <TextView
@ -128,4 +138,4 @@
        android:layout_height="wrap_content"
        android:layout_below="@id/text_not_yet_updated"/>

-</RelativeLayout>
+</RelativeLayout>
--- a/res/layout/repodiscoveryitem.xml
+++ b/res/layout/repodiscoveryitem.xml
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+       <TextView
+          android:id="@+id/reposcanitemname"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:maxLines="1"
+          android:paddingLeft="8sp"
+          android:paddingStart="8sp"
+          android:text="@string/discovered_repo_name"
+          android:textSize="16sp"
+          android:textStyle="bold" />
+
+       <TextView
+          android:id="@+id/reposcanitemaddress"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_below="@+id/reposcanitemname"
+          android:layout_marginTop="2dp"
+          android:paddingLeft="8sp"
+          android:paddingStart="8sp"
+          android:maxLines="1"
+          android:text="@string/repo_address"
+          android:textSize="14sp" />
+
+</RelativeLayout>
--- a/res/layout/repodiscoverylist.xml
+++ b/res/layout/repodiscoverylist.xml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+	<LinearLayout
+	    android:id="@+id/reposcanprogresslayout"
+	    android:layout_width="match_parent"
+	    android:layout_height="50dp"
+	    android:layout_alignParentTop="true"
+	    android:layout_alignParentLeft="true"
+	    android:layout_alignParentStart="true"
+	    android:layout_centerHorizontal="true"
+	    android:paddingTop="8sp" >
+
+	    <ProgressBar
+	        android:id="@+id/reposcaningspinner"
+	        style="?android:attr/progressBarStyle"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="center_horizontal"
+	        android:layout_marginRight="5dp"
+	        android:layout_marginEnd="5dp"
+	        android:indeterminate="true" />
+
+	    <TextView
+	        android:id="@+id/reposcaninglabel"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="center_horizontal"
+	        android:padding="8sp"
+	        android:text="@string/local_repos_scanning"
+	        android:textSize="15sp" />
+
+	</LinearLayout>
+
+	<ListView
+		android:id="@+id/reposcanlist"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/reposcanprogresslayout"
+		android:padding="8sp"
+	/>
+
+</RelativeLayout>
--- a/res/layout/repolist.xml
+++ b/res/layout/repolist.xml
@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent" >
-
-		<ListView
-			android:id="@android:id/list"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_above="@+id/lastUpdateCheckCnt"
-			android:layout_alignParentTop="true" />
-
-		<TextView
-			android:id="@android:id/empty"
-			android:layout_alignParentTop="true" 
-			android:layout_width="wrap_content"
-			android:layout_height="200dp"
-			android:text="@string/no_repo" />
-
-	<LinearLayout
-		android:id="@+id/lastUpdateCheckCnt"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:gravity="bottom"
-		android:orientation="horizontal" >
-
-		<TextView
-			android:id="@+id/lastUpdateCheck"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:textSize="12sp" />
-	</LinearLayout>
-
-</RelativeLayout><!--
- * Copyright (C) 2009  Roberto Jacinto
- * roberto.jacinto@caixamagica.pt
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-->
--- a/res/layout/repolisticons.xml
+++ b/res/layout/repolisticons.xml
@ -6,9 +6,12 @@
    android:layout_height="wrap_content"
    android:orientation="horizontal">	

-    <ImageView android:id="@+id/img"
+	<ImageView
+		android:id="@+id/img"
+		android:contentDescription="@string/repo_icon"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+		android:layout_height="wrap_content"
+		/>

    <LinearLayout
        android:layout_width="fill_parent"
@ -50,4 +53,4 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-->
+-->
--- a/res/layout/searchresults.xml
+++ b/res/layout/searchresults.xml
@ -3,7 +3,9 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:paddingLeft="2dp"
+	android:paddingStart="2dp"
 	android:paddingRight="2dp"
+	android:paddingEnd="2dp"
 	android:baselineAligned="false"
 	android:orientation="vertical">

--- a/res/values-ar/array.xml
+++ b/res/values-ar/array.xml
@ -11,9 +11,4 @@
    <item>غامق</item>
    <item>فاتح</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>معطل (غير آمن)</item>
-    <item>عادي</item>
-    <item>مكتمل</item>
-  </string-array>
 </resources>
--- a/res/values-bg/array.xml
+++ b/res/values-bg/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Изключено (опасно)</item>
-    <item>Нормално</item>
-    <item>Пълно</item>
-  </string-array>
 </resources>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@ -73,7 +73,6 @@
  <string name="display">Дисплей</string>
  <string name="expert">Експерт</string>
  <string name="search_hint">Търсене на приложения</string>
-  <string name="db_sync_mode">Вид на синхронизация на базата данни</string>
  <string name="appcompatibility">Съвместимост на приложенията</string>
  <string name="rooted">Root достъп</string>
  <string name="ignoreTouch">Игнорирай сензорния екран</string>
--- a/res/values-ca/array.xml
+++ b/res/values-ca/array.xml
@ -11,9 +11,4 @@
    <item>Fosc</item>
    <item>Clar</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Desactivat (no segur)</item>
-    <item>Normal</item>
-    <item>Complet</item>
-  </string-array>
 </resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@ -7,6 +7,8 @@
  <string name="installIncompatible">Sembla que aquest paquet no és compatible amb el vostre dispositiu. Voleu provar a instaŀlar-lo de totes maneres?</string>
  <string name="installDowngrade">Aneu a desactualitzar aquesta aplicació. Això podria fer que l\'aplicació no funcionés o inclús es perdessin les vostres dades. Esteu segur que ho voleu fer?</string>
  <string name="version">Versió</string>
+  <string name="edit">Editar</string>
+  <string name="delete">Esborrar</string>
  <string name="cache_downloaded">Memòria cau de les aplicacions baixades</string>
  <string name="updates">Actualitzacions</string>
  <string name="other">Altres</string>
@ -29,7 +31,7 @@ Publicat amb la llicència GNU GPL v3.</string>

 Un dipòsit és una font d\'aplicacions. Per afegir-ne un, premeu ara el botó MENÚ i entreu la seva URL.

-L\'adreça d\'un dipòsit té un aspecte com ara: http://f-droid.org/repo</string>
+L\'adreça d\'un dipòsit té un aspecte com ara: https://f-droid.org/repo</string>
  <string name="inst">Instal·lat</string>
  <string name="not_inst">No està instal·lat</string>
  <string name="added_on">S\'ha afegit a %s</string>
@ -39,6 +41,9 @@ L\'adreça d\'un dipòsit té un aspecte com ara: http://f-droid.org/repo</strin
  <string name="repo_add_title">Afegeix un nou dipòsit</string>
  <string name="repo_add_add">Afegeix</string>
  <string name="cancel">Anul·la</string>
+  <string name="enable">Permès</string>
+  <string name="add_key">Afegeix clau</string>
+  <string name="overwrite">Sobreescriu</string>
  <string name="repo_delete_title">Trieu el dipòsit que voleu suprimir</string>
  <string name="repo_update_title">Actualitza els dipòsits</string>
  <string name="tab_noninstalled">Disponible</string>
@ -50,6 +55,7 @@ L\'adreça d\'un dipòsit té un aspecte com ara: http://f-droid.org/repo</strin
  <string name="process_update_msg">S\'està actualitzant la llista d\'aplicacions…</string>
  <string name="download_server">S\'està obtenint l\'aplicació des de</string>
  <string name="repo_add_url">Adreça del dipòsit</string>
+  <string name="repo_exists">Aquest dipòsit ja existeix.</string>
  <string name="repo_alrt">La llista de dipòsits ha canviat.
 La voleu actualitzar?</string>
  <string name="menu_update_repo">Actualitza els dipòsits</string>
@ -59,6 +65,7 @@ La voleu actualitzar?</string>
  <string name="menu_search">Cerca</string>
  <string name="menu_add_repo">Nou dipòsit</string>
  <string name="menu_rem_repo">Suprimeix el dipòsit</string>
+  <string name="menu_scan_repo">Cerca dipòsits locals</string>
  <string name="menu_launch">Executa</string>
  <string name="menu_share">Comparteix</string>
  <string name="menu_install">Instal·la</string>
@ -82,7 +89,6 @@ La voleu actualitzar?</string>
  <string name="display">Pantalla</string>
  <string name="expert">Usuari expert</string>
  <string name="search_hint">Cerca aplicacions</string>
-  <string name="db_sync_mode">Mode de sincronització de la base de dades</string>
  <string name="appcompatibility">Compatibilitat de les aplicacions</string>
  <string name="show_incompat_versions">Versions incompatibles</string>
  <string name="rooted">Root</string>
@ -105,4 +111,10 @@ La voleu actualitzar?</string>
  <string name="no_handler_app">No teniu cap aplicació disponible que pugui gestionar %s</string>
  <string name="compactlayout">Vista compacta</string>
  <string name="theme">Tema</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Número d\'aplicacions</string>
+  <string name="repo_description">Descripció</string>
+  <string name="repo_update">Actualitzant</string>
+  <string name="repo_name">Nom</string>
+  <string name="repo_confirm_delete_title">Esborrar dipòsit?</string>
 </resources>
--- a/res/values-de/array.xml
+++ b/res/values-de/array.xml
@ -11,9 +11,4 @@
    <item>Dunkel</item>
    <item>Hell</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Aus (unsicher)</item>
-    <item>Normal</item>
-    <item>Vollständig</item>
-  </string-array>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Es sieht so aus, als sei dieses Paket mit Ihrem Gerät nicht kompatibel. Möchten Sie trotzdem versuchen es zu installieren?</string>
  <string name="installDowngrade">Sie versuchen eine vorherige Version einer bereits installierten Anwendung zu installieren. Dies kann zu Fehlverhalten der Anwendung und gegebenenfalls zu Datenverlust führen. Möchten Sie dennoch fortfahren?</string>
  <string name="version">Version</string>
-  <string name="cache_downloaded">Heruntergeladene Anwendungen zwischenspeichern</string>
+  <string name="edit">Bearbeiten</string>
+  <string name="delete">Löschen</string>
+  <string name="enable_nfc_send">NFC-Transfer aktivieren …</string>
+  <string name="cache_downloaded">Anwendungszwischenspeicher</string>
+  <string name="cache_downloaded_on">Heruntergeladene Programmpakete auf der SD-Karte behalten</string>
+  <string name="cache_downloaded_off">Installationsdateien nicht behalten</string>
  <string name="updates">Aktualisierungen</string>
  <string name="other">Andere</string>
  <string name="last_update_check">Letzte Aktualisierung der Paketquellen: %s</string>
  <string name="never">niemals</string>
+  <string name="update_interval">Automatischer Aktualisierungsintervall</string>
+  <string name="update_interval_zero">Keine automatischen Aktualisierungen der Anwendungsliste</string>
  <string name="automatic_scan_wifi">Nur über WLAN</string>
+  <string name="automatic_scan_wifi_on">Anwendungsliste nur über WLAN automatisch aktualisieren</string>
+  <string name="automatic_scan_wifi_off">Anwendungsliste immer automatisch aktualisieren</string>
  <string name="notify">Benachrichtigen</string>
+  <string name="notify_on">Benachrichtigen, wenn Aktualisierungen verfügbar sind</string>
+  <string name="notify_off">Über Aktualisierungen nicht benachrichtigen</string>
  <string name="update_history">Aktualisierungsverlauf</string>
+  <string name="update_history_summ">Anzahl in Tagen, an denen neue oder kürzlich geänderte Anwendungen angezeigt werden: %s</string>
  <string name="search_results">Suchergebnisse</string>
  <string name="app_details">Anwendungsdetails</string>
  <string name="no_such_app">Keine passende Anwendung gefunden</string>
@ -30,7 +42,7 @@ Veröffentlicht unter der GNU GPLv3 Lizenz.</string>
 Eine Paketquelle ist eine Sammlung von Anwendungen.
 Um eine Paketquelle hinzuzufügen drücken Sie jetzt den Menüknopf und geben Sie deren Adresse an.

-Die Adresse einer Paketquelle sieht etwa so aus: https://f-droid.org/repo</string>
+Die Adresse einer Paketquelle könnte wie folgt aussehen: https://f-droid.org/repo</string>
  <string name="inst">Installiert</string>
  <string name="not_inst">Nicht installiert</string>
  <string name="added_on">Hinzugefügt am %s</string>
@ -53,28 +65,35 @@ Die Adresse einer Paketquelle sieht etwa so aus: https://f-droid.org/repo</strin
  <string name="process_wait_title">Bitte warten</string>
  <string name="process_update_msg">Anwendungsliste wird aktualisiert …</string>
  <string name="download_server">Anwendung wird heruntergeladen von</string>
+  <string name="nfc_is_not_enabled">NFC ist deaktiviert!</string>
+  <string name="go_to_nfc_settings">NFC-Einstellungen öffnen …</string>
+  <string name="bluetooth_activity_not_found">Keine Bluetooth-Sendemethode gefunden. Bitte wählen Sie eine aus!</string>
+  <string name="choose_bt_send">Bluetooth-Sendemethode auswählen</string>
  <string name="repo_add_url">Adresse der Paketquelle</string>
  <string name="repo_add_fingerprint">Fingerabdruck (optional)</string>
  <string name="repo_exists">Diese Paketquelle existiert bereits!</string>
  <string name="repo_exists_add_fingerprint">Diese Paketquelle ist bereits eingerichtet, dieses wird neue Schlüsselinformationen hinzuzufügen.</string>
  <string name="repo_exists_enable">Diese Paketquelle ist bereits eingerichtet, bestätigen, dass Sie diese wieder aktivieren möchten.</string>
  <string name="repo_exists_and_enabled">Die eingehende Paketquelle ist bereits eingerichtet und aktiviert!</string>
-  <string name="repo_delete_to_overwrite">Sie müssen zuerst diese Paketquelle löschen, bevor Sie eine mit einem anderen Schlüssel hinzuzufügen!</string>
+  <string name="repo_delete_to_overwrite">Sie müssen diese Paketquelle zuerst löschen, bevor Sie eine mit einem anderen Schlüssel hinzuzufügen!</string>
+  <string name="malformed_repo_uri">Fehlerhafte Paketquellenadresse ignorieren: %s</string>
  <string name="repo_alrt">Die Liste der genutzten Paketquellen hat sich geändert.
 Sollen diese aktualisiert werden?</string>
  <string name="menu_update_repo">Paketquellen aktualisieren</string>
  <string name="menu_manage">Paketquellen verwalten</string>
+  <string name="menu_send_apk_bt">Bluetooth-FDroid.apk …</string>
  <string name="menu_preferences">Einstellungen</string>
  <string name="menu_about">Über</string>
  <string name="menu_search">Suchen</string>
  <string name="menu_add_repo">Paketquelle hinzufügen</string>
  <string name="menu_rem_repo">Paketquelle entfernen</string>
+  <string name="menu_scan_repo">Lokale Paketquellen finden</string>
  <string name="menu_launch">Starten</string>
  <string name="menu_share">Empfehlen</string>
  <string name="menu_install">Installieren</string>
  <string name="menu_uninstall">Entfernen</string>
-  <string name="menu_ignore_all">Alle Aktualisierungen ignorieren</string>
-  <string name="menu_ignore_this">Diese Aktualisierung ignorieren</string>
+  <string name="menu_ignore_all">Alle Aktua. ignorieren</string>
+  <string name="menu_ignore_this">Diese Aktua. ignorieren</string>
  <string name="menu_website">Internetseite</string>
  <string name="menu_issues">Probleme</string>
  <string name="menu_source">Quelltext</string>
@ -88,19 +107,28 @@ Sollen diese aktualisiert werden?</string>
  <string name="antitracklist">Diese Anwendung verfolgt und versendet Ihre Aktivitäten</string>
  <string name="antinonfreeadlist">Diese Anwendung bewirbt nicht freie Erweiterungen</string>
  <string name="antinonfreenetlist">Diese Anwendung bewirbt nicht freie Netzwerkdienste</string>
-  <string name="antinonfreedeplist">Diese Anwendung hängt ab von nicht freien Anwendungen</string>
+  <string name="antinonfreedeplist">Diese Anwendung hängt von nicht freien Anwendungen ab</string>
  <string name="antiupstreamnonfreelist">Der Originalcode ist nicht völlig frei</string>
  <string name="display">Anzeige</string>
  <string name="expert">Experte</string>
+  <string name="expert_on">Zusätzliche Informationen anzeigen und zusätzliche Einstellungen aktivieren</string>
+  <string name="expert_off">Experteneinstellungen ausblenden</string>
  <string name="search_hint">Anwendungen suchen</string>
-  <string name="db_sync_mode">Datenbanksynchronisierungsart</string>
  <string name="appcompatibility">Kompatibilität der Anwendung</string>
  <string name="show_incompat_versions">Inkompatible Versionen</string>
+  <string name="show_incompat_versions_on">Mit diesem Gerät inkompatible Anwendungsversionen anzeigen</string>
+  <string name="show_incompat_versions_off">Mit diesem Gerät inkompatible Anwendungsversionen ausblenden</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">Anwendungen, die Root-Rechte verlangen, nicht ausgrauen</string>
+  <string name="rooted_off">Anwendungen ausgrauen, welche Root-Rechte verlangen</string>
  <string name="ignoreTouch">Touchscreen ignorieren</string>
+  <string name="ignoreTouch_on">Anwendungen, die einen Touchscreen benötigen, anzeigen</string>
+  <string name="ignoreTouch_off">Anwendungen normal filtern</string>
  <string name="category_all">Alle</string>
  <string name="category_whatsnew">Was gibt es Neues</string>
  <string name="category_recentlyupdated">Kürzlich Aktualisiert</string>
+  <string name="local_repos_title">Lokale F-Droid-Paketquellen</string>
+  <string name="local_repos_scanning">Lokale F-Droid-Paketquellen entdecken …</string>
  <string name="status_download">Herunterladen
 %2$s / %3$s (%4$d%%) von
 %1$s</string>
@ -110,10 +138,52 @@ Sollen diese aktualisiert werden?</string>
  <string name="status_connecting_to_repo">Verbinden mit
 %1$s</string>
  <string name="status_checking_compatibility">Kompatibilität mit Ihrem Gerät wird überprüft …</string>
+  <string name="status_inserting">App-Details speichern (%1$d%%)</string>
  <string name="no_permissions">Es werden keine Berechtigungen verwendet.</string>
  <string name="permissions_for_long">Berechtigungen für Version %s</string>
  <string name="showPermissions">Berechtigungen anzeigen</string>
+  <string name="showPermissions_on">Eine Liste mit Berechtigungen, die von einer Anwendung verlangt werden, anzeigen</string>
+  <string name="showPermissions_off">Zugriffsrechte nicht vor dem Herunterladen anzeigen</string>
  <string name="no_handler_app">Es ist keine Anwendung installiert, die mit %s umgehen kann</string>
  <string name="compactlayout">Kompakte Ansicht</string>
+  <string name="compactlayout_on">Symbole in einer kleineren Größe anzeigen</string>
+  <string name="compactlayout_off">Symbole in normaler Größe anzeigen</string>
  <string name="theme">Thema</string>
+  <string name="unsigned">Nicht signiert</string>
+  <string name="repo_url">Adresse</string>
+  <string name="repo_num_apps">Anwendungsanzahl</string>
+  <string name="repo_fingerprint">Fingerabdruck des Paketquellensignaturschlüssels (SHA-256)</string>
+  <string name="repo_description">Beschreibung</string>
+  <string name="repo_last_update">Letzte Aktualisierung</string>
+  <string name="repo_update">Aktualisierung</string>
+  <string name="repo_name">Name</string>
+  <string name="unsigned_description">Das bedeutet, dass die Liste von
+        Anwendungen nicht verifiziert werden konnte. 
+        Sie sollten sorgsam mit Anwendungen, heruntergeladen 
+        aus nicht nicht signierten Quellen, sein.</string>
+  <string name="repo_not_yet_updated">Diese Paketquelle wurde noch nicht benutzt.
+        Um beinhaltende Anwendungen anzuzeigen, muss diese Paketquelle
+        zuvor aktualisiert werden.
+
+Nach der Aktualisierung sind die Beschreibungen und andere Details 
+        hier zu finden.</string>
+  <string name="repo_delete_details">Möchten Sie die »{0}«
+        Paketquelle löschen, die {1} Anwendungen beinhaltet? Alle installierten Apps werden
+        NICHT entfernt. Allerdings werden diese nicht mehr über F-Droid aktualisiert.</string>
+  <string name="unknown">Unbekannt</string>
+  <string name="repo_confirm_delete_title">Paketquelle löschen?</string>
+  <string name="repo_confirm_delete_body">Das Löschen einer Paketquelle bedeutet,
+        dass die Anwendungen daraus nicht mehr in F-Droid verfügbar sein werden.
+
+Bemerkung: Alle
+        zuvor installierten Anwendungen bleiben auf Ihrem Gerät.</string>
+  <string name="repo_disabled_notification">»%1$s« deaktiviert.
+
+Sie müssen
+        diese Paketquelle wieder aktivieren, um Anwendungen daraus installieren zu können.</string>
+  <string name="minsdk_or_later">%s oder später</string>
+  <string name="up_to_maxsdk">bis zu %s</string>
+  <string name="minsdk_up_to_maxsdk">%1$s bis zu %2$s</string>
+  <string name="not_on_same_wifi">Dieses Gerät befindet sich nicht im selben WLAN, wie die eben hinzugefügte Paketquelle. Versuchen Sie sich mit dem folgenden Netzwerk zu verbinden: %s</string>
+  <string name="requires_features">Erfordert: %1$s</string>
 </resources>
--- a/res/values-el/array.xml
+++ b/res/values-el/array.xml
@ -11,9 +11,4 @@
    <item>Σκοτεινό</item>
    <item>Φωτεινό</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Απενεργοποίηση (επισφαλής)</item>
-    <item>Κανονικό</item>
-    <item>Ολόκληρο</item>
-  </string-array>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@ -29,7 +29,7 @@

 Ένα αποθετήριο είναι μια πηγή εφαρμογών. Για να προσθέσετε κάποιο, πιέστε το πλήκτρο ΜΕΝΟΥ και εισάγετε το URL.

-Μια διεύθυνση αποθετηρίου μοιάζει κάπως έτσι: http://f-droid.org/repo</string>
+Μια διεύθυνση αποθετηρίου μοιάζει κάπως έτσι: https://f-droid.org/repo</string>
  <string name="inst">Εγκατεστημένο</string>
  <string name="not_inst">Δεν είναι εγκατεστημένο</string>
  <string name="added_on">Προστέθηκε στις %s</string>
@ -59,6 +59,7 @@
  <string name="menu_search">Αναζήτηση</string>
  <string name="menu_add_repo">Νέο Αποθετήριο</string>
  <string name="menu_rem_repo">Αφαίρεση Αποθετηρίου</string>
+  <string name="menu_scan_repo">Εύρεση τοπικών αποθετηρίων</string>
  <string name="menu_launch">Εκτέλεση</string>
  <string name="menu_share">Διαμοιρασμός</string>
  <string name="menu_install">Εγκατάσταση</string>
@ -82,7 +83,6 @@
  <string name="display">Εμφάνιση</string>
  <string name="expert">Για Προχωρημένους</string>
  <string name="search_hint">Αναζήτηση εφαρμογών</string>
-  <string name="db_sync_mode">Λειτουργία συγχρονισμόυ της βάσης δεδομένων</string>
  <string name="appcompatibility">Συμβατότητα εφαμοργής</string>
  <string name="show_incompat_versions">Μη συμβατές εκδόσεις</string>
  <string name="rooted">Root</string>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="about_version">Version:</string>
+  <string name="enable">Enable</string>
+  <string name="add_key">Add Key</string>
+  <string name="overwrite">Overwrite</string>
+</resources>
--- a/res/values-eo/array.xml
+++ b/res/values-eo/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Off (unsafe)</item>
-    <item>Normal</item>
-    <item>Full</item>
-  </string-array>
 </resources>
--- a/res/values-es/array.xml
+++ b/res/values-es/array.xml
@ -11,9 +11,4 @@
    <item>Oscuro</item>
    <item>Claro</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Desactivado (peligroso)</item>
-    <item>Normal</item>
-    <item>Completo</item>
-  </string-array>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Parece que este paquete no es compatible con tu dispositivo. ¿Quieres probar e instalarlo de todos modos?</string>
  <string name="installDowngrade">Estás intentando instalar una versión inferior de esta aplicación. Hacerlo puede derivar en mal funcionamiento o incluso pérdida de datos. ¿Quieres intentarlo de todos modos?</string>
  <string name="version">Versión</string>
+  <string name="edit">Editar</string>
+  <string name="delete">Borrar</string>
+  <string name="enable_nfc_send">Habilitar envío NFC…</string>
  <string name="cache_downloaded">Caché de aplicaciones descargadas</string>
+  <string name="cache_downloaded_on">Mantener en la tarjeta SD los ficheros apk descargados</string>
+  <string name="cache_downloaded_off">No conservar ningún archivo apk</string>
  <string name="updates">Actualizaciones</string>
  <string name="other">Otros</string>
  <string name="last_update_check">Último escaneo del repositorio: %s</string>
  <string name="never">nunca</string>
+  <string name="update_interval">Intervalo de actualización automática</string>
+  <string name="update_interval_zero">No actualizar la lista de aplicaciones automáticamente</string>
  <string name="automatic_scan_wifi">Sólo con wifi</string>
+  <string name="automatic_scan_wifi_on">Actualizar la lista de aplicaciones automáticamente sólo con Wi-Fi</string>
+  <string name="automatic_scan_wifi_off">Actualizar la lista de aplicaciones automáticamente siempre</string>
  <string name="notify">Notificar</string>
+  <string name="notify_on">Notificar cuando hay actualizaciones</string>
+  <string name="notify_off">No notificar ninguna actualización</string>
  <string name="update_history">Historial de actualizaciones</string>
+  <string name="update_history_summ">Días para considerar las aplicaciones nuevas o recientes: %s</string>
  <string name="search_results">Resultados de la búsqueda</string>
  <string name="app_details">Detalles de la aplicación</string>
  <string name="no_such_app">No se encontró la aplicación</string>
@ -39,6 +51,9 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
  <string name="repo_add_title">Añadir nuevo repositorio</string>
  <string name="repo_add_add">Añadir</string>
  <string name="cancel">Cancelar</string>
+  <string name="enable">Habilitar</string>
+  <string name="add_key">Añadir clave</string>
+  <string name="overwrite">Sobreescribir</string>
  <string name="repo_delete_title">Elige el repositorio a eliminar</string>
  <string name="repo_update_title">Actualizar repositorios</string>
  <string name="tab_noninstalled">Disponible</string>
@ -49,16 +64,29 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
  <string name="process_wait_title">Por favor, espera</string>
  <string name="process_update_msg">Actualizando la lista de aplicaciones…</string>
  <string name="download_server">Obteniendo la aplicación de</string>
+  <string name="nfc_is_not_enabled">¡No está habilitado NFC!</string>
+  <string name="go_to_nfc_settings">Ir a los ajustes de NFC…</string>
+  <string name="bluetooth_activity_not_found">No se encontró método de envío Bluetooth, ¡elige uno!</string>
+  <string name="choose_bt_send">Elegir el método de envío Bluetooth</string>
  <string name="repo_add_url">Dirección del repositorio</string>
+  <string name="repo_add_fingerprint">Huella digital (opcional)</string>
+  <string name="repo_exists">¡Este repositorio ya existe!</string>
+  <string name="repo_exists_add_fingerprint">Este repositorio ya está configurado, esto agregará nueva información sobre la clave.</string>
+  <string name="repo_exists_enable">Este repositorio ya está configurado, confirma que quieres volver a habilitarlo.</string>
+  <string name="repo_exists_and_enabled">¡El repositorio ya está configurado y habilitado!</string>
+  <string name="repo_delete_to_overwrite">¡Debes borrar este repositorio antes de añadir uno con una clave diferente!</string>
+  <string name="malformed_repo_uri">Ignorando URI de repo mal formada: %s</string>
  <string name="repo_alrt">La lista de repositorios usada ha cambiado.
 ¿Deseas actualizarlos?</string>
  <string name="menu_update_repo">Actualizar repositorios</string>
  <string name="menu_manage">Gestionar Repositorios</string>
+  <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
  <string name="menu_preferences">Preferencias</string>
  <string name="menu_about">Acerca de</string>
  <string name="menu_search">Buscar</string>
  <string name="menu_add_repo">Repositorio nuevo</string>
  <string name="menu_rem_repo">Borrar Repositorio</string>
+  <string name="menu_scan_repo">Buscar repos locales</string>
  <string name="menu_launch">Ejecutar</string>
  <string name="menu_share">Compartir</string>
  <string name="menu_install">Instalar</string>
@ -79,17 +107,27 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
  <string name="antinonfreeadlist">Esta aplicación promueve complementos no libres</string>
  <string name="antinonfreenetlist">Esta aplicación promueve servicios de red no libres</string>
  <string name="antinonfreedeplist">Esta aplicación depende de otras no libres</string>
+  <string name="antiupstreamnonfreelist">El código fuente original no es totalmente libre</string>
  <string name="display">Mostrar</string>
  <string name="expert">Experto</string>
+  <string name="expert_on">Mostrar info extra y habilitar los ajustes extra</string>
+  <string name="expert_off">Ocultar extras para usuarios experimentados</string>
  <string name="search_hint">Buscar aplicaciones</string>
-  <string name="db_sync_mode">Modo síncrono de base de datos</string>
  <string name="appcompatibility">Compatibilidad de aplicaciones</string>
  <string name="show_incompat_versions">Versiones incompatibles</string>
+  <string name="show_incompat_versions_on">Mostrar las versiones de aplicaciones incompatibles con el dispositivo</string>
+  <string name="show_incompat_versions_off">Ocultar las versiones de aplicaciones no compatibles con el dispositivo</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">No marcar en gris las aplicaciones que requieren privilegios de root</string>
+  <string name="rooted_off">Marcar en gris las aplicaciones que requieren privilegios de root</string>
  <string name="ignoreTouch">Ignorar pantalla táctil</string>
+  <string name="ignoreTouch_on">Incluir aplicaciones que requieran pantalla táctil siempre</string>
+  <string name="ignoreTouch_off">Filtrar aplicaciones de manera normal</string>
  <string name="category_all">Todos</string>
  <string name="category_whatsnew">Novedades</string>
  <string name="category_recentlyupdated">Recientemente actualizados</string>
+  <string name="local_repos_title">Repos de FDroid locales</string>
+  <string name="local_repos_scanning">Descubriendo repos locales de FDroid…</string>
  <string name="status_download">Descargando
 %2$s / %3$s (%4$d%%) de
 %1$s</string>
@ -99,10 +137,46 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
  <string name="status_connecting_to_repo">Conectando a
 %1$s</string>
  <string name="status_checking_compatibility">Comprobando la compatibilidad de las aplicaciones con tu dispositivo…</string>
+  <string name="status_inserting">Guardando detalles de la aplicación (%1$d%%)</string>
  <string name="no_permissions">No se usan permisos.</string>
  <string name="permissions_for_long">Permisos para la versión %s</string>
  <string name="showPermissions">Mostrar permisos</string>
+  <string name="showPermissions_on">Mostrar una lista de los permisos que requiere una aplicación</string>
+  <string name="showPermissions_off">No mostrar permisos antes de descargar</string>
  <string name="no_handler_app">No tienes instalada ninguna aplicación que pueda manejar %s</string>
  <string name="compactlayout">Diseño compacto</string>
+  <string name="compactlayout_on">Mostrar iconos en tamaño menor</string>
+  <string name="compactlayout_off">Mostrar iconos en tamaño regular</string>
  <string name="theme">Tema</string>
+  <string name="unsigned">No firmado</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Número de aplicaciones</string>
+  <string name="repo_fingerprint">Huella digital de la clave de firmado del repo (SHA-256)</string>
+  <string name="repo_description">Descripción</string>
+  <string name="repo_last_update">Última actualización</string>
+  <string name="repo_update">Actualizar</string>
+  <string name="repo_name">Nombre</string>
+  <string name="unsigned_description">Esto significa que la lista de
+aplicaciones no ha podido verificarse.
+Deberías tener cuidado con aplicaciones descargadas desde índices no firmados.</string>
+  <string name="repo_not_yet_updated">Este repositorio aún no ha sido usado.
+Para ver las aplicaciones que ofrece, necesitarás actualizarlo.
+Una vez actualizado, la descripción y otros detalles estarán disponibles aquí.</string>
+  <string name="repo_delete_details">¿Quieres borrar el repositorio
+\"{0}\", que contiene {1} aplicaciones?
+Las aplicaciones instaladas NO se eliminarán, pero ya no podrás actualizarlas desde F-Droid.</string>
+  <string name="unknown">Desconocido</string>
+  <string name="repo_confirm_delete_title">¿Borrar repositorio?</string>
+  <string name="repo_confirm_delete_body">Borrar un repositorio significa
+que sus aplicaciones ya no estarán disponibles en F-Droid.
+
+Nota: todas las aplicaciones previamente instaladas se quedarán en tu dispositivo.</string>
+  <string name="repo_disabled_notification">\"%1$s\" deshabilitado.
+
+Necesitarás volver a habilitar este repositorio para instalar aplicaciones desde él.</string>
+  <string name="minsdk_or_later">%s o posterior</string>
+  <string name="up_to_maxsdk">hasta %s</string>
+  <string name="minsdk_up_to_maxsdk">De %1$s a %2$s</string>
+  <string name="not_on_same_wifi">¡Tu dispositivo no está en la misma WiFi que el repo que acabas de añadir! Intenta unirte a esta red: %s</string>
+  <string name="requires_features">Requiere: %1$s</string>
 </resources>
--- a/res/values-eu/array.xml
+++ b/res/values-eu/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Itzalita (ez da segurua)</item>
-    <item>Normala</item>
-    <item>Osoa</item>
-  </string-array>
 </resources>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@ -5,12 +5,25 @@
  <string name="searchres_noapps">\'%s\'-rekin bat datorren aplikaziorik ez da aurkitu</string>
  <string name="SignatureMismatch">Bertsio berria zaharraren desberdina den gako batekin sinatuta dago. Bertsio berria instalatzeko, aurretik zaharra desinstalatu beharra dago.  Mesedez, egizu eta saiatu berriro. (Kontutan izan desinstalatzean aplikazioak gordetako barne datuak ezabatuko direla)</string>
  <string name="version">Bertsioa</string>
+  <string name="edit">Editatu</string>
+  <string name="delete">Ezabatu</string>
+  <string name="enable_nfc_send">Gaitu NFC bidez bidaltzea…</string>
  <string name="cache_downloaded">Gorde cache-an deskargatutako aplikazioak</string>
+  <string name="cache_downloaded_on">Mantendu deskargatutako apk fitxategiak SD txartelean</string>
+  <string name="cache_downloaded_off">Ez mantendu apk fitxategirik</string>
  <string name="updates">Eguneraketak</string>
  <string name="last_update_check">Biltegiaren azken eskaneatzea: %s</string>
  <string name="never">inoiz ez</string>
+  <string name="automatic_scan_wifi">Wifian soilik</string>
+  <string name="automatic_scan_wifi_on">Eguneratu aplikazioen zerrendak automatikoki wifian soilik</string>
+  <string name="automatic_scan_wifi_off">Beti eguneratu aplikazioen zerrendak automatikoki</string>
  <string name="notify">Jakinarazi</string>
+  <string name="notify_on">Jakinarazi eguneraketak eskuragarri daudenean</string>
+  <string name="notify_off">Ez jakinarazi eguneraketak daudenean</string>
  <string name="update_history">Eguneratu historia</string>
+  <string name="search_results">Bilaketaren emaitzak</string>
+  <string name="app_details">Aplikazioaren xehetasunak</string>
+  <string name="no_such_app">Ez da aplikaziorik aurkitu</string>
  <string name="about_title">F-Droid-i buruz</string>
  <string name="about_desc">Jatorrian Aptoide-n oinarritua.
 GNU GPLv3 lizentziapean argitaratua.</string>
@ -27,6 +40,9 @@ GNU GPLv3 lizentziapean argitaratua.</string>
  <string name="repo_add_title">Gehitu biltegi berria</string>
  <string name="repo_add_add">Gehitu</string>
  <string name="cancel">Utzi</string>
+  <string name="enable">Gaitu</string>
+  <string name="add_key">Gehitu gakoa</string>
+  <string name="overwrite">Gainidatzi</string>
  <string name="repo_delete_title">Aukeratu biltegia ezabatzeko</string>
  <string name="repo_update_title">Eguneratu biltegiak</string>
  <string name="tab_noninstalled">Eskuragarri</string>
@ -37,7 +53,10 @@ GNU GPLv3 lizentziapean argitaratua.</string>
  <string name="process_wait_title">Mesedez itxaron</string>
  <string name="process_update_msg">Aplikazio-zerrenda eguneratzen…</string>
  <string name="download_server">Aplikazioa eskuratzen hemendik</string>
+  <string name="nfc_is_not_enabled">NFC ez dago gaituta!</string>
+  <string name="go_to_nfc_settings">Joan NFC ezarpenetara…</string>
  <string name="repo_add_url">Biltegiaren helbidea</string>
+  <string name="repo_exists">Biltegi hau dagoeneko existitzen da!</string>
  <string name="repo_alrt">Erabilitako biltegien zerrenda aldatu egin da.
 Eguneratu nahi dituzu?</string>
  <string name="menu_update_repo">Eguneratu biltegiak</string>
@ -47,12 +66,17 @@ Eguneratu nahi dituzu?</string>
  <string name="menu_search">Bilatu</string>
  <string name="menu_add_repo">Biltegi berria</string>
  <string name="menu_rem_repo">Ezabatu biltegia</string>
+  <string name="menu_scan_repo">Bilatu biltegi lokalak</string>
  <string name="menu_launch">Exekutatu</string>
+  <string name="menu_share">Partekatu</string>
  <string name="menu_install">Instalatu</string>
  <string name="menu_uninstall">Desinstalatu</string>
+  <string name="menu_ignore_all">Ezikusi eguneraketa guztiak</string>
+  <string name="menu_ignore_this">Ezikusi eguneraketa hau</string>
  <string name="menu_website">Webgunea</string>
  <string name="menu_issues">Gaiak</string>
  <string name="menu_source">Iturburu-kodea</string>
+  <string name="menu_upgrade">Bertsio-berritu</string>
  <string name="menu_donate">Egin dohaintza</string>
  <string name="details_installed">%s bertsioa instalatuta</string>
  <string name="details_notinstalled">Instalatu gabe</string>
@ -62,13 +86,14 @@ Eguneratu nahi dituzu?</string>
  <string name="display">Bistaratu</string>
  <string name="expert">Aditua</string>
  <string name="search_hint">Bilatu aplikazioak</string>
-  <string name="db_sync_mode">Datu-base modu sinkronoa</string>
  <string name="appcompatibility">Aplikazioen bateragarritasuna</string>
+  <string name="show_incompat_versions">Bertsio bateraezinak</string>
  <string name="rooted">Root</string>
  <string name="ignoreTouch">Ezikusi egin ukipen-pantailari</string>
  <string name="category_all">Guztia</string>
  <string name="category_whatsnew">Zer da berria</string>
  <string name="category_recentlyupdated">Azkenaldian eguneratua</string>
+  <string name="local_repos_title">FDroid biltegi lokalak</string>
  <string name="status_connecting_to_repo">%1$s(e)ra
 konektatzen</string>
  <string name="status_checking_compatibility">Aplikazioak zure gailuarekin bateragarriak diren egiaztatzen…</string>
@ -76,4 +101,14 @@ konektatzen</string>
  <string name="permissions_for_long">%s bertsioarentzako baimenak</string>
  <string name="showPermissions">Erakutsi baimenak</string>
  <string name="compactlayout">Diseinu trinkoa</string>
+  <string name="theme">Gaia</string>
+  <string name="unsigned">Sinatu gabea</string>
+  <string name="repo_url">URLa</string>
+  <string name="repo_num_apps">Aplikazio kopurua</string>
+  <string name="repo_description">Deskribapena</string>
+  <string name="repo_last_update">Azken eguneraketa</string>
+  <string name="repo_update">Eguneratu</string>
+  <string name="repo_name">Izena</string>
+  <string name="unknown">Ezezaguna</string>
+  <string name="repo_confirm_delete_title">Biltegia ezabatu?</string>
 </resources>
--- a/res/values-fa/array.xml
+++ b/res/values-fa/array.xml
@ -11,9 +11,4 @@
    <item>تاریک</item>
    <item>روشن</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>خاموش (ناامن)</item>
-    <item>عادی</item>
-    <item>کامل</item>
-  </string-array>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -7,13 +7,23 @@
  <string name="installIncompatible">به‌نظر می‌رسد این بسته با دستگاه شما هماهنگ نیست. آیا می‌خواهید آن را به هر قیمتی آزمایش و نصب کنید؟</string>
  <string name="installDowngrade">شما در حال قدیمی‌کردن و کاهش درجهٔ این برنامه هستید. انجام چنین کاری ممکن منجر به خرابی یا از دست رفتن داده‌های شما شود. آیا می‌خواهید سعی کنید این برنامه را به هر قیمتی قدیمی کنید؟</string>
  <string name="version">نسخه</string>
+  <string name="edit">ویرایش</string>
+  <string name="delete">حذف</string>
+  <string name="enable_nfc_send">فعال‌سازی ارسال ان‌اف‌سی…</string>
  <string name="cache_downloaded">میانگیری برنامه‌های دریافت‌شده</string>
+  <string name="cache_downloaded_on">نگه‌داشتن پرونده‌های ای‌پی‌کی بر روی کارت اس‌دی</string>
+  <string name="cache_downloaded_off">هیچ پروندهٔ ای‌پی‌کی را نگه‌ندار</string>
  <string name="updates">به‌روزرسانی‌ها</string>
  <string name="other">دیگر</string>
  <string name="last_update_check">آخرین اسکن مخزن: %S</string>
  <string name="never">هیچ‌گاه</string>
+  <string name="update_interval">به‌روزرسانی دوره‌ای خودکار</string>
+  <string name="update_interval_zero">به‌روزرسانی‌نکردن خودکار فهرست برنامه‌ها</string>
  <string name="automatic_scan_wifi">فقط هنگام اتصال وای‌فای</string>
+  <string name="automatic_scan_wifi_on">به‌روزرسانی فهرست برنامه‌ها خودکار فقط با وای‌فای</string>
+  <string name="automatic_scan_wifi_off">همیشه فهرست برنامه‌ها را خودکار به‌روز کن</string>
  <string name="notify">مطلع‌سازی</string>
+  <string name="notify_on">آگاهی‌دادن هنگامی که به‌روزرسانی‌ها موجود هستند</string>
  <string name="update_history">به‌روزرسانی تاریخچه</string>
  <string name="search_results">جستجوی نتایج</string>
  <string name="app_details">مشخصات برنامه</string>
@ -59,6 +69,7 @@
  <string name="menu_search">جستجو</string>
  <string name="menu_add_repo">مخزن جدید</string>
  <string name="menu_rem_repo">حذف مخزن</string>
+  <string name="menu_scan_repo">یافتن مخازن محلی</string>
  <string name="menu_launch">اجرا</string>
  <string name="menu_share">به اشتراک‌گذاری</string>
  <string name="menu_install">نصب</string>
@ -82,7 +93,6 @@
  <string name="display">نمایش</string>
  <string name="expert">خارج‌سازی</string>
  <string name="search_hint">جستجوی برنامه‌ها</string>
-  <string name="db_sync_mode">حالت هماهنگی پایگاه داده‌ها</string>
  <string name="appcompatibility">هماهنگی برنامه</string>
  <string name="show_incompat_versions">نسخه‌های غیرهماهنگ</string>
  <string name="rooted">روت</string>
--- a/res/values-fi/array.xml
+++ b/res/values-fi/array.xml
@ -11,9 +11,4 @@
    <item>Tumma</item>
    <item>Valo</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Pois päältä (vaarallinen)</item>
-    <item>Normaali</item>
-    <item>Täysi</item>
-  </string-array>
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@ -61,7 +61,6 @@ Tahdotko päivittää ne?</string>
  <string name="display">Näyttö</string>
  <string name="expert">Asiantuntija</string>
  <string name="search_hint">Etsi sovelluksia</string>
-  <string name="db_sync_mode">Tietokannan synkronointi-tila</string>
  <string name="appcompatibility">Sovellusten yhteensopivuus</string>
  <string name="show_incompat_versions">Yhteensopimattomat versiot</string>
  <string name="rooted">Root</string>
--- a/res/values-fr/array.xml
+++ b/res/values-fr/array.xml
@ -11,9 +11,4 @@
    <item>Sombre</item>
    <item>Clair</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Désactivé (non recommandé)</item>
-    <item>Normal</item>
-    <item>Complet</item>
-  </string-array>
 </resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Il semble que ce paquet ne soit pas compatible avec votre appareil. Voulez-vous quand même tenter de l\'installer ?</string>
  <string name="installDowngrade">Vous essayez de revenir à une ancienne version de cette application. Cela peut causer des problèmes de fonctionnement ou des pertes de données. Voulez-vous tout de même revenir à une ancienne version?</string>
  <string name="version">Version</string>
+  <string name="edit">Éditer</string>
+  <string name="delete">Supprimer</string>
+  <string name="enable_nfc_send">Activer l\'envoi NFC…</string>
  <string name="cache_downloaded">Stocker les applications téléchargées sur l\'appareil</string>
+  <string name="cache_downloaded_on">Garder les fichiers apk téléchargés sur la carte SD</string>
+  <string name="cache_downloaded_off">Ne pas garder les fichiers apk</string>
  <string name="updates">Mises à jour</string>
  <string name="other">Autres</string>
  <string name="last_update_check">Dernière analyse du dépôt : %s</string>
  <string name="never">jamais</string>
+  <string name="update_interval">Intervalle de mise à jour automatique</string>
+  <string name="update_interval_zero">Pas de mise à jour automatique de la liste d\'applications</string>
  <string name="automatic_scan_wifi">Seulement par WiFi</string>
+  <string name="automatic_scan_wifi_on">Mettre à jour automatiquement les listes d\'applications uniquement par WiFi</string>
+  <string name="automatic_scan_wifi_off">Toujours mettre à jour automatiquement les listes d\'apps</string>
  <string name="notify">Notifier</string>
+  <string name="notify_on">Notifier quand des mises à jour sont disponibles</string>
+  <string name="notify_off">Ne pas notifier des mises à jour</string>
  <string name="update_history">Historique des mises à jour</string>
+  <string name="update_history_summ">Jours pour considérer les apps comme nouvelles ou récentes : %s</string>
  <string name="search_results">Résultats de la recherche</string>
  <string name="app_details">Détails de l\'application</string>
  <string name="no_such_app">Pas d\'application trouvée</string>
@ -29,7 +41,7 @@ Publiée sous licence GNU GPL v3.</string>

 Un dépôt est une source d\'applications. Pour en ajouter un, appuyez maintenant sur le bouton MENU et entrez l\'adresse URL.

-L\'URL d\'un dépôt ressemble à ceci : http://f-droid.org/repo</string>
+L\'URL d\'un dépôt ressemble à ceci : https://f-droid.org/repo</string>
  <string name="inst">Installée</string>
  <string name="not_inst">Pas installée</string>
  <string name="added_on">Ajouté le %s</string>
@ -39,6 +51,9 @@ L\'URL d\'un dépôt ressemble à ceci : http://f-droid.org/repo</string>
  <string name="repo_add_title">Ajouter un nouveau dépôt</string>
  <string name="repo_add_add">Ajouter</string>
  <string name="cancel">Annuler</string>
+  <string name="enable">Activer</string>
+  <string name="add_key">Ajouter une clé</string>
+  <string name="overwrite">Écraser</string>
  <string name="repo_delete_title">Choisissez le dépôt à supprimer</string>
  <string name="repo_update_title">Mettre à jour les dépôts</string>
  <string name="tab_noninstalled">Disponible</string>
@ -49,16 +64,29 @@ L\'URL d\'un dépôt ressemble à ceci : http://f-droid.org/repo</string>
  <string name="process_wait_title">Patientez</string>
  <string name="process_update_msg">Mise à jour de la liste d\'applications…</string>
  <string name="download_server">Réception d\'application de</string>
+  <string name="nfc_is_not_enabled">Le NFC n\'est pas activé !</string>
+  <string name="go_to_nfc_settings">Allez dans les paramètres NFC…</string>
+  <string name="bluetooth_activity_not_found">Pas de méthode d\'envoi Bluetooth trouvée, choisissez-en une !</string>
+  <string name="choose_bt_send">Choisir la méthode d\'envoi Bluetooth</string>
  <string name="repo_add_url">Adresse du dépôt</string>
+  <string name="repo_add_fingerprint">Empreinte digitale (optionnel)</string>
+  <string name="repo_exists">Ce dépôt existe déja !</string>
+  <string name="repo_exists_add_fingerprint">Ce dépôt est déjà configuré, cela va ajouter les informations des nouvelles clés.</string>
+  <string name="repo_exists_enable">Ce dépôt est déja configuré, confirmer que vous voulez le réactiver.</string>
+  <string name="repo_exists_and_enabled">Le dépôt entrant est déjà configuré et activé !</string>
+  <string name="repo_delete_to_overwrite">Vous devez d\'abord supprimer ce dépôt avant d\'en ajouter avec une clé différente.</string>
+  <string name="malformed_repo_uri">URI de dépôt malformé ignoré : %s</string>
  <string name="repo_alrt">La liste des dépôts utilisés a changé.
 Voulez-vous les mettre à jour ?</string>
  <string name="menu_update_repo">Mettre à jour les dépôts</string>
  <string name="menu_manage">Gestion de dépôts</string>
+  <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
  <string name="menu_preferences">Préférences</string>
  <string name="menu_about">A propos</string>
  <string name="menu_search">Rechercher</string>
  <string name="menu_add_repo">Nouveau dépôt</string>
  <string name="menu_rem_repo">Supprimer un dépôt</string>
+  <string name="menu_scan_repo">Trouver des dépôts locaux</string>
  <string name="menu_launch">Lancer</string>
  <string name="menu_share">Partager</string>
  <string name="menu_install">Installer</string>
@ -79,17 +107,27 @@ Voulez-vous les mettre à jour ?</string>
  <string name="antinonfreeadlist">Cette application promeut des extensions privatrices</string>
  <string name="antinonfreenetlist">Cette application promeut des services réseaux privateurs</string>
  <string name="antinonfreedeplist">Cette application dépend d\'autres applications non libres</string>
+  <string name="antiupstreamnonfreelist">Le code source en amont n\'est pas entièrement libre</string>
  <string name="display">Affichage</string>
  <string name="expert">Expert</string>
+  <string name="expert_on">Afficher plus d\'infos et activer des paramètres supplémentaires</string>
+  <string name="expert_off">Cacher des extras pour les utilisateurs avancés</string>
  <string name="search_hint">Rechercher des applications</string>
-  <string name="db_sync_mode">Mode de synchronisation à la base de données</string>
  <string name="appcompatibility">Compatibilité de l\'application</string>
  <string name="show_incompat_versions">Versions incompatibles</string>
+  <string name="show_incompat_versions_on">Afficher les versions des applications incompatibles avec l\'appareil</string>
+  <string name="show_incompat_versions_off">Cacher les applications incompatibles avec l\'appareil</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">Ne pas griser les applications nécessitant les privilèges root</string>
+  <string name="rooted_off">Griser les applications nécessitant les privilèges root</string>
  <string name="ignoreTouch">Ignorer l\'écran tactile</string>
+  <string name="ignoreTouch_on">Toujours inclure les apps nécessitant un écran tactile</string>
+  <string name="ignoreTouch_off">Filtrer les apps normalement</string>
  <string name="category_all">Tout</string>
  <string name="category_whatsnew">Quoi de neuf ?</string>
  <string name="category_recentlyupdated">Mis à jour récemment</string>
+  <string name="local_repos_title">Dépôts FDroid locaux</string>
+  <string name="local_repos_scanning">Découverte des dépôts FDroid locaux…</string>
  <string name="status_download">Téléchargement
 %2$s / %3$s (%4$d%%) de
 %1$s</string>
@ -99,10 +137,47 @@ Voulez-vous les mettre à jour ?</string>
  <string name="status_connecting_to_repo">Connexion à
 %1$s</string>
  <string name="status_checking_compatibility">Vérification de la compatibilité des applis avec votre appareil…</string>
+  <string name="status_inserting">Sauvegarder les détails de l\'application (%1$d%%)</string>
  <string name="no_permissions">Aucune autorisation n\'est utilisée.</string>
  <string name="permissions_for_long">Autorisations pour la version %s</string>
  <string name="showPermissions">Afficher les autorisations</string>
+  <string name="showPermissions_on">Afficher la liste des permissions qu\'une app requiert</string>
+  <string name="showPermissions_off">Ne pas afficher les permissions avant le téléchargement</string>
  <string name="no_handler_app">Vous n\'avez aucune application installée pour gérer %s</string>
  <string name="compactlayout">Affichage compact</string>
+  <string name="compactlayout_on">Montrer les icônes à une taille plus petite</string>
+  <string name="compactlayout_off">Montrer les icônes à une taille normale</string>
  <string name="theme">Thème</string>
+  <string name="unsigned">Non signé</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Nombre d\'applications</string>
+  <string name="repo_fingerprint">Empreinte digitale de la clef de signature pour le dépôt (SHA-256)</string>
+  <string name="repo_description">Description</string>
+  <string name="repo_last_update">Dernière mise à jour</string>
+  <string name="repo_update">Mise à jour</string>
+  <string name="repo_name">Nom</string>
+  <string name="unsigned_description">Cela signifie que la liste
+        des applications n\'a pu être vérifiée. Vous
+        devriez faire attention avec les
+        applications téléchargées d\'indexes non signés.</string>
+  <string name="repo_not_yet_updated">Ce dépôt n\'a pas encore été utilisé.
+        Pour voir la liste des applications qu\'il
+        offre, vous devez le mettre à jour.
+
+Une fois la mise à jour effectuée, la description 
+        et les autres détails seront affichés ici.</string>
+  <string name="repo_delete_details">Voulez vous supprimer le dépôt \"{0}\", qui a {1} apps ? Toutes les applications installées ne seront pas supprimés, mais vous ne serez plus en mesure de les mettre à jour via F-Droid.</string>
+  <string name="unknown">Inconnu</string>
+  <string name="repo_confirm_delete_title">Supprimer le dépôt ?</string>
+  <string name="repo_confirm_delete_body">Supprimer un dépôt signifie que les apps ne seront disponibles via F-Droid. Note: Toute les apps précédemment installées vont rester sur votre appareil.</string>
+  <string name="repo_disabled_notification">« %1$s » a été désactivé..
+
+Vous allez devoir
+        le réactiver pour installer des applications
+        à partir de ce dépôt.</string>
+  <string name="minsdk_or_later">%s ou plus récent</string>
+  <string name="up_to_maxsdk">jusqu\'à %s</string>
+  <string name="minsdk_up_to_maxsdk">De %1$s à %2$s</string>
+  <string name="not_on_same_wifi">Votre appareil n\'est sur le même WiFi que le dépôt local que vous venez d\'ajouter ! Essayez de rejoindre ce réseau : %s</string>
+  <string name="requires_features">Nécessite: %1$s</string>
 </resources>
--- a/res/values-gl/array.xml
+++ b/res/values-gl/array.xml
@ -11,9 +11,4 @@
    <item>Escuro</item>
    <item>Claro</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Apagado (inseguro)</item>
-    <item>Normal</item>
-    <item>Completo</item>
-  </string-array>
 </resources>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@ -86,7 +86,6 @@ Quere actualizalos?</string>
  <string name="display">Amosar</string>
  <string name="expert">Experto</string>
  <string name="search_hint">Buscar aplicativos</string>
-  <string name="db_sync_mode">Modo de sincronización da base de datos</string>
  <string name="appcompatibility">Compatibilidade de aplicativos</string>
  <string name="show_incompat_versions">Versións incompatíbeis</string>
  <string name="rooted">Root</string>
--- a/res/values-gu/array.xml
+++ b/res/values-gu/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>બંધ (અસુરક્ષિત)</item>
-    <item>સામાન્ય</item>
-    <item>પૂર્ણ</item>
-  </string-array>
 </resources>
--- a/res/values-hu/array.xml
+++ b/res/values-hu/array.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="updateIntervalNames">
+    <item>Soha</item>
+    <item>Óránként</item>
+    <item>4 óránként</item>
+    <item>12 óránként</item>
+    <item>Naponta</item>
+  </string-array>
+  <string-array name="themeNames">
+    <item>Sötét</item>
+    <item>Világos</item>
+  </string-array>
+</resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchres_napps">\"%1$d alkalmazás találat ehhez \'%2$s\':\"</string>
+  <string name="searchres_oneapp">\"Egy alkalmazás találat ehhez \'%s\':\"</string>
+  <string name="searchres_noapps">\"Nincs ezzel \'%s\' egyező alkalmazás\"</string>
+  <string name="SignatureMismatch">Az új verzió a régitől eltérő kulccsal van aláírva. Az új verzió telepítéséhez először el kell távolítani a régit. Kérem tegye meg ezt és próbálja újra. (Megjegyzendő, hogy az eltávolítás törli az alkalmazás minden tárolt adatát)</string>
+  <string name="installIncompatible">Úgy tűnik, ez a csomag nem kompatibilis a készülékkel. Ennek ellenére is megpróbálja telepíteni?</string>
+  <string name="installDowngrade">Ön megpróbálta régebbivel felülírni az alkalmazást. Ez hibás működést és az adatok elvesztését okozhatja. Ennek ellenére is megpróbálja telepíteni?</string>
+  <string name="version">Verzió</string>
+  <string name="cache_downloaded">App cache</string>
+  <string name="cache_downloaded_on">A letöltött apk fájlt megtartja az SD kártyán</string>
+  <string name="cache_downloaded_off">Ne tartson meg semmilyen apk fájlt</string>
+  <string name="updates">Frissítések</string>
+  <string name="other">egyéb</string>
+  <string name="last_update_check">Utolsó vizsgálat: %s</string>
+  <string name="never">soha</string>
+  <string name="update_interval">Auto. frissítés intervalluma</string>
+  <string name="update_interval_zero">Ne frissítsen automatikusan</string>
+  <string name="automatic_scan_wifi">Csak Wifin</string>
+  <string name="automatic_scan_wifi_on">Automatikus app lista frissítés csak Wifin</string>
+  <string name="automatic_scan_wifi_off">Mindig frissítse az app listákat automatikusan</string>
+  <string name="notify">Értesítés</string>
+  <string name="notify_on">Értesít ha frissítés érhető el</string>
+  <string name="notify_off">Ne jelezzen semmilyen frissítést</string>
+  <string name="update_history">Frissítési előzmények</string>
+  <string name="update_history_summ">Hány napig tekintse az appot frissnek vagy újnak: %s</string>
+  <string name="search_results">Keresési előzmények</string>
+  <string name="app_details">App részletei</string>
+  <string name="no_such_app">Nem található ilyen app</string>
+  <string name="about_title">Az F-Droid</string>
+  <string name="about_desc">\"Eredetileg az Aptoide alapján.
+Kiadva GNU GPLv3 licensz alatt.
+
+Honosítás: gidano | sympda.info\"</string>
+  <string name="about_site">Weboldal:</string>
+  <string name="about_mail">Email:</string>
+  <string name="about_version">Verzió:</string>
+  <string name="about_website">Weboldal</string>
+  <string name="no_repo">\"Még nincs konfigurálva repository!
+
+A repo, alkalmazások forrása. Hozzáadáshoz nyomja meg a MENÜ gombot és írja be a címét.
+
+A repo cím valahogy így néz ki: https://f-droid.org/repo\"</string>
+  <string name="inst">Telepítve</string>
+  <string name="not_inst">Nincs telepítve</string>
+  <string name="added_on">Hozzáadva %s</string>
+  <string name="ok">Oké</string>
+  <string name="yes">Igen</string>
+  <string name="no">Nem</string>
+  <string name="repo_add_title">Új repo hozzáadása</string>
+  <string name="repo_add_add">Hozzáad</string>
+  <string name="cancel">Mégsem</string>
+  <string name="enable">Engedélyez</string>
+  <string name="add_key">Kulcs hozzáadás</string>
+  <string name="overwrite">Felülírás</string>
+  <string name="repo_delete_title">Válasszon ki repo-t az eltávolításhoz</string>
+  <string name="repo_update_title">Repo-k frissítése</string>
+  <string name="tab_noninstalled">Elérhető</string>
+  <string name="tab_updates">Frissítések</string>
+  <string name="one_update_available">1 frissítés érhető el.</string>
+  <string name="many_updates_available">%d frissítés érhető el.</string>
+  <string name="fdroid_updates_available">F-Droid frissítés érhető el</string>
+  <string name="process_wait_title">Kérem várjon</string>
+  <string name="process_update_msg">Alkalmazáslista frissítése…</string>
+  <string name="download_server">Alkalmazás beszerzése</string>
+  <string name="repo_add_url">Repo cím</string>
+  <string name="repo_add_fingerprint">ujjlenyomat (opcionális)</string>
+  <string name="repo_exists">Ez a repo már létezik!</string>
+  <string name="repo_exists_add_fingerprint">Ez a repo már be van állítva, ez új kulcs információt fog hozzáadni.</string>
+  <string name="repo_exists_enable">Ez a repo már be van állítva, erősítse meg az újraengedélyezését.</string>
+  <string name="repo_exists_and_enabled">A fogadott repo már telepítve és engedélyezve van!</string>
+  <string name="repo_delete_to_overwrite">Előbb törölnie kell ezt a repot, mielőtt hozzáad egyet eltérő kulccsal!</string>
+  <string name="repo_alrt">\"A használt repo-k listája megváltozott.
+Szeretné ezeket frissíteni?\"</string>
+  <string name="menu_update_repo">Repo-k frissítése</string>
+  <string name="menu_manage">Repo-k kezelése</string>
+  <string name="menu_preferences">Lehetőségek</string>
+  <string name="menu_about">Rólunk</string>
+  <string name="menu_search">Keresés</string>
+  <string name="menu_add_repo">Új repository</string>
+  <string name="menu_rem_repo">Repo eltávolítása</string>
+  <string name="menu_launch">Indítás</string>
+  <string name="menu_share">Megoszt</string>
+  <string name="menu_install">Telepít</string>
+  <string name="menu_uninstall">Eltávolít</string>
+  <string name="menu_ignore_all">Mellőz minden frissítést</string>
+  <string name="menu_ignore_this">Ezt a frissítést mellőzi</string>
+  <string name="menu_website">Weboldal</string>
+  <string name="menu_issues">Kérdések</string>
+  <string name="menu_source">Forráskód</string>
+  <string name="menu_upgrade">Frissítés</string>
+  <string name="menu_donate">Adomány</string>
+  <string name="details_installed">%s verzió telepítve</string>
+  <string name="details_notinstalled">Nincs telepítve</string>
+  <string name="corrupt_download">A letöltött fájl hibás</string>
+  <string name="download_cancelled">Letöltés megszakítva</string>
+  <string name="antiadslist">Az alkalmazás reklámot tartalmaz</string>
+  <string name="antitracklist">Az alkalmazás nyomon követi és jelenti a tevékenységeit</string>
+  <string name="antinonfreeadlist">Az alkalmazás nem ingyenes kiegészítőket támogat</string>
+  <string name="antinonfreenetlist">Az alkalmazás nem ingyenes hálózati szolgáltatásokat támogat</string>
+  <string name="antinonfreedeplist">Az alkalmazás egyéb, nem ingyenes alkalmazásoktól függ</string>
+  <string name="antiupstreamnonfreelist">Az upstream forráskód nem teljesen szabad</string>
+  <string name="display">Megjelenés</string>
+  <string name="expert">Szakértő</string>
+  <string name="expert_on">Extra infókat mutat és extra beállításokat engedélyez</string>
+  <string name="expert_off">Extrák elrejtése gyakorlott felhasználók számára</string>
+  <string name="search_hint">Alkalmazások keresése</string>
+  <string name="appcompatibility">App kompatibilitás</string>
+  <string name="show_incompat_versions">Inkompatibilis verzió</string>
+  <string name="show_incompat_versions_on">Megjeleníti, ha az app verzió nem kompatibilis a készülékkel</string>
+  <string name="show_incompat_versions_off">Elrejti az app inkompatibilitását az eszközzel</string>
+  <string name="rooted">Root</string>
+  <string name="rooted_on">Nem szürkíti ki a root jogot igénylő alkalmazásokat</string>
+  <string name="rooted_off">Kiszürkíti a root jogot igénylő alkalmazásokat</string>
+  <string name="ignoreTouch">Érintőképernyő ignorálás</string>
+  <string name="ignoreTouch_on">Mindig tartalmazza az érintőképernyőt igénylő alkalmazásokat</string>
+  <string name="ignoreTouch_off">Appok normál szűrése</string>
+  <string name="category_all">Összes</string>
+  <string name="category_whatsnew">\"Újdonságok\"</string>
+  <string name="category_recentlyupdated">Legutóbb frissítve</string>
+  <string name="status_download">\"Letöltés
+%2$s / %3$s (%4$d%%) innen
+%1$s\"</string>
+  <string name="status_processing_xml">\"Feldolgozási kérelem
+%2$d of %3$d innen
+%1$s\"</string>
+  <string name="status_connecting_to_repo">\"Kapcsolódás
+%1$s\"</string>
+  <string name="status_checking_compatibility">Alkalmazások eszközkompatibilitási ellenőrzése…</string>
+  <string name="no_permissions">Nincsenek engedélyei.</string>
+  <string name="permissions_for_long">Engedélyek erre a verzióra - %s</string>
+  <string name="showPermissions">Engedélyek megjelenítése</string>
+  <string name="showPermissions_on">Mutassa meg egy listában az app által igényelt engedélyeket</string>
+  <string name="showPermissions_off">\"Ne mutasson listát letöltés előtt\"</string>
+  <string name="no_handler_app">\"Nincs semmilyen app, ami képes ezt kezelni %s\"</string>
+  <string name="compactlayout">Kompakt elrendezés</string>
+  <string name="compactlayout_on">Ikonok kisebb méretben</string>
+  <string name="compactlayout_off">Ikonok normál méretben</string>
+  <string name="theme">Téma</string>
+  <string name="minsdk_or_later">Android %s vagy későbbi</string>
+</resources>
--- a/res/values-it/array.xml
+++ b/res/values-it/array.xml
@ -11,9 +11,4 @@
    <item>Scuro</item>
    <item>Chiaro</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Disabilitato (non sicuro)</item>
-    <item>Normale</item>
-    <item>Completo</item>
-  </string-array>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Sembra che questo pacchetto non sia compatibile con il tuo dispositivo. Vuoi provare comunque ad installarlo?</string>
  <string name="installDowngrade">Stai provando a passare ad una versione precedente di questa applicazione. Potresti avere malfunzionamenti e perdita di dati. Vuoi installarla comunque?</string>
  <string name="version">Versione</string>
-  <string name="cache_downloaded">Cache applicazioni scaricate</string>
+  <string name="edit">Modifica</string>
+  <string name="delete">Elimina</string>
+  <string name="enable_nfc_send">Attiva Invio NFC…</string>
+  <string name="cache_downloaded">Cache applicazioni</string>
+  <string name="cache_downloaded_on">Conserva i file apk scaricati sulla scheda SD</string>
+  <string name="cache_downloaded_off">Non conservare i file apk</string>
  <string name="updates">Aggiornamenti</string>
  <string name="other">Altro</string>
  <string name="last_update_check">Ultima scansione repository: %s</string>
  <string name="never">mai</string>
+  <string name="update_interval">Intervallo degli aggiornamenti automatici</string>
+  <string name="update_interval_zero">Non aggiornare automaticamente l\'elenco delle applicazioni</string>
  <string name="automatic_scan_wifi">Solo su wifi</string>
+  <string name="automatic_scan_wifi_on">Aggiorna automaticamente gli elenchi di applicazioni solo su wifi</string>
+  <string name="automatic_scan_wifi_off">Aggiorna sempre gli elenchi delle applicazioni automaticamente</string>
  <string name="notify">Avviso</string>
+  <string name="notify_on">Notifica gli aggiornamenti disponibili</string>
+  <string name="notify_off">Non notificare gli aggiornamenti</string>
  <string name="update_history">Aggiorna i repository</string>
+  <string name="update_history_summ">Numero di giorni per considerare le applicazioni nuove o recenti: %s</string>
  <string name="search_results">Risultati Ricerca</string>
  <string name="app_details">Dettagli App</string>
  <string name="no_such_app">Nessuna app corrispondente trovata</string>
@ -39,6 +51,9 @@ Un indirizzo URL di esempio è: https://f-droid.org/repo</string>
  <string name="repo_add_title">Aggiungi nuovo repository</string>
  <string name="repo_add_add">Aggiungi</string>
  <string name="cancel">Annulla</string>
+  <string name="enable">Abilita</string>
+  <string name="add_key">Aggiungi chiave</string>
+  <string name="overwrite">Sovrascrivi</string>
  <string name="repo_delete_title">Rimuovi repository</string>
  <string name="repo_update_title">Aggiorna i repository</string>
  <string name="tab_noninstalled">Disponibile</string>
@ -49,16 +64,29 @@ Un indirizzo URL di esempio è: https://f-droid.org/repo</string>
  <string name="process_wait_title">Attendere prego</string>
  <string name="process_update_msg">Aggiornamento elenco applicazioni…</string>
  <string name="download_server">Scaricamento applicazione da</string>
+  <string name="nfc_is_not_enabled">NFC non attivato!</string>
+  <string name="go_to_nfc_settings">Vai alle Impostazioni NFC…</string>
+  <string name="bluetooth_activity_not_found">Nessun metodo d\'invio via Bluetooth trovato, selezionane uno!</string>
+  <string name="choose_bt_send">Scegli il metodo di invio Bluetooth</string>
  <string name="repo_add_url">Indirizzo repository</string>
+  <string name="repo_add_fingerprint">Impronta digitale (opzionale)</string>
+  <string name="repo_exists">Questo repository esiste già!</string>
+  <string name="repo_exists_add_fingerprint">Questo repository è già configurato, una nuova informazione chiave verrà aggiunta.</string>
+  <string name="repo_exists_enable">Questo repository è già configurato, conferma di volerlo abilitare nuovamente.</string>
+  <string name="repo_exists_and_enabled">Il nuovo repository è già configurato e abilitato!</string>
+  <string name="repo_delete_to_overwrite">È necessario eliminare questo repository prima di poter aggiungerne uno con una chiave differente!</string>
+  <string name="malformed_repo_uri">Ignoro URI repo malformati: %s</string>
  <string name="repo_alrt">L\'elenco dei repository in uso è cambiato.
 Vuoi aggiornarlo?</string>
  <string name="menu_update_repo">Aggiorna i Repository</string>
-  <string name="menu_manage">Gestione Repository</string>
+  <string name="menu_manage">Gestione dei repository</string>
+  <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
  <string name="menu_preferences">Preferenze</string>
  <string name="menu_about">Informazioni</string>
  <string name="menu_search">Cerca</string>
  <string name="menu_add_repo">Nuovo Repository</string>
  <string name="menu_rem_repo">Rimuovi Repository</string>
+  <string name="menu_scan_repo">Trova dei Repository locali</string>
  <string name="menu_launch">Avvia</string>
  <string name="menu_share">Condividi</string>
  <string name="menu_install">Installa</string>
@ -79,17 +107,27 @@ Vuoi aggiornarlo?</string>
  <string name="antinonfreeadlist">Questa app promuove add-on non liberi</string>
  <string name="antinonfreenetlist">Questa app promuove servizi di rete non liberi</string>
  <string name="antinonfreedeplist">Questa app dipende da applicazioni non libere</string>
+  <string name="antiupstreamnonfreelist">Il codice sorgente a monte non è completamente libero</string>
  <string name="display">Mostra</string>
  <string name="expert">Esperto</string>
+  <string name="expert_on">Mostra le informazioni ulteriori e abilita le impostazioni avanzate</string>
+  <string name="expert_off">Nascondi le opzioni avanzate per utenti esperti</string>
  <string name="search_hint">Ricerca applicazioni</string>
-  <string name="db_sync_mode">Modalità di sincronizzazione database</string>
  <string name="appcompatibility">Compatibilità applicazioni</string>
  <string name="show_incompat_versions">Versioni incompatibili</string>
+  <string name="show_incompat_versions_on">Mostra le versioni incompatibili con il dispositivo</string>
+  <string name="show_incompat_versions_off">Nascondi le versioni incompatibili con il dispositivo</string>
  <string name="rooted">Amministratore</string>
+  <string name="rooted_on">Non disabilitare le applicazioni che richiedono privilegi di root</string>
+  <string name="rooted_off">Disabilita le applicazioni che richiedono privilegi di root</string>
  <string name="ignoreTouch">Ignora il Touchscreen</string>
+  <string name="ignoreTouch_on">Includi sempre le applicazioni con touchscreen obbligatorio</string>
+  <string name="ignoreTouch_off">Filtra le applicazioni normalmente</string>
  <string name="category_all">Tutte</string>
  <string name="category_whatsnew">Novità</string>
  <string name="category_recentlyupdated">Aggiornate di Recente</string>
+  <string name="local_repos_title">Repo FDroid Locali</string>
+  <string name="local_repos_scanning">Rilevazione repo FDroid locali…</string>
  <string name="status_download">Scaricamento
 %2$s / %3$s (%4$d%%) da
 %1$s</string>
@ -99,10 +137,38 @@ Vuoi aggiornarlo?</string>
  <string name="status_connecting_to_repo">Connessione a
 %1$s</string>
  <string name="status_checking_compatibility">Controllo compatibilità applicazioni con il tuo dispositivo…</string>
+  <string name="status_inserting">Salvataggio dettagli applicazioni (%1$d%%)</string>
  <string name="no_permissions">Non viene usata alcuna autorizzazione.</string>
  <string name="permissions_for_long">Autorizzazioni per la versione %s</string>
  <string name="showPermissions">Mostra autorizzazioni</string>
+  <string name="showPermissions_on">Mostra l\'elenco dei permessi richiesti da un\'applicazione</string>
+  <string name="showPermissions_off">Non mostrare i permessi prima del download</string>
  <string name="no_handler_app">Non hai alcuna app disponibile che può gestire %s</string>
  <string name="compactlayout">Layout Compatto</string>
+  <string name="compactlayout_on">Mostra le icone a dimensione ridotta</string>
+  <string name="compactlayout_off">Mostra le icone a dimensione normale</string>
  <string name="theme">Tema</string>
+  <string name="unsigned">Non firmato</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Numero di applicazioni</string>
+  <string name="repo_fingerprint">Impronta digitale della Chiave del Repo (SHA-256)</string>
+  <string name="repo_description">Descrizione</string>
+  <string name="repo_last_update">Ultimo aggiornamento</string>
+  <string name="repo_update">Aggiorna</string>
+  <string name="repo_name">Nome</string>
+  <string name="unsigned_description">Ciò significa che l\'elenco di applicazioni non potrà essere verificato. È consigliabile prestare attenzione alle applicazioni scaricate da indici non firmati.</string>
+  <string name="repo_not_yet_updated">Questo repository non è ancora stato utilizzato.
+Per poter vedere le applicazioni contenute, è     necessario aggiornarlo.
+Una volta aggiornato, la descrizione e le altre informazioni saranno disponibili qui.</string>
+  <string name="repo_delete_details">Si desidera eliminare il \"{0}\" repository, che contiene {1} applicazioni? Le applicazioni installate NON saranno rimosse, ma non sarà più possibile aggiornarle attraverso F-Droid.</string>
+  <string name="unknown">Sconosciuto</string>
+  <string name="repo_confirm_delete_title">Eliminare il repository?</string>
+  <string name="repo_confirm_delete_body">Eliminare un repository implica che le applicazioni contenute non saranno più disponibili attraverso F-Droid.
+Nota: Tutte le applicazioni installate precedentemente rimarranno sul dispositivo.</string>
+  <string name="repo_disabled_notification">\"%1$s\" è disabilitato.
+È necessario abilitare nuovamente questo repository per installare le applicazioni contenute.</string>
+  <string name="minsdk_or_later">%s o successivi</string>
+  <string name="not_on_same_wifi">Il tuo dispositivo non è nella stessa rete WiFi del Repository locale che hai aggiunto!
+Prova a collegarti a questa rete: %s</string>
+  <string name="requires_features">Richiede: %1$s</string>
 </resources>
--- a/res/values-ko/array.xml
+++ b/res/values-ko/array.xml
@ -11,9 +11,4 @@
    <item>어두운</item>
    <item>밝은</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>해제 (안전하지 않음)</item>
-    <item>보통</item>
-    <item>전체</item>
-  </string-array>
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -70,7 +70,6 @@
  <string name="display">표시</string>
  <string name="expert">전문가</string>
  <string name="search_hint">응용 프로그램 검색</string>
-  <string name="db_sync_mode">데이터베이스 동기화 모드</string>
  <string name="appcompatibility">응용 프로그램 호환성</string>
  <string name="show_incompat_versions">호환되지 않는 버전</string>
  <string name="ignoreTouch">터치스크린 무시</string>
--- a/res/values-nb/array.xml
+++ b/res/values-nb/array.xml
@ -8,12 +8,7 @@
    <item>Daglig</item>
  </string-array>
  <string-array name="themeNames">
-    <item>Mørk</item>
-    <item>Lys</item>
-  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Av (utrygt)</item>
-    <item>Normalt</item>
-    <item>Fullt</item>
+    <item>Mørkt</item>
+    <item>Lyst</item>
  </string-array>
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Det ser ut til at denne pakken ikke er kompatibel med ditt utstyr. Vil du prøve å installere det likevel?</string>
  <string name="installDowngrade">Du prøver å nedgradere denne applikasjonen. Dette kan føre til at applikasjonen henger, og du kan til og med miste dine data. Vil du prøve å nedgradere likevel?</string>
  <string name="version">Versjon</string>
+  <string name="edit">Rediger</string>
+  <string name="delete">Slett</string>
+  <string name="enable_nfc_send">Skru på NFC-sending</string>
  <string name="cache_downloaded">Lagre nedlastede applikasjoner i buffer</string>
+  <string name="cache_downloaded_on">Behold nedlastede apk-filer på minnekortet</string>
+  <string name="cache_downloaded_off">Ikke behold noen apk-filer</string>
  <string name="updates">Oppdateringer</string>
  <string name="other">Andre</string>
  <string name="last_update_check">Forrige registeroppdatering: %s</string>
  <string name="never">aldri</string>
+  <string name="update_interval">Intervall for automatisk oppdatering</string>
+  <string name="update_interval_zero">Ingen automatiske registerlisteoppdateringer</string>
  <string name="automatic_scan_wifi">Bare på trådløst</string>
+  <string name="automatic_scan_wifi_on">Oppdater applikasjoner automatisk kun på trådløst</string>
+  <string name="automatic_scan_wifi_off">Alltid oppdater applikasjonsliste automatisk</string>
  <string name="notify">Varsle</string>
+  <string name="notify_on">Varsle når nye oppdateringer er tilgjengelige</string>
+  <string name="notify_off">Ikke vis varsel om noen oppdateringer</string>
  <string name="update_history">Oppdater historie</string>
+  <string name="update_history_summ">Dager nytt innhold skal anses som ferskt: %s</string>
  <string name="search_results">Søkeresultater</string>
  <string name="app_details">Programdetaljer</string>
  <string name="no_such_app">Program ikke funnet</string>
@ -35,8 +47,11 @@ Lisensiert GNU GPLv3.</string>
  <string name="repo_add_title">Legg til nytt register</string>
  <string name="repo_add_add">Legg til</string>
  <string name="cancel">Avbryt</string>
+  <string name="enable">Skru på</string>
+  <string name="add_key">Legg til nøkkel</string>
+  <string name="overwrite">Overskriv</string>
  <string name="repo_delete_title">Velg register du vil fjerne</string>
-  <string name="repo_update_title">Oppdater registrene</string>
+  <string name="repo_update_title">Oppdater registerne</string>
  <string name="tab_noninstalled">Tilgjengelig</string>
  <string name="tab_updates">Oppdateringer</string>
  <string name="one_update_available">1 oppdatering tilgjengelig.</string>
@ -45,15 +60,28 @@ Lisensiert GNU GPLv3.</string>
  <string name="process_wait_title">Vennligst vent</string>
  <string name="process_update_msg">Oppdaterer applikasjonsliste…</string>
  <string name="download_server">Henter program fra</string>
+  <string name="nfc_is_not_enabled">NFC (nærfeltskommunikasjon) er ikke påskrudd!</string>
+  <string name="go_to_nfc_settings">Gå til NFC-innstillinger</string>
+  <string name="bluetooth_activity_not_found">Ingen forsendelsesmåte for blåtann funnet, velg en!</string>
+  <string name="choose_bt_send">Velg forsendelsesmåte for Blåtann</string>
  <string name="repo_add_url">Registeradresse</string>
+  <string name="repo_add_fingerprint">Fingeravtrykk (valgfritt)</string>
+  <string name="repo_exists">Dette registret eksisterer allerede!</string>
+  <string name="repo_exists_add_fingerprint">Dette registret er allerede satt opp, dette vil legge til ny informasjon om nøkler.</string>
+  <string name="repo_exists_enable">Dette registret er allerede satt opp, bekreft at du vil skru det på igjen.</string>
+  <string name="repo_exists_and_enabled">Oppstrøms-registret er allerede oppsatt og skrudd på!</string>
+  <string name="repo_delete_to_overwrite">Du må først slette dette registret før du kan legge til et med en en annen nøkkel!</string>
+  <string name="malformed_repo_uri">Ignorerer ugyldig registernettadresse: %s</string>
  <string name="repo_alrt">Listen over brukte register har endret seg. Vil du oppdatere dem?</string>
  <string name="menu_update_repo">Oppdater registrene</string>
  <string name="menu_manage">Endre registrene</string>
+  <string name="menu_send_apk_bt">Blåtann FDroid.apk…</string>
  <string name="menu_preferences">Innstillinger</string>
  <string name="menu_about">Om</string>
  <string name="menu_search">Søk</string>
  <string name="menu_add_repo">Nytt register</string>
  <string name="menu_rem_repo">Fjern register</string>
+  <string name="menu_scan_repo">Finn lokale register</string>
  <string name="menu_launch">Kjør</string>
  <string name="menu_share">Del</string>
  <string name="menu_install">Installer</string>
@ -61,7 +89,7 @@ Lisensiert GNU GPLv3.</string>
  <string name="menu_ignore_all">Ignorer alle oppdateringer</string>
  <string name="menu_ignore_this">Ignorer denne oppdateringen</string>
  <string name="menu_website">Nettside</string>
-  <string name="menu_issues">Saker</string>
+  <string name="menu_issues">Problemoversikt</string>
  <string name="menu_source">Kildekode</string>
  <string name="menu_upgrade">Oppgrader</string>
  <string name="menu_donate">Doner</string>
@ -74,17 +102,27 @@ Lisensiert GNU GPLv3.</string>
  <string name="antinonfreeadlist">Dette programmet promoterer ufrie utvidelser</string>
  <string name="antinonfreenetlist">Dette programmet promoterer ufrie nettverkstjenester</string>
  <string name="antinonfreedeplist">Dette programmet avhenger av andre ufrie applikasjoner</string>
+  <string name="antiupstreamnonfreelist">Koden fra kilden er ikke helt fri</string>
  <string name="display">Vis</string>
  <string name="expert">Ekspert</string>
+  <string name="expert_on">Hvis ekstra info og skru på ekstra innstillinger</string>
+  <string name="expert_off">Gjem ekstra info for erfarne brukere</string>
  <string name="search_hint">Søk i programliste</string>
-  <string name="db_sync_mode">Modus for databasesynkronisering</string>
  <string name="appcompatibility">Programstøtte</string>
  <string name="show_incompat_versions">Ukompatible versjoner</string>
+  <string name="show_incompat_versions_on">Vis programvareversjoner som er ukompatible med enheten</string>
+  <string name="show_incompat_versions_off">Gjem programvareversjoner som er ukompatible med enheten</string>
  <string name="rooted">Rot</string>
+  <string name="rooted_on">Skyggelegg alle app-er som krever superbruker-tilgang</string>
+  <string name="rooted_off">Skyggelegg alle app-er som etterspør superbruker-rettigheter</string>
  <string name="ignoreTouch">Ignorer pekeskjerm</string>
+  <string name="ignoreTouch_on">Alltid inkluder app-er som krever pekeskjerm</string>
+  <string name="ignoreTouch_off">Filtrer app-er som normalt</string>
  <string name="category_all">Alle</string>
  <string name="category_whatsnew">Det som er nytt</string>
  <string name="category_recentlyupdated">Nylig oppdatert</string>
+  <string name="local_repos_title">Lokale F-Droid register</string>
+  <string name="local_repos_scanning">Oppdager lokale FDroid register…</string>
  <string name="status_download">Laster ned
 %2$s / %3$s (%4$d%%) fra
 %1$s</string>
@ -94,10 +132,47 @@ Lisensiert GNU GPLv3.</string>
  <string name="status_connecting_to_repo">Kobler til
 %1$s</string>
  <string name="status_checking_compatibility">Sjekker programstøtte for ditt utstyr…</string>
+  <string name="status_inserting">Lagrer programdata (%1$d%%)</string>
  <string name="no_permissions">Krever ingen tillatelser.</string>
  <string name="permissions_for_long">Tillatelser for versjon %s</string>
  <string name="showPermissions">Vis tillatelser</string>
+  <string name="showPermissions_on">Vis en liste over rettighetene en app krever</string>
+  <string name="showPermissions_off">Ikke vis rettigheter før nedlasting</string>
  <string name="no_handler_app">Du har ingen tilgjengelige applikasjoner som kan håndtere %s</string>
  <string name="compactlayout">Kompakt layout</string>
+  <string name="compactlayout_on">Vis ikoner i mindre størrelse</string>
+  <string name="compactlayout_off">Vis ikoner i vanlig størrelse</string>
  <string name="theme">Utseende</string>
+  <string name="unsigned">Usignert</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Antall app-er</string>
+  <string name="repo_fingerprint">Fingeravtrykk for signeringsnøkkel til register (SHA-256)</string>
+  <string name="repo_description">Beskrivelse</string>
+  <string name="repo_last_update">Siste oppdatering</string>
+  <string name="repo_update">Oppdater</string>
+  <string name="repo_name">Navn</string>
+  <string name="unsigned_description">Dette betyr at listen over applikasjoner ikke er kontrollert. Du bør være forsiktig med applikasjoner lastet ned fra usignerte lister.</string>
+  <string name="repo_not_yet_updated">Dette registret har ikke blitt brukt enda.
+For å se app-ene det har tilgjengelig, må du oppdatere det.
+
+Når så er gjort, vil beskrivelser og andre detaljer bli tilgjengelige her.</string>
+  <string name="repo_delete_details">Vil du slette \"{0}\"
+registret, som har {1} app-er i seg? Alle installerte app-er vil IKKE bli
+fjernet, men det kan ikke oppdatere dem med F-droid lengre.</string>
+  <string name="unknown">Ukjent</string>
+  <string name="repo_confirm_delete_title">Slett register?</string>
+  <string name="repo_confirm_delete_body">Sletting av register betyr
+ at applikasjoner derfra ikke lenger vil være tilgjengelige i F-droid.
+
+Merk: Alle
+     tidligere installerte apper vil fremdeles være å finne på din enhet.</string>
+  <string name="repo_disabled_notification">Avskrudd \"%1$\".
+
+Du må
+       skru på dette registeret igjen for å installere applikasjoner fra det.</string>
+  <string name="minsdk_or_later">%s eller senere</string>
+  <string name="up_to_maxsdk">opptil %s</string>
+  <string name="minsdk_up_to_maxsdk">%1$s opptil %2$s</string>
+  <string name="not_on_same_wifi">Din enhet er ikke på det samme lokale WiFi-nettet som registret du nettopp la til! Prøv å koble til dette nettverket: %s</string>
+  <string name="requires_features">Krever: %1$s</string>
 </resources>
--- a/res/values-nl/array.xml
+++ b/res/values-nl/array.xml
@ -11,9 +11,4 @@
    <item>Donker</item>
    <item>Licht</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Uit (onveilig)</item>
-    <item>Normaal</item>
-    <item>Vol</item>
-  </string-array>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@ -7,7 +7,11 @@
  <string name="installIncompatible">Dit pakket is niet verenigbaar met uw apparaat. Wilt u het alsnog proberen te installeren?</string>
  <string name="installDowngrade">U probeert deze applicatie te degraderen naar een oudere versie. Als u dit doet uw data kan corrupt of verloren raken. Wilt u dit alsnog uitvoeren?</string>
  <string name="version">Versie</string>
+  <string name="edit">Bewerken</string>
+  <string name="delete">Verwijderen</string>
  <string name="cache_downloaded">buffer gedownloade apps</string>
+  <string name="cache_downloaded_on">Gedownloade apk-files bewaren op SD card</string>
+  <string name="cache_downloaded_off">apk-files niet bewaren</string>
  <string name="updates">Updates</string>
  <string name="other">Andere</string>
  <string name="last_update_check">Laatste bronnen scan: %s</string>
@ -42,13 +46,14 @@ Een bron-adres ziet er ongeveer
  <string name="repo_add_title">Voeg nieuwe bron toe</string>
  <string name="repo_add_add">Toevoegen</string>
  <string name="cancel">Annuleren</string>
+  <string name="overwrite">Overschrijven</string>
  <string name="repo_delete_title">Kies bron om te verwijderen</string>
  <string name="repo_update_title">Vernieuw bronnen</string>
  <string name="tab_noninstalled">Beschikbaar</string>
  <string name="tab_updates">Updates</string>
-  <string name="one_update_available">1 vernieuwing is beschikbaar</string>
-  <string name="many_updates_available">%d vernieuwingen zijn beschikbaar</string>
-  <string name="fdroid_updates_available">F-Droid Vernieuwingen Beschikbaar</string>
+  <string name="one_update_available">1 update beschikbaar</string>
+  <string name="many_updates_available">%d updates beschikbaar</string>
+  <string name="fdroid_updates_available">F-Droid update beschikbaar</string>
  <string name="process_wait_title">Even geduld aub</string>
  <string name="process_update_msg">Applicatie-lijst vernieuwen…</string>
  <string name="download_server">downloaden applicatie van</string>
@ -62,12 +67,13 @@ Wilt u ze vernieuwen?</string>
  <string name="menu_search">Zoeken</string>
  <string name="menu_add_repo">Nieuwe bron</string>
  <string name="menu_rem_repo">Verwijder bron</string>
+  <string name="menu_scan_repo">Vind lokale oplagplaatsen</string>
  <string name="menu_launch">Start</string>
  <string name="menu_share">Delen</string>
  <string name="menu_install">Installeren</string>
  <string name="menu_uninstall">Deinstalleren</string>
-  <string name="menu_ignore_all">Negeer Alle Verbeteringen</string>
-  <string name="menu_ignore_this">Negeer Deze Verbetering</string>
+  <string name="menu_ignore_all">Negeer Alle Updates</string>
+  <string name="menu_ignore_this">Negeer Deze Update</string>
  <string name="menu_website">Website</string>
  <string name="menu_issues">Problemen</string>
  <string name="menu_source">Broncode</string>
@ -85,7 +91,6 @@ Wilt u ze vernieuwen?</string>
  <string name="display">Laat zien</string>
  <string name="expert">Expert</string>
  <string name="search_hint">Zoek applicaties</string>
-  <string name="db_sync_mode">Database sync-modus</string>
  <string name="appcompatibility">Applicatie verenigbaarheid</string>
  <string name="show_incompat_versions">Onverenigbare versies</string>
  <string name="rooted">Root</string>
@ -93,14 +98,14 @@ Wilt u ze vernieuwen?</string>
  <string name="category_all">Alles</string>
  <string name="category_whatsnew">Wat is nieuw</string>
  <string name="category_recentlyupdated">Recentelijk vernieuwd</string>
+  <string name="local_repos_title">Lokale FDroid opslagplaatsen</string>
  <string name="status_download">Downloaden
 %2$s / %3$s (%4$d%%) van
 %1$s</string>
  <string name="status_processing_xml">Verwerken applicatie
 %2$d van %3$d van
 %1$s</string>
-  <string name="status_connecting_to_repo">Connecteren naar
-%1$s</string>
+  <string name="status_connecting_to_repo">Verbinden met %1$s</string>
  <string name="status_checking_compatibility">Controleer app compatibiliteit met uw apparaat…</string>
  <string name="no_permissions">Geen permissies worden gebruikt</string>
  <string name="permissions_for_long">Permissies voor versie %s</string>
@ -108,4 +113,18 @@ Wilt u ze vernieuwen?</string>
  <string name="no_handler_app">U hebt geen beschikbare app die %s kan verwerken</string>
  <string name="compactlayout">Compacte Layout</string>
  <string name="theme">Thema</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Aantal apps</string>
+  <string name="repo_description">Beschrijving</string>
+  <string name="repo_last_update">Meest recente update</string>
+  <string name="repo_name">Naam</string>
+  <string name="repo_not_yet_updated">Deze opslag is nog niet eerder gebruikt. Om de leverbare apps te zien moet u het updaten.
+
+Zodra de update gedaan is ziet u hier de beschrijving en andere details.</string>
+  <string name="repo_delete_details">Weet u zeker dat u de opslag genaamd \"{0}\" met daarin \"{1}\" apps wilt verwijderen? Reeds geïnstalleerde apps blijven behouden, maar kunnen niet meer worden geüpdate via F-Droid.</string>
+  <string name="unknown">Onbekend</string>
+  <string name="repo_confirm_delete_body">Het verwijderen van een opslag betekent dat apps hierop niet meer beschikbaar zijn voor F-Droid.
+
+Noot: Eerder geïnstalleerde apps blijven op uw apparaat.</string>
+  <string name="repo_disabled_notification">\"%1$s\" uitgeschakeld. U moet deze weer activeren mocht u apps vanuit deze opslag willen installeren.</string>
 </resources>
--- a/res/values-pl/array.xml
+++ b/res/values-pl/array.xml
@ -8,12 +8,7 @@
    <item>Codziennie</item>
  </string-array>
  <string-array name="themeNames">
-    <item>Dark</item>
-    <item>Light</item>
-  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Wyłączone (niebezpieczne)</item>
-    <item>Normalny</item>
-    <item>Pełny</item>
+    <item>Ciemny</item>
+    <item>Jasny</item>
  </string-array>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -4,22 +4,43 @@
  <string name="searchres_oneapp">Znaleziono jedną pasującą aplikację \'%s\':</string>
  <string name="searchres_noapps">Nie znaleziono żadnych pasujących aplikacji \'%s\'</string>
  <string name="SignatureMismatch">Nowa wersja jest podpisana innym kluczem niż poprzednia. Aby ją zainstalować należy najpierw usunąć tę starą. Zrób to i spróbuj ponownie. (Proszę pamiętać, że deinstalacja spowoduje usunięcie wszystkich danych przechowywanych przez aplikację)</string>
+  <string name="installIncompatible">Wygląda na to, że ta aplikacja nie jest kompatybilna z twoim urządzeniem. Zainstalować mimo to?</string>
+  <string name="installDowngrade">Próbujesz zainstalować starszą wersję tej aplikacji.Może to spowodować nieprawidłowe działanie, a nawet utratę swoich danych. Czy na pewno chcesz spróbować i zainstalować starszą wersję ?</string>
  <string name="version">Wersja</string>
+  <string name="edit">Edytuj</string>
+  <string name="delete">Usuń</string>
  <string name="cache_downloaded">Buforuj pobrane aplikacje</string>
+  <string name="cache_downloaded_on">Trzymaj ściągnięte pliki apk na karcie SD</string>
+  <string name="cache_downloaded_off">Nie zachowuj żadnych apk</string>
  <string name="updates">Aktualizacje</string>
  <string name="other">Inne</string>
  <string name="last_update_check">Ostatnie uaktualnienie listy aplikacji: %s</string>
  <string name="never">nigdy</string>
+  <string name="update_interval">Automatyczna przerwa aktualizacji</string>
+  <string name="update_interval_zero">Żadnych automatycznych aktualizacji listy aplikacji</string>
  <string name="automatic_scan_wifi">Tylko przez wifi</string>
+  <string name="automatic_scan_wifi_on">Aktualizuj automatycznie tylko przez wifi</string>
+  <string name="automatic_scan_wifi_off">Zawsze aktualizuj listę aplikacji automatycznie</string>
  <string name="notify">Powiadom</string>
+  <string name="notify_on">Powiadom kiedy aktualizacje są dostępne</string>
+  <string name="notify_off">Nie powiadamiaj o aktualizacjach</string>
  <string name="update_history">Historia aktualizacji</string>
+  <string name="update_history_summ">Liczba dni, aby uznać aplikację za nową lub niedawną: %s</string>
  <string name="search_results">Wyniki wyszukiwania</string>
+  <string name="app_details">Szczegóły aplikacji</string>
  <string name="no_such_app">Nie znaleziono takiej aplikacji</string>
  <string name="about_title">O F-Droid</string>
+  <string name="about_desc">Oryginalnie bazowany na Aptoide.
+Wydany na licencji GNU GPLv3.</string>
  <string name="about_site">Strona internetowa:</string>
  <string name="about_mail">Email:</string>
  <string name="about_version">Wersja:</string>
  <string name="about_website">Strona internetowa</string>
+  <string name="no_repo">Nie masz skonfigurowanych żadnych repozytoriów!
+
+Repozytorium jest źródłem aplikacji. Aby dodać jedno wciśnij MENU i wprowadź adres URL.
+
+Przykładowy adres repozytorium: https://f-droid.org/repo</string>
  <string name="inst">Zainstalowano</string>
  <string name="not_inst">Niezainstalowane</string>
  <string name="added_on">Dodano %s</string>
@ -29,14 +50,26 @@
  <string name="repo_add_title">Dodaj nowe repozytorium</string>
  <string name="repo_add_add">Dodaj</string>
  <string name="cancel">Anuluj</string>
+  <string name="enable">Włącz</string>
+  <string name="add_key">Dodaj klucz</string>
+  <string name="overwrite">Nadpisz</string>
  <string name="repo_delete_title">Wybierz repozytorium które chcesz usunąć</string>
  <string name="repo_update_title">Aktualizuj repozytoria</string>
  <string name="tab_noninstalled">Dostępne</string>
  <string name="tab_updates">Aktualizacje</string>
+  <string name="one_update_available">Dostępne jest 1 uaktualnienie.</string>
+  <string name="many_updates_available">Dostępnych jest %d uaktualnień</string>
+  <string name="fdroid_updates_available">Uaktualnienie F-Droid jest dostępne</string>
  <string name="process_wait_title">Proszę czekać</string>
  <string name="process_update_msg">Aktualizowanie listy aplikacji…</string>
  <string name="download_server">Pobieranie aplikacji z</string>
  <string name="repo_add_url">Adres repozytorium</string>
+  <string name="repo_add_fingerprint">Odcisk palca (opcjonalnie)</string>
+  <string name="repo_exists">Repozytorium już istnieje!</string>
+  <string name="repo_exists_add_fingerprint">To repozytorium jest już ustawione, doda to nowe kluczowe informacje</string>
+  <string name="repo_exists_enable">To repozytorium jest już ustawione, potwierdź że chcesz je włączyć ponownie</string>
+  <string name="repo_exists_and_enabled">Nadchodzące repozytorium jest już ustawione i włączone!</string>
+  <string name="repo_delete_to_overwrite">Musisz najpierw usunąć to repozytorium zanim dodasz następne z innym kluczem!</string>
  <string name="repo_alrt">Lista wykorzystywanych repozytoriów uległa zmianie.
 Czy chcesz je zaktualizować?</string>
  <string name="menu_update_repo">Aktualizuj repozytoria</string>
@ -55,20 +88,70 @@ Czy chcesz je zaktualizować?</string>
  <string name="menu_website">Strona internetowa</string>
  <string name="menu_issues">Problemy</string>
  <string name="menu_source">Kod żródłowy</string>
+  <string name="menu_upgrade">Uaktualnij</string>
  <string name="menu_donate">Złóż datek</string>
  <string name="details_installed">Wersja %s została zainstalowana</string>
  <string name="details_notinstalled">Nie zainstalowano</string>
  <string name="corrupt_download">Pobrany plik jest uszkodzony</string>
  <string name="download_cancelled">Anulowano pobieranie</string>
+  <string name="antiadslist">Ta aplikacja zawiera reklamy</string>
+  <string name="antitracklist">Ta aplikacja śledzi twoje działania</string>
+  <string name="antinonfreeadlist">Ta aplikacja promuje niewolne dodatki</string>
+  <string name="antinonfreenetlist">Ta aplikacja promuje niewolne usługi sieciowe</string>
+  <string name="antinonfreedeplist">Ta aplikacja wymaga innych, niewolnych aplikacji</string>
+  <string name="antiupstreamnonfreelist">Upstreamowy kod źródłowy nie jest w pełni wolny</string>
+  <string name="display">Wyświetl</string>
  <string name="expert">Ekspert</string>
+  <string name="expert_on">Pokaż dodatkowe informacje i włącz dodatkowe ustawienia</string>
+  <string name="expert_off">Ukryj dodatki dla zaawansowanych użytkowników</string>
  <string name="search_hint">Wyszukaj aplikacje</string>
-  <string name="db_sync_mode">Tryb synchronizacji bazy danych</string>
  <string name="appcompatibility">Kompatybilność aplikacji</string>
+  <string name="show_incompat_versions">Niekompatybilne wersje</string>
+  <string name="show_incompat_versions_on">Pokaż wersje aplikacji niekompatybilne z urządzeniem</string>
+  <string name="show_incompat_versions_off">Ukryj wersje aplikacji niekompatybilnych z urządzeniem</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">Nie przyciemniaj aplikacji wymagających uprawnień roota</string>
+  <string name="rooted_off">Przyciemnij aplikacje wymagające uprawnień roota</string>
+  <string name="ignoreTouch">Ignoruj ekran dotykowy</string>
+  <string name="ignoreTouch_on">Zawsze uwzględniaj aplikacje, które wymagają ekranu dotykowego</string>
+  <string name="ignoreTouch_off">Filtruj aplikacje normalnie</string>
  <string name="category_all">Wszystkie</string>
  <string name="category_whatsnew">Co nowego</string>
  <string name="category_recentlyupdated">Ostatnio zaktualizowane</string>
+  <string name="status_download">Pobieranie %2$s / %3$s(%4$d%%) z %1$s</string>
+  <string name="status_processing_xml">Przetwarzanie aplikacji %2$d / %3$d z %1$s</string>
  <string name="status_connecting_to_repo">Trwa łączenie z
 %1$s</string>
+  <string name="status_checking_compatibility">Sprawdzanie kompatybilności aplikacji z urządzeniem…</string>
+  <string name="no_permissions">Brak użytych uprawnień.</string>
+  <string name="permissions_for_long">Uprawnienia dla wersji %s</string>
  <string name="showPermissions">Wyświetl uprawnienia</string>
+  <string name="showPermissions_on">Wyświetl listę uprawnień wymaganych przez aplikację</string>
+  <string name="showPermissions_off">Nie pokazuj uprawnień przed pobraniem</string>
+  <string name="no_handler_app">Nie masz żadnej dostępnej aplikacji, która może obsłużyć %s</string>
+  <string name="compactlayout">Widok kompaktowy</string>
+  <string name="compactlayout_on">Pokaż ikony w mniejszym rozmiarze</string>
+  <string name="compactlayout_off">Pokaż ikony w zwykłym rozmiarze</string>
+  <string name="theme"> Motyw</string>
+  <string name="unsigned">Niepodpisany</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Liczba aplikacji</string>
+  <string name="repo_description">Opis</string>
+  <string name="repo_last_update">Ostatnia modyfikacja</string>
+  <string name="repo_update">Aktualizacja</string>
+  <string name="repo_name">Nazwa</string>
+  <string name="unsigned_description">To oznacza, że lista aplikacji nie może być zweryfikowana. Powinieneś być ostrożny przy aplikacjach ściągniętych z nie podpisanych źródeł</string>
+  <string name="repo_not_yet_updated">To repozytorium było jeszcze używane. Aby wyświetlić jego aplikacje musisz je zaktualizować.
+
+Opis i inne szczegóły będą tu dostępne gdy zaktualizujesz repozytorium</string>
+  <string name="repo_delete_details">Czy chcesz usunąć repozytorium \"{0}\", zawierające \"{1}\" aplikacji? Zainstalowane aplikacje nie zostaną usunięte, ale nie będziesz mógł ich dłużej  aktualizować przez F-Droid</string>
+  <string name="unknown">Nieznany</string>
+  <string name="repo_confirm_delete_title">Usunąć repozytorium?</string>
+  <string name="repo_confirm_delete_body">Usunięcie repozytorium oznacza, że aplikacje z niego nie będą dłużej dostępne w F-Droid.
+
+Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</string>
+  <string name="repo_disabled_notification">Zablokowane \"%1$s\".
+
+Aby zainstalować aplikacje z tego repozytorium musisz je włączyć ponownie.</string>
+  <string name="minsdk_or_later">%s lub później</string>
 </resources>
--- a/res/values-pt-rBR/array.xml
+++ b/res/values-pt-rBR/array.xml
@ -11,9 +11,4 @@
    <item>Escuro</item>
    <item>Claro</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Desligada (inseguro)</item>
-    <item>Normal</item>
-    <item>Completa</item>
-  </string-array>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@ -29,7 +29,7 @@ Lançado sob a licença GNU GPLv3.</string>

 Um repositório é uma fonte de aplicativos. Para adicionar um, pressione o botão MENU e digite a URL.

-Um endereço do repositório é algo similar a isto: http://f-droid.org/repo</string>
+Um endereço do repositório é algo similar a isto: https://f-droid.org/repo</string>
  <string name="inst">Instalado</string>
  <string name="not_inst">Não Instalado</string>
  <string name="added_on">Adicionado em %s</string>
@ -82,7 +82,6 @@ Você deseja atualizá-los?</string>
  <string name="display">Exibição</string>
  <string name="expert">Especialista</string>
  <string name="search_hint">Pesquisar aplicativos</string>
-  <string name="db_sync_mode">Modo de sincronia do banco de dados</string>
  <string name="appcompatibility">Compatibilidade de aplicativo</string>
  <string name="show_incompat_versions">Versões incompatíveis</string>
  <string name="rooted">Root</string>
--- a/res/values-ro/array.xml
+++ b/res/values-ro/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Inchis (nerecomandat)</item>
-    <item>Normal</item>
-    <item>Complet</item>
-  </string-array>
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="searchres_napps">Sa gasit o aplicatie potrivita cu %s\'</string>
-  <string name="searchres_oneapp">Sa gasit o aplicatie potrivita cu %s\'</string>
-  <string name="searchres_noapps">Nu exita aplicatii potrivite cu %s\':</string>
+  <string name="searchres_napps">Sa gasit %1$d aplicații potrivita cu \'%2$s\'</string>
+  <string name="searchres_oneapp">Sa gasit o aplicatie potrivita cu \'%s\'</string>
+  <string name="searchres_noapps">Nu exita aplicatii potrivite cu \'%s\':</string>
  <string name="version">Versiune</string>
  <string name="cache_downloaded">Istoric aplicatii descarcate</string>
  <string name="updates">Noutati</string>
@ -25,6 +25,6 @@ Distribuit sub licenta GNU GPLv3.</string>
  <string name="repo_update_title">Actualizare depozit aplicatii</string>
  <string name="tab_noninstalled">Disponibil</string>
  <string name="tab_updates">Actualizare</string>
-  <string name="process_wait_title">Asteptati …</string>
-  <string name="process_update_msg">Se actualizeaza lista …</string>
+  <string name="process_wait_title">Asteptati…</string>
+  <string name="process_update_msg">Se actualizeaza lista…</string>
 </resources>
--- a/res/values-ru/array.xml
+++ b/res/values-ru/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Откл. (опасно)</item>
-    <item>Обычный</item>
-    <item>Полный</item>
-  </string-array>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -4,14 +4,29 @@
  <string name="searchres_oneapp">Найдено одно совпадение с \'%s\':</string>
  <string name="searchres_noapps">Не найдено ни одного совпадения с \'%s\'</string>
  <string name="SignatureMismatch">Новая версия подписана ключом отличным от старого. Для установки новой версии, сначала нужно удалить старую программы. А потом попробовать снова. (Замечание: при удалении программы будут удалены все её данные)</string>
+  <string name="installIncompatible">Похоже, что этот пакет не несовместим с Вашим устройством. Вы все ещё хотите попытаться установить его?</string>
  <string name="installDowngrade">Вы пытаетесь установить более старую версию приложения. Это может привести к его некорректной работе и даже потере данных. Вы уверены, что хотите продолжить?</string>
  <string name="version">Версия</string>
-  <string name="cache_downloaded">Кешировать загруженные приложения</string>
+  <string name="edit">Редактировать</string>
+  <string name="delete">Удалить</string>
+  <string name="enable_nfc_send">Включить отправку по NFC…</string>
+  <string name="cache_downloaded">Кэшировать загруженные приложения</string>
+  <string name="cache_downloaded_on">Хранить загруженные файлы apk на SD-карте</string>
+  <string name="cache_downloaded_off">Не хранить файлы apk</string>
  <string name="updates">Обновления</string>
+  <string name="other">Другой</string>
  <string name="last_update_check">Обновлено: %s</string>
  <string name="never">никогда</string>
+  <string name="update_interval">Интервал автоматического обновления</string>
+  <string name="update_interval_zero">Не обновлять автоматически список приложений</string>
+  <string name="automatic_scan_wifi">Только по Wi-Fi</string>
+  <string name="automatic_scan_wifi_on">Обновлять списки приложений автоматически только по Wi-Fi</string>
+  <string name="automatic_scan_wifi_off">Всегда автоматически обновлять списки приложений</string>
  <string name="notify">Уведомление</string>
+  <string name="notify_on">Сообщать о наличии обновлений</string>
+  <string name="notify_off">Не уведомлять о любых обновлениях</string>
  <string name="update_history">История обновлений</string>
+  <string name="update_history_summ">Количество дней, в которые отображаются новые или недавно измененные приложения: %s</string>
  <string name="search_results">Результаты поиска</string>
  <string name="app_details">Описание приложения</string>
  <string name="no_such_app">Приложение не найдено</string>
@ -36,55 +51,123 @@
  <string name="repo_add_title">Добавить репозиторий</string>
  <string name="repo_add_add">Добавить</string>
  <string name="cancel">Отменить</string>
+  <string name="enable">Включить</string>
+  <string name="add_key">Добавить ключ</string>
+  <string name="overwrite">Перезаписать</string>
  <string name="repo_delete_title">Удалить репозиторий</string>
  <string name="repo_update_title">Обновить репозитории</string>
  <string name="tab_noninstalled">Доступно</string>
  <string name="tab_updates">Обновления</string>
  <string name="one_update_available">Доступно 1 обновление.</string>
  <string name="many_updates_available">Обновлений доступно - %d.</string>
+  <string name="fdroid_updates_available">Доступны обновления для F-Droid</string>
  <string name="process_wait_title">Подождите</string>
  <string name="process_update_msg">Список приложений обновляется…</string>
  <string name="download_server">Взять приложение из</string>
+  <string name="nfc_is_not_enabled">NFC не включен!</string>
+  <string name="go_to_nfc_settings">Перейти в Настройки NFC…</string>
+  <string name="bluetooth_activity_not_found">Ни один метод отправки по Bluetooth не найден, выберите один из них!</string>
+  <string name="choose_bt_send">Выберите метод отправки по Bluetooth</string>
  <string name="repo_add_url">Адрес репозитория</string>
+  <string name="repo_add_fingerprint">Отпечаток ключа (опционально)</string>
+  <string name="repo_exists">Этот репозиторий уже существует!</string>
+  <string name="repo_exists_add_fingerprint">Этот репозиторий уже установлен, это действие добавит новую информацию о ключе.</string>
+  <string name="repo_exists_enable">Этот репозиторий уже настроен, убедитесь, что вы хотите снова включить его.</string>
+  <string name="repo_exists_and_enabled">Репозиторий уже настроен и включен!</string>
+  <string name="repo_delete_to_overwrite">Вы должны удалить этот репозиторий, прежде чем вы можете добавить новый с другим ключом!</string>
+  <string name="malformed_repo_uri">Игнорирование неверного URI репозитория: %s</string>
  <string name="repo_alrt">Список репозиториев изменился.
 Обновить его?</string>
  <string name="menu_update_repo">Обновить репозитории</string>
-  <string name="menu_manage">Редактировать репозитории</string>
+  <string name="menu_manage">Репозитории</string>
+  <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
  <string name="menu_preferences">Настройки</string>
  <string name="menu_about">О программе</string>
  <string name="menu_search">Поиск</string>
  <string name="menu_add_repo">Новый репозиторий</string>
  <string name="menu_rem_repo">Удалить репозиторий</string>
+  <string name="menu_scan_repo">Найти локальные репозитории</string>
  <string name="menu_launch">Запустить</string>
  <string name="menu_share">Поделиться</string>
  <string name="menu_install">Установить</string>
  <string name="menu_uninstall">Удалить</string>
+  <string name="menu_ignore_all">Игнорировать все обновления</string>
+  <string name="menu_ignore_this">Игнорировать данное обновление</string>
  <string name="menu_website">Сайт</string>
  <string name="menu_issues">Ошибки</string>
  <string name="menu_source">Исходный код</string>
+  <string name="menu_upgrade">Обновление</string>
  <string name="menu_donate">Пожертвовать</string>
  <string name="details_installed">Версия %s установлена</string>
  <string name="details_notinstalled">Не установлено</string>
  <string name="corrupt_download">Загруженный файл повреждён</string>
  <string name="download_cancelled">Загрузка остановлена</string>
+  <string name="antiadslist">Это приложение содержит рекламу</string>
+  <string name="antitracklist">Это приложение будет отслеживать ваши действия и сообщать о вашей деятельности</string>
+  <string name="antinonfreeadlist">Это приложение предлагает использовать несвободные дополнения</string>
+  <string name="antinonfreenetlist">Это приложение предлагает использовать несвободные сетевые услуги</string>
+  <string name="antinonfreedeplist">Это приложение зависит от других несвободных приложений</string>
+  <string name="antiupstreamnonfreelist">Оригинальный исходный код не является полностью свободным</string>
  <string name="display">Вид</string>
  <string name="expert">Эксперт</string>
+  <string name="expert_on">Показать дополнительную информацию и включить дополнительные настройки</string>
+  <string name="expert_off">Скрыть дополнительные возможности для опытных пользователей</string>
  <string name="search_hint">Найти приложения</string>
-  <string name="db_sync_mode">Режим синхронизации базы</string>
  <string name="appcompatibility">Совместимость приложений</string>
+  <string name="show_incompat_versions">Несовместимые версии</string>
+  <string name="show_incompat_versions_on">Показать версии программ, несовместимые с устройством</string>
+  <string name="show_incompat_versions_off">Скрыть версии программ, несовместимые с устройством</string>
  <string name="rooted">Суперпользователь</string>
+  <string name="rooted_on">Не выделять серым цветом приложения, требующие привилегии суперпользователя</string>
+  <string name="rooted_off">Выделять серым цветом приложения, требующие привилегии суперпользователя</string>
  <string name="ignoreTouch">Игнорировать Тачскрин</string>
+  <string name="ignoreTouch_on">Всегда включать приложения, которые требуют сенсорный экран</string>
+  <string name="ignoreTouch_off">Фильтровать приложения как обычно</string>
  <string name="category_all">Все</string>
  <string name="category_whatsnew">Что Нового</string>
  <string name="category_recentlyupdated">Недавно обновлённые</string>
+  <string name="local_repos_title">Локальные репозитории FDroid</string>
+  <string name="local_repos_scanning">Обнаружение локальных репозиториев FDroid…</string>
  <string name="status_download">Загрузка
 %2$s / %3$s (%4$d%%) из
+%1$s</string>
+  <string name="status_processing_xml">Обработка приложения
+%2$d из %3$d от
 %1$s</string>
  <string name="status_connecting_to_repo">Соединение с
 %1$s</string>
-  <string name="status_checking_compatibility">Проверка совместимости приложений с устройством…</string>
+  <string name="status_checking_compatibility">Проверка совместимости приложений с вашим устройством…</string>
+  <string name="status_inserting">Сохранение данных приложений (%1$d%%)</string>
  <string name="no_permissions">Разрешений не требуется.</string>
  <string name="permissions_for_long">Разрешения для версии %s</string>
  <string name="showPermissions">Показывать разрешения</string>
+  <string name="showPermissions_on">Отображение списка разрешений, которые требуются приложению</string>
+  <string name="showPermissions_off">Не показывать разрешения перед загрузкой</string>
+  <string name="no_handler_app">У вас нет установленного приложения для обработки %s</string>
  <string name="compactlayout">Компактный вид</string>
+  <string name="compactlayout_on">Показать иконки в меньшем размере</string>
+  <string name="compactlayout_off">Показать иконки обычного размера</string>
+  <string name="theme">Тема</string>
+  <string name="unsigned">Неподписанный</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Количество приложений</string>
+  <string name="repo_fingerprint">Отпечаток ключа подписи репозитория (SHA-256)</string>
+  <string name="repo_description">Описание</string>
+  <string name="repo_last_update">Последние обновление</string>
+  <string name="repo_update">Обновить</string>
+  <string name="repo_name">Название</string>
+  <string name="unsigned_description">Это означает, что список приложений не может быть проверен. Вы должны быть осторожны с приложениями, загруженными из неподписанных источников.</string>
+  <string name="repo_not_yet_updated">Этот репозиторий еще не был использован. Для того чтобы просмотреть приложения, которые он предоставляет, вы должны обновить его. После обновления, описание и другие детали станут доступны.</string>
+  <string name="repo_delete_details">Вы хотите удалить \"{0}\" репозиториев, который имеет {1} приложений в нем? Установленные приложения не будут удалены, но вы больше не сможете обновить их через F-Droid.</string>
+  <string name="unknown">Неизвестный</string>
+  <string name="repo_confirm_delete_title">Удалить репозиторий?</string>
+  <string name="repo_confirm_delete_body">Удаление репозитория означает что приложения из него больше не будут доступны в F-Droid.
+
+Примечание: Все ранее установленные приложения будут оставаться на вашем устройстве.</string>
+  <string name="repo_disabled_notification">\"%1$s\" отключен. Вам нужно повторно включить этот репозиторий для установки приложений из него.</string>
+  <string name="minsdk_or_later">%s или позднее</string>
+  <string name="up_to_maxsdk">до %s</string>
+  <string name="minsdk_up_to_maxsdk">%1$s до %2$s</string>
+  <string name="not_on_same_wifi">Данное устройство не находится в той же сети Wi-Fi, что и локальный репозиторий, который вы только что добавили! Попробуйте присоединиться к этой сети: %s</string>
+  <string name="requires_features">Требуется: %1$s</string>
 </resources>
--- a/res/values-sl/array.xml
+++ b/res/values-sl/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Izključeno (ni varno)</item>
-    <item>Običajno</item>
-    <item>Polno</item>
-  </string-array>
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@ -28,7 +28,7 @@ Izdan z licenco GNU GPLv3.</string>
  <string name="tab_noninstalled">Na razpolago</string>
  <string name="tab_updates">Posodobitve</string>
  <string name="process_wait_title">Počakajte prosim</string>
-  <string name="process_update_msg">Poteka posodobitev spiska aplikacij …</string>
+  <string name="process_update_msg">Poteka posodobitev spiska aplikacij…</string>
  <string name="download_server">Prejem aplikacije iz</string>
  <string name="repo_add_url">Naslov skladišča</string>
  <string name="repo_alrt">Spisek uporabljenih skladišč se je spremenil.
@ -52,7 +52,6 @@ Ga želite posodobiti?</string>
  <string name="antiadslist">Tämä ohjelma sisältää mainontaa</string>
  <string name="expert">Napredno</string>
  <string name="search_hint">Iskanje aplikacij</string>
-  <string name="db_sync_mode">Način sinhronizacije baze podatkov</string>
  <string name="appcompatibility">Združljivost aplikacij</string>
  <string name="show_incompat_versions">Yhteensopimattomat versiot</string>
  <string name="rooted">Skrbnik</string>
--- a/res/values-sr/array.xml
+++ b/res/values-sr/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Искључено (није безбедно)</item>
-    <item>Нормално</item>
-    <item>Пуно</item>
-  </string-array>
 </resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@ -29,7 +29,7 @@

 Ризнице су места одакле се скидају апликације. Да би сте додали једну, притисните тастер МЕНИ и унесите адресу.

-Адреса ризнице би личила на ово: http://f-droid.org/repo</string>
+Адреса ризнице би личила на ово: https://f-droid.org/repo</string>
  <string name="inst">Инсталирана</string>
  <string name="not_inst">Није Инсталирана</string>
  <string name="added_on">Додато  %s</string>
@ -81,7 +81,6 @@
  <string name="display">Прикажи</string>
  <string name="expert">Стручни</string>
  <string name="search_hint">Претрага апликација</string>
-  <string name="db_sync_mode">Режим синхронизације базе података</string>
  <string name="appcompatibility">Компатибилност апликације</string>
  <string name="rooted">Рут</string>
  <string name="ignoreTouch">Игнориши Додирни Екран</string>
--- a/res/values-sv/array.xml
+++ b/res/values-sv/array.xml
@ -11,9 +11,4 @@
    <item>Mörk</item>
    <item>Ljus</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Av (osäkert)</item>
-    <item>Normal</item>
-    <item>Fullständig</item>
-  </string-array>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@ -7,14 +7,25 @@
  <string name="installIncompatible">Det verkar som att detta program inte är kompatibelt med enheten. Vill ni försöka installera det ändå?</string>
  <string name="installDowngrade">Du försöker nedgradera detta program. Detta kan få det att fungera felaktigt eller orsaka förlust av dina data. Vill du ändå försöka nedgradera?</string>
  <string name="version">Version</string>
+  <string name="edit">Redigera</string>
+  <string name="delete">Ta bort</string>
  <string name="cache_downloaded">Cacha nerladdade appar</string>
+  <string name="cache_downloaded_on">Behåll hämtade apk-filer på SD-kort</string>
+  <string name="cache_downloaded_off">Behåll inga apk-filer</string>
  <string name="updates">Uppdateringar</string>
  <string name="other">Andra</string>
  <string name="last_update_check">Senaste förrådsavsökning: %s</string>
  <string name="never">aldrig</string>
+  <string name="update_interval">Automatiskt uppdateringsintervall</string>
+  <string name="update_interval_zero">Inga automatiska uppdateringar av applistor</string>
  <string name="automatic_scan_wifi">Endast via WiFi</string>
+  <string name="automatic_scan_wifi_on">Uppdatera applistor automatiskt endast över wifi</string>
+  <string name="automatic_scan_wifi_off">Uppdatera alltid applistor automatiskt</string>
  <string name="notify">Avisering</string>
+  <string name="notify_on">Meddela när uppdateringar finns tillgängliga</string>
+  <string name="notify_off">Meddela inte om uppdateringar</string>
  <string name="update_history">Uppdateringshistorik</string>
+  <string name="update_history_summ">Antal dagar som appar betraktas som nya: %s</string>
  <string name="search_results">Sökresultat</string>
  <string name="app_details">Appdetaljer</string>
  <string name="no_such_app">Ingen sådan app funnen</string>
@ -39,6 +50,9 @@ En förrådsadress ser ut så här: https://f-droid.org/repo</string>
  <string name="repo_add_title">Lägg till nytt förråd</string>
  <string name="repo_add_add">Lägg till</string>
  <string name="cancel">Avbryt</string>
+  <string name="enable">Aktivera</string>
+  <string name="add_key">Lägg till nyckel</string>
+  <string name="overwrite">Skriv över</string>
  <string name="repo_delete_title">Välj förråd att ta bort</string>
  <string name="repo_update_title">Uppdatera förråd</string>
  <string name="tab_noninstalled">Tillgängliga</string>
@ -49,7 +63,15 @@ En förrådsadress ser ut så här: https://f-droid.org/repo</string>
  <string name="process_wait_title">Var vänlig vänta</string>
  <string name="process_update_msg">Uppdaterar programlistan…</string>
  <string name="download_server">Hämtar program från</string>
+  <string name="nfc_is_not_enabled">NFC är inte aktiverat!</string>
+  <string name="go_to_nfc_settings">Gå till NFC-inställningar…</string>
  <string name="repo_add_url">Förrådsadress</string>
+  <string name="repo_add_fingerprint">fingeravtryck (valfritt)</string>
+  <string name="repo_exists">Detta förråd existerar redan!</string>
+  <string name="repo_exists_add_fingerprint">Detta förråd är redan installerat, detta kommer lägga till ny nyckelinformation.</string>
+  <string name="repo_exists_enable">Detta förråd är redan installerat, bekräfta att du vill återaktivera det.</string>
+  <string name="repo_exists_and_enabled">Inkommande förråd är redan installerat och aktiverat!</string>
+  <string name="repo_delete_to_overwrite">Du måste först ta bort detta förråd innan du kan lägga till ett med en annan nyckel!</string>
  <string name="repo_alrt">Listan över förråd har ändrats.
 Vill du uppdatera dem?</string>
  <string name="menu_update_repo">Uppdatera förråd</string>
@ -59,6 +81,7 @@ Vill du uppdatera dem?</string>
  <string name="menu_search">Sök</string>
  <string name="menu_add_repo">Nytt förråd</string>
  <string name="menu_rem_repo">Ta bort förråd</string>
+  <string name="menu_scan_repo">Hitta lokala förråd</string>
  <string name="menu_launch">Kör</string>
  <string name="menu_share">Dela</string>
  <string name="menu_install">Installera</string>
@ -79,17 +102,27 @@ Vill du uppdatera dem?</string>
  <string name="antinonfreeadlist">Denna app främjar ofria tillägg</string>
  <string name="antinonfreenetlist">Denna app främjar ofria nätverkstjänster</string>
  <string name="antinonfreedeplist">Denna app beror på andra ofria appar</string>
+  <string name="antiupstreamnonfreelist">Källkoden från uppströms är inte fullständigt fri</string>
  <string name="display">Visning</string>
  <string name="expert">Expert</string>
+  <string name="expert_on">Visa extra info och aktivera extra inställningar</string>
+  <string name="expert_off">Dölj extraval för vana användare</string>
  <string name="search_hint">Sök program</string>
-  <string name="db_sync_mode">Databassynkroniseringsläge</string>
  <string name="appcompatibility">Programkompatibilitet</string>
  <string name="show_incompat_versions">Inkompatibla versioner</string>
+  <string name="show_incompat_versions_on">Visa appversioner som är inkompatibla med enheten</string>
+  <string name="show_incompat_versions_off">Dölj appversioner som är inkompatibla med enheten</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">Gråtona inte appar som kräver root-behörighet</string>
+  <string name="rooted_off">Gråtona appar som kräver root-behörighet</string>
  <string name="ignoreTouch">Ignorera touchscreen</string>
+  <string name="ignoreTouch_on">Inkludera alltid appar som kräver touchscreen</string>
+  <string name="ignoreTouch_off">Filtrera appar normalt</string>
  <string name="category_all">Alla</string>
  <string name="category_whatsnew">Nyheter</string>
  <string name="category_recentlyupdated">Nyligt uppdaterade</string>
+  <string name="local_repos_title">Lokala FDroid-förråd</string>
+  <string name="local_repos_scanning">Upptäcker lokala FDroid-förråd…</string>
  <string name="status_download">Hämtar
 %2$s / %3$s (%4$d%%) från
 %1$s</string>
@ -99,10 +132,34 @@ Vill du uppdatera dem?</string>
  <string name="status_connecting_to_repo">Ansluter till
 %1$s</string>
  <string name="status_checking_compatibility">Kontrollerar appars kompatibilitet med din enhet…</string>
+  <string name="status_inserting">Sparar programdetaljer (%1$d%%)</string>
  <string name="no_permissions">Inga behörigheter används.</string>
  <string name="permissions_for_long">Behörigheter för version %s</string>
  <string name="showPermissions">Visa behörigheter</string>
+  <string name="showPermissions_on">Visa en lista över behörigheter en app behöver</string>
+  <string name="showPermissions_off">Visa inte behörigheter innan hämtning</string>
  <string name="no_handler_app">Du har inte någon app tillgänglig för hantering av %s</string>
  <string name="compactlayout">Kompakt layout</string>
+  <string name="compactlayout_on">Visa ikoner i en mindre storlek</string>
+  <string name="compactlayout_off">Visa ikoner i normal storlek</string>
  <string name="theme">Tema</string>
+  <string name="unsigned">Osignerad</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Antal appar</string>
+  <string name="repo_description">Beskrivning</string>
+  <string name="repo_last_update">Senaste uppdatering</string>
+  <string name="repo_update">Uppdatera</string>
+  <string name="repo_name">Namn</string>
+  <string name="unsigned_description">Detta betyder att listan av program inte kunde verifieras. Du bör vara försiktig med program som hämtats från osignerade index.</string>
+  <string name="repo_not_yet_updated">Detta förråd har inte använts än. För att se de appar det erbjuder måste du uppdatera det. Då det uppdaterats kommer beskrivning och övriga detaljer finnas tillgängliga här.</string>
+  <string name="repo_delete_details">Vill du ta bort förrådet \"{0}\" , som innehåller {1} appar? Installerade appar tas INTE bort, men du kommer inte längre kunna uppdatera dem genom F-Droid.</string>
+  <string name="unknown">Okänd</string>
+  <string name="repo_confirm_delete_title">Ta bort förråd?</string>
+  <string name="repo_confirm_delete_body">Då ett förråd tas bort kommer inte längre appar därifrån vara tillgängliga via F-Droid. Obs: Alla tidigare installerade appar kommer finnas kvar på din enhet.</string>
+  <string name="repo_disabled_notification">Avaktiverade \"%1$s\". Du kommer behöva återaktivera detta förråd för att kunna installera appar från det.</string>
+  <string name="minsdk_or_later">%s eller senare</string>
+  <string name="up_to_maxsdk">upp till %s</string>
+  <string name="minsdk_up_to_maxsdk">%1$s upp till %2$s</string>
+  <string name="not_on_same_wifi">Din enhet är inte på samma trådlösa nätverk som det lokala förråd du just lagt till! Försök ansluta till detta nätverk: %s</string>
+  <string name="requires_features">Kräver: %1$s</string>
 </resources>
--- a/res/values-tr/array.xml
+++ b/res/values-tr/array.xml
@ -11,9 +11,4 @@
    <item>Koyu</item>
    <item>Açık</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Devre dışı (güvenli değildir)</item>
-    <item>Normal</item>
-    <item>Tümü</item>
-  </string-array>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -7,14 +7,26 @@
  <string name="installIncompatible">Bu paket cihazınızla uyumlu değil gibi görünüyor. Yine de kurmayı denemek istiyor musunuz?</string>
  <string name="installDowngrade">Bu uygulamanın eski bir sürümüne dönmek üzeresiniz. Bu, uygulamanın yanlış çalışmasına ve hatta veri kaybına neden olabilir. Devam etmek istiyor musunuz?</string>
  <string name="version">Sürüm</string>
+  <string name="edit">Düzenle</string>
+  <string name="delete">Sil</string>
+  <string name="enable_nfc_send">NFC göndermesini etkinleştir</string>
  <string name="cache_downloaded">İndirilen uygulamaları önbelleğe kaydet</string>
+  <string name="cache_downloaded_on">İndirilen apk dosyalarını SD kartında tut</string>
+  <string name="cache_downloaded_off">Apk dosyalarını saklama</string>
  <string name="updates">Güncellemeler</string>
  <string name="other">Diğer</string>
  <string name="last_update_check">Son depo analizi: %s</string>
  <string name="never">asla</string>
+  <string name="update_interval">Otomatik güncelleme aralığı</string>
+  <string name="update_interval_zero">Hiçbir otomatik uygulama listesi güncellemesi olmasın</string>
  <string name="automatic_scan_wifi">Sadece WiFi ile</string>
+  <string name="automatic_scan_wifi_on">Uygulama listesini otomatik olarak sadece wifi ile güncelle</string>
+  <string name="automatic_scan_wifi_off">Uygulama listesini daima otomatik olarak güncelle</string>
  <string name="notify">Bildirme</string>
+  <string name="notify_on">Güncellemeler bulunduğunda bunu bildir</string>
+  <string name="notify_off">Güncellemeleri hiçbir zaman bildirme</string>
  <string name="update_history">Güncelleme tarihçesi</string>
+  <string name="update_history_summ">Uygulamaların yeni sayılacağı gün sayısı: %s</string>
  <string name="search_results">Arama Sonuçları</string>
  <string name="app_details">Uygulama Detayları</string>
  <string name="no_such_app">Böyle bir uygulama bulunamadı</string>
@ -39,6 +51,9 @@ Bir depo adresi şuna benzer: https://f-droid.org/repo</string>
  <string name="repo_add_title">Yeni depo ekle</string>
  <string name="repo_add_add">Ekle</string>
  <string name="cancel">İptal</string>
+  <string name="enable">Etkinleştir</string>
+  <string name="add_key">Anahtar ekle</string>
+  <string name="overwrite">Üzerine yaz</string>
  <string name="repo_delete_title">Kaldırılacak depoyu seç</string>
  <string name="repo_update_title">Depoları güncelle</string>
  <string name="tab_noninstalled">Mevcut</string>
@ -49,16 +64,29 @@ Bir depo adresi şuna benzer: https://f-droid.org/repo</string>
  <string name="process_wait_title">Bekleyiniz</string>
  <string name="process_update_msg">Uygulama listesi güncelleniyor…</string>
  <string name="download_server">Uygulama buradan alınıyor:</string>
+  <string name="nfc_is_not_enabled">NFC etkinleştirilmemiştir!</string>
+  <string name="go_to_nfc_settings">NFC ayarlarına git…</string>
+  <string name="bluetooth_activity_not_found">Hiçbir Bluetooth gönderme metodu bulunamadı, birisini seçin!</string>
+  <string name="choose_bt_send">Bluetooth gönderme metodu seç</string>
  <string name="repo_add_url">Depo adresi</string>
+  <string name="repo_add_fingerprint">Parmak izi (seçime dayalı)</string>
+  <string name="repo_exists">Bu depo zaten mevcut!</string>
+  <string name="repo_exists_add_fingerprint">Bu depo zaten ayarlanmıştır, bu yeni anahtar verisi ekleyecektir.</string>
+  <string name="repo_exists_enable">Bu depo zaten ayarlanmıştır, tekrar etkinleştirmek istediğinizi teyit ediniz.</string>
+  <string name="repo_exists_and_enabled">Gelen depo zaten kuruludur ve etkinleştirilmiştir!</string>
+  <string name="repo_delete_to_overwrite">Değişik anahtarla depo eklemeden evvel bu depoyu silmeniz gerekmektedir!</string>
+  <string name="malformed_repo_uri">Yanlış yapılandırılmış depo URI\'si görmezden geliniyor: %s</string>
  <string name="repo_alrt">Kullanılan depoların listesi değişti.
 Güncellemek ister misiniz?</string>
  <string name="menu_update_repo">Depoları güncelle</string>
  <string name="menu_manage">Depoları Yönet</string>
+  <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
  <string name="menu_preferences">Tercihler</string>
  <string name="menu_about">Hakkında</string>
  <string name="menu_search">Arama</string>
  <string name="menu_add_repo">Yeni Depo</string>
  <string name="menu_rem_repo">Depoyu kaldır</string>
+  <string name="menu_scan_repo">Yerel depoları bul</string>
  <string name="menu_launch">Çalıştır</string>
  <string name="menu_share">Paylaş</string>
  <string name="menu_install">Kur</string>
@ -79,17 +107,27 @@ Güncellemek ister misiniz?</string>
  <string name="antinonfreeadlist">Bu uygulama özgür olmayan eklentiler tavsiye eder</string>
  <string name="antinonfreenetlist">Bu uygulama özgür olmayan ağ servisleri tavsiye eder</string>
  <string name="antinonfreedeplist">Bu uygulama özgür olmayan başka uygulamalara bağımlıdır</string>
+  <string name="antiupstreamnonfreelist">Kaynak kod tamamen özgür değildir</string>
  <string name="display">Görüntüleme</string>
  <string name="expert">Uzman</string>
+  <string name="expert_on">Ek veri göster ve ilâve ayarları etkinleştir</string>
+  <string name="expert_off">Tecrübeli kullanıcılar için ilâveleri sakla</string>
  <string name="search_hint">Uygulama ara</string>
-  <string name="db_sync_mode">Veritabanı eşleşme modu</string>
  <string name="appcompatibility">Uygulama uyumu</string>
  <string name="show_incompat_versions">Uyumsuz sürümler</string>
+  <string name="show_incompat_versions_on">Cihazla uyumsuz uygulama sürümlerini göster</string>
+  <string name="show_incompat_versions_off">Cihazla uyumsuz uygulama sürümlerini sakla</string>
  <string name="rooted">Root</string>
+  <string name="rooted_on">Root yetkileri gerektiren uygulamaları gri yapma</string>
+  <string name="rooted_off">Root yetkileri gerektiren uygulamaları gri olarak göster</string>
  <string name="ignoreTouch">Dokunmatik ekranı yok say</string>
+  <string name="ignoreTouch_on">Dokunmatik ekran gerektiren uygulamaları daima dahil et</string>
+  <string name="ignoreTouch_off">Uygulamaları normal olarak süz</string>
  <string name="category_all">Tümü</string>
  <string name="category_whatsnew">Yeni olanlar</string>
  <string name="category_recentlyupdated">Yakın geçmişte güncellenen</string>
+  <string name="local_repos_title">Yerel FDroid depoları</string>
+  <string name="local_repos_scanning">Yerel FDroid depoları keşfediliyor…</string>
  <string name="status_download">İndiriliyor
 %2$s / %3$s (%4$d%%) şuradan
 %1$s</string>
@ -99,10 +137,47 @@ Güncellemek ister misiniz?</string>
  <string name="status_connecting_to_repo">%1$s konumuna
 bağlanılıyor</string>
  <string name="status_checking_compatibility">Uygulamaların cihazınızla uyumluluğu kontrol ediliyor…</string>
+  <string name="status_inserting">Uygulama detayları kaydediliyor (%1$d%%)</string>
  <string name="no_permissions">Hiçbir izin kullanılmıyor.</string>
  <string name="permissions_for_long">%s sürümü için izinler</string>
  <string name="showPermissions">İzinleri göster</string>
+  <string name="showPermissions_on">Uygulamaların gerektirdiği izinlerin listesini göster</string>
+  <string name="showPermissions_off">İndirmeden önce izinleri gösterme</string>
  <string name="no_handler_app">%s unsurunu yönetecek hiçbir mevcut uygulamanız yok</string>
  <string name="compactlayout">Yoğun düzen</string>
+  <string name="compactlayout_on">İkonları daha küçük boyutta görüntüle</string>
+  <string name="compactlayout_off">İkonları normal boyutta görüntüle</string>
  <string name="theme">Tema</string>
+  <string name="unsigned">İmzasız</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Uygulama sayısı</string>
+  <string name="repo_fingerprint">Depo imza anahtarının parmak izi (SHA-256)</string>
+  <string name="repo_description">Betimleme</string>
+  <string name="repo_last_update">Son güncelleme</string>
+  <string name="repo_update">Güncelle</string>
+  <string name="repo_name">İsim</string>
+  <string name="unsigned_description">Bu, uygulama listesinin
+        teyit edilemediği anlamına gelir. İmzasız
+        endekslerden indirilen uygulamaları dikkatle 
+        kullanmanız gerekir.</string>
+  <string name="repo_not_yet_updated">Bu depo henüz kullanılmamıştır.
+        Sunduğu uygulamaları görmek için onu güncellemeniz gerekir.
+
+Güncelleme yapıldığında betimleler ve diğer ayrıntılar burada gösterilecektir.</string>
+  <string name="repo_delete_details">{1} uygulama içeren \"{0}\" deposunu silmek istiyor musunuz? Kurulu uygulamalar KALDIRILMAYACAKTIR, ancak bundan böyle onları F-Droid vasıtasıyla güncellemek mümkün olmayacaktır.</string>
+  <string name="unknown">Bilinmiyor</string>
+  <string name="repo_confirm_delete_title">Depo silinsin mi?</string>
+  <string name="repo_confirm_delete_body">Bir depoyu silmek, ondan indirilen uygulamaların
+        bundan böyle F-Droid vasıtasıyla elde edilemeyeceği anlamına gelir.
+
+Not: Tüm
+        önceden kurulan uygulamalar cihazınızda kalacaktır.</string>
+  <string name="repo_disabled_notification">\"%1$s\" devre dışı bırakıldı.
+
+Ondan uygulama indirmek için bu depoyu tekrar etkinleştirmeniz gerekecektir.</string>
+  <string name="minsdk_or_later">%s ya da sonrası</string>
+  <string name="up_to_maxsdk">%s değerine kadar</string>
+  <string name="minsdk_up_to_maxsdk">%1$s değerinden %2$s değerine kadar</string>
+  <string name="not_on_same_wifi">Cihazınız eklemiş olduğunuz yerel depoyla aynı WiFi\'de değildir. Şu şebekeye katılmayı deneyin: %s</string>
+  <string name="requires_features">Gerektirdiği: %1$s</string>
 </resources>
--- a/res/values-ug/array.xml
+++ b/res/values-ug/array.xml
@ -11,9 +11,4 @@
    <item>قاراڭغۇ</item>
    <item>يورۇق</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>تاقاق (بىخەتەر ئەمەس)</item>
-    <item>نورمال</item>
-    <item>تولۇق</item>
-  </string-array>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@ -29,7 +29,7 @@

 خەزىنە ئەپلەرنىڭ تارقىتىلىش مەنبەسى بولۇپ، مەنبە قوشۇشتا، تىزىملىك توپچىنى بېسىپ، ئاندىن URLنى كىرگۈزۈڭ.

-خەزىنە ئادرېسى بۇنىڭغا ئوخشاش بولىدۇ: http://f-droid.org/repo</string>
+خەزىنە ئادرېسى بۇنىڭغا ئوخشاش بولىدۇ: https://f-droid.org/repo</string>
  <string name="inst">ئورنىتىلغان</string>
  <string name="not_inst">ئورنىتىلمىغان</string>
  <string name="added_on">%s دا قوشۇلغان</string>
@ -82,7 +82,6 @@
  <string name="display">كۆرسەت</string>
  <string name="expert">ئالىي</string>
  <string name="search_hint">ئەپ ئىزدە</string>
-  <string name="db_sync_mode">ساندان قەدەمداش ھالەت</string>
  <string name="appcompatibility">ئەپ ماسلىشىشچانلىقى</string>
  <string name="show_incompat_versions">ماسلاشمايدىغان نەشرىلىرى</string>
  <string name="rooted">Root</string>
--- a/res/values-uk/array.xml
+++ b/res/values-uk/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>Ніколи (небезпечно)</item>
-    <item>Типово</item>
-    <item>Повністю</item>
-  </string-array>
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@ -53,7 +53,6 @@
  <string name="download_cancelled">Звантаження скасовано</string>
  <string name="expert">Експерт</string>
  <string name="search_hint">Пошук програм</string>
-  <string name="db_sync_mode">Синхронізація БД</string>
  <string name="appcompatibility">Сумісність</string>
  <string name="rooted">Суперкористувач</string>
  <string name="ignoreTouch">Ігнорувати тачскрін</string>
--- a/res/values-zh-rCN/array.xml
+++ b/res/values-zh-rCN/array.xml
@ -11,9 +11,4 @@
    <item>Dark</item>
    <item>Light</item>
  </string-array>
-  <string-array name="dbSyncModeNames">
-    <item>关闭(存在安全风险)</item>
-    <item>正常</item>
-    <item>完整的</item>
-  </string-array>
 </resources>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@ -53,7 +53,6 @@
  <string name="download_cancelled">下载取消</string>
  <string name="expert">高级</string>
  <string name="search_hint">搜索应用</string>
-  <string name="db_sync_mode">数据同步模式</string>
  <string name="appcompatibility">应用兼容性</string>
  <string name="rooted">Root</string>
  <string name="ignoreTouch">忽略需要触屏的应用</string>
--- a/res/values/array.xml
+++ b/res/values/array.xml
@ -12,10 +12,4 @@
 		<item>Dark</item>
 		<item>Light</item>
 	</string-array>
-
-	<string-array name="dbSyncModeNames">
-		<item>Off (unsafe)</item>
-		<item>Normal</item>
-		<item>Full</item>
-	</string-array>
 </resources>
--- a/res/values/default_repo.xml
+++ b/res/values/default_repo.xml
@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_repo_name" formatted="false">F-Droid</string>
+    <integer name="default_repo_count">2</integer>
+
+    <string name="default_repo_name1" formatted="false">F-Droid</string>
+    <integer name="default_repo_inuse1">1</integer>
+    <integer name="default_repo_priority1">10</integer>
+    <string name="default_repo_address1" formatted="false">https://f-droid.org/repo</string>
+    <string name="default_repo_description1" formatted="false">The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time.</string>
+    <string name="default_repo_pubkey1" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
+
    <string name="default_repo_name2" formatted="false">F-Droid Archive</string>
-    <string name="default_repo_address" formatted="false">https://f-droid.org/repo</string>
+    <integer name="default_repo_inuse2">0</integer>
+    <integer name="default_repo_priority2">20</integer>
    <string name="default_repo_address2" formatted="false">https://f-droid.org/archive</string>
-    <string name="default_repo_description" formatted="false">The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time.</string>
    <string name="default_repo_description2" formatted="false">The archive repository of the F-Droid client. This contains older versions of applications from the main repository.</string>
-    <string name="default_repo_pubkey" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
+    <string name="default_repo_pubkey2" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
 </resources>
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<!--48dp with 8dp padding, 48+16=64-->
-    <dimen name="applist_icon_normal_size">64dp</dimen>
-	<!--32dp with 8dp padding, 32+16=48-->
-    <dimen name="applist_icon_compact_size">48dp</dimen>
+    <dimen name="applist_icon_normal_size">48dp</dimen>
+    <dimen name="applist_icon_compact_size">32dp</dimen>
 </resources>
--- a/res/values/no_trans.xml
+++ b/res/values/no_trans.xml
@ -2,7 +2,7 @@
 <resources>

 	<string name="app_name">F-Droid</string>
-	<string name="version_name">0.57-test</string>
+	<string name="version_name">0.64-test</string>

 	<string name="about_sitec">https://f-droid.org</string>
 	<string name="about_mailc">team@f-droid.org</string>
@ -22,12 +22,6 @@
 		<item>24</item>
 	</string-array>

-	<string-array name="dbSyncModeValues">
-		<item>off</item>
-		<item>normal</item>
-		<item>full</item>
-	</string-array>
-
 	<string-array name="themeValues">
 		<item>dark</item>
 		<item>light</item>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -9,6 +9,7 @@
 	<string name="version">Version</string>
 	<string name="edit">Edit</string>
 	<string name="delete">Delete</string>
+	<string name="enable_nfc_send">Enable NFC Send…</string>
 	<string name="cache_downloaded">App cache</string>
 	<string name="cache_downloaded_on">Keep downloaded apk files on SD card</string>
 	<string name="cache_downloaded_off">Do not keep any apk files</string>
@ -73,6 +74,11 @@
 	<string name="process_wait_title">Please Wait</string>
 	<string name="process_update_msg">Updating application list…</string>
 	<string name="download_server">Getting application from</string>
+	<string name="nfc_is_not_enabled">NFC is not enabled!</string>
+	<string name="go_to_nfc_settings">Go to NFC Settings…</string>
+	<string name="bluetooth_activity_not_found">No Bluetooth send method found, choose one!</string>
+	<string name="choose_bt_send">Choose Bluetooth send method</string>
+	<string name="send_via_bluetooth">Send via Bluetooth</string>

 	<string name="repo_add_url">Repository address</string>
 	<string name="repo_add_fingerprint">Fingerprint (optional)</string>
@ -81,6 +87,7 @@
 	<string name="repo_exists_enable">This repo is already setup, confirm that you want to re-enable it.</string>
 	<string name="repo_exists_and_enabled">The incoming repo is already setup and enabled!</string>
 	<string name="repo_delete_to_overwrite">You must first delete this repo before you can add one with a different key!</string>
+	<string name="malformed_repo_uri">Ignoring malformed repo URI: %s</string>

 	<string name="repo_alrt">The list of used repositories has
 		changed.\nDo you
@ -88,11 +95,13 @@

 	<string name="menu_update_repo">Update Repos</string>
 	<string name="menu_manage">Repositories</string>
+	<string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
 	<string name="menu_preferences">Preferences</string>
 	<string name="menu_about">About</string>
 	<string name="menu_search">Search</string>
 	<string name="menu_add_repo">New Repository</string>
 	<string name="menu_rem_repo">Remove Repository</string>
+	<string name="menu_scan_repo">Find Local Repos</string>

 	<string name="menu_launch">Run</string>
 	<string name="menu_share">Share</string>
@ -126,8 +135,6 @@

 	<string name="search_hint">Search applications</string>

-	<string name="db_sync_mode">Database sync mode</string>
-
 	<string name="appcompatibility">Application compatibility</string>
 	<string name="show_incompat_versions">Incompatible versions</string>
 	<string name="show_incompat_versions_on">Show app versions incompatible with the device</string>
@ -143,6 +150,9 @@
 	<string name="category_whatsnew">What\'s New</string>
 	<string name="category_recentlyupdated">Recently Updated</string>

+	<string name="local_repos_title">Local FDroid Repos</string>
+	<string name="local_repos_scanning">Discovering local FDroid repos&#8230;</string>
+
 	<!--
 	status_download takes four parameters:
 	  - Repository (url)
@ -154,6 +164,7 @@
 	<string name="status_processing_xml">Processing application\n%2$d of %3$d from\n%1$s</string>
 	<string name="status_connecting_to_repo">Connecting to\n%1$s</string>
 	<string name="status_checking_compatibility">Checking apps compatibility with your device…</string>
+    <string name="status_inserting">Saving application details (%1$d%%)</string>
 	<string name="no_permissions">No permissions are used.</string>
 	<string name="permissions_for_long">Permissions for version %s</string>
 	<string name="showPermissions">Show permissions</string>
@ -167,7 +178,7 @@
    <string name="unsigned">Unsigned</string>
    <string name="repo_url">URL</string>
    <string name="repo_num_apps">Number of apps</string>
-    <string name="repo_signature">Signature</string>
+    <string name="repo_fingerprint">Fingerprint of Repo Signing Key (SHA-256)</string>
    <string name="repo_description">Description</string>
    <string name="repo_last_update">Last update</string>
    <string name="repo_update">Update</string>
@ -194,6 +205,32 @@
    <string name="repo_disabled_notification">Disabled "%1$s".\n\nYou will
        need to re-enable this repository to install apps from it.
    </string>
-    <string name="minsdk_or_later">Android %s or later</string>
+    <string name="minsdk_or_later">%s or later</string>
+    <string name="up_to_maxsdk">up to %s</string>
+    <string name="minsdk_up_to_maxsdk">%1$s up to %2$s</string>
+    <string name="not_on_same_wifi">Your device is not on the same WiFi as the local repo you just added! Try joining this network: %s</string>
+    <string name="requires_features">Requires: %1$s</string>
+
+    <string name="discovered_repo_name">Discovered Repo Name</string>
+    <string name="repo_address">Repo Address</string>
+
+    <string name="app_icon">App icon</string>
+    <string name="repo_icon">Repo icon</string>
+
+    <string name="Children">Children</string>
+    <string name="Development">Development</string>
+    <string name="Games">Games</string>
+    <string name="Internet">Internet</string>
+    <string name="Mathematics">Mathematics</string>
+    <string name="Multimedia">Multimedia</string>
+    <string name="Navigation">Navigation</string>
+    <string name="News">News</string>
+    <string name="Office">Office</string>
+    <string name="Phone_SMS">Phone &amp; SMS</string>
+    <string name="Reading">Reading</string>
+    <string name="Science_Education">Science &amp; Education</string>
+    <string name="Security">Security</string>
+    <string name="System">System</string>
+    <string name="Wallpaper">Wallpaper</string>

 </resources>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Subproject commit ce84a19e753bbcc3304525f763edb7d7f3b62429`
				`@ -0,0 +1 @@`
				`Subproject commit a705441ac53b9e1aba9f00f3f59aab81da6fbc9e`
				`@ -1 +0,0 @@`
				`Subproject commit 1c2a91e464b49874068a8bf2a6e39d39aae9208a`
				`@ -0,0 +1 @@`
				`Subproject commit ee50fd1ce77d866a89374a5ff0886be6e179feb2`