diff --git a/F-Droid/res/values-en-rGB/strings.xml b/F-Droid/res/values-en-rGB/strings.xml
index 144980a0f..08e7d92fb 100644
--- a/F-Droid/res/values-en-rGB/strings.xml
+++ b/F-Droid/res/values-en-rGB/strings.xml
@@ -1,41 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="enable_nfc_send">Enable NFC Send…</string>
-  <string name="root_installer">Install using root access</string>
-  <string name="root_installer_on">Request root access to install, update, and remove packages</string>
-  <string name="system_installer_on">Use system permissions to install, update, and remove packages</string>
-  <string name="local_repo_bonjour">Broadcast Local Repo</string>
-  <string name="local_repo_bonjour_on">Advertise your local repo using Bonjour (mDNS)</string>
-  <string name="local_repo_https_off">Use insecure HTTP:// connection for local repo</string>
+  <string name="installIncompatible">It seems like this package is not compatible with your device. Attempt installation anyway?</string>
+  <string name="installDowngrade">You are trying to downgrade this application. Doing so might make it malfunction and even lose your data. Do you want to try and downgrade it anyway?</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>
+  <string name="last_update_check">Last repo-scan: %s</string>
+  <string name="update_interval">Automatic update-interval</string>
+  <string name="update_interval_zero">No automatic app-list-updates</string>
+  <string name="automatic_scan_wifi">Only on Wi-Fi</string>
+  <string name="automatic_scan_wifi_on">Update app-lists automatically only on Wi-Fi</string>
+  <string name="automatic_scan_wifi_off">Always update app-lists automatically</string>
+  <string name="notify_on">Notify me of available updates</string>
+  <string name="notify_off">Do not notify me of any updates</string>
+  <string name="root_installer">Install using root-access</string>
+  <string name="root_installer_on">Request root-access to install, update and remove packages</string>
+  <string name="root_installer_off">Do not request root-access to install, update and remove packages</string>
+  <string name="system_installer">Install using system-permissions</string>
+  <string name="system_installer_on">Use system-permissions to install, update and remove packages</string>
+  <string name="system_installer_off">Do not use system-permissions to install, update and remove packages</string>
+  <string name="local_repo_bonjour">Broadcast you local repo</string>
+  <string name="local_repo_bonjour_on">Advertise your local repo with the use of Bonjour (mDNS)</string>
+  <string name="local_repo_bonjour_off">Do not advertise your local repo.</string>
+  <string name="local_repo_name">Name of your local repo</string>
+  <string name="local_repo_name_summary">The advertised title of your local repo: %s</string>
+  <string name="local_repo_https">Use private connection</string>
+  <string name="local_repo_https_on">Use encrypted HTTPS:// -connection for local repo</string>
+  <string name="local_repo_https_off">Use insecure HTTP:// -connection for local repo</string>
+  <string name="search_results">Search-results</string>
+  <string name="app_details">App-details</string>
   <string name="about_site">Website:</string>
   <string name="about_mail">E-Mail:</string>
+  <string name="about_version">Version:</string>
   <string name="enable">Enable</string>
   <string name="add_key">Add Key</string>
   <string name="overwrite">Overwrite</string>
+  <string name="fdroid_updates_available">F-Droid-updates available</string>
+  <string name="process_wait_title">Please wait</string>
+  <string name="process_update_msg">Updating application-list…</string>
   <string name="nfc_is_not_enabled">NFC is not enabled!</string>
-  <string name="bluetooth_activity_not_found">Δεν βρέθηκε καμία μέθοδος αποστολής μέσω Bluetoot. Επιλέξτε μία.</string>
-  <string name="choose_bt_send">Choose Bluetooth send method</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="malformed_repo_uri">Ignoring malformed repo URI: %s</string>
+  <string name="repo_add_url">Repository-address</string>
+  <string name="repo_exists">This repo has already been added!</string>
+  <string name="repo_exists_add_fingerprint">This repo is already set up, this will add new key information.</string>
+  <string name="repo_exists_enable">This repo has already been set up, confirm that you want to re-enable it.</string>
+  <string name="repo_exists_and_enabled">This repo is already set up, confirm that you want to re-enable it.</string>
+  <string name="malformed_repo_uri">Ignoring malformed repo-URI: %s</string>
+  <string name="menu_update_repo">Update repos</string>
   <string name="menu_send_apk_bt">Bluetooth FDroid.apk…</string>
-  <string name="menu_scan_repo">Find Local Repos</string>
-  <string name="local_repos_title">Local F-Droid Repos</string>
-  <string name="local_repos_scanning">Discovering local F-Droid repos...</string>
+  <string name="menu_search">Search</string>
+  <string name="menu_add_repo">New repository</string>
+  <string name="menu_scan_repo">Find local repos</string>
+  <string name="menu_ignore_all">Ignore all updates</string>
+  <string name="menu_ignore_this">Ignore this update</string>
+  <string name="menu_source">Source-code</string>
+  <string name="antiadslist">This app contains advertising</string>
+  <string name="antinonfreenetlist">This app promotes non-free network-services</string>
+  <string name="antiupstreamnonfreelist">The upstream source code is not entirely free as in freedom</string>
+  <string name="appcompatibility">Application-compatibility</string>
+  <string name="show_incompat_versions_on">Show app-versions incompatible with your device</string>
+  <string name="show_incompat_versions_off">Hide app-versions incompatible with your device</string>
+  <string name="rooted_on">Do not grey out apps requiring root-privileges</string>
+  <string name="rooted_off">Grey out apps requiring root-privileges</string>
+  <string name="ignoreTouch">Ignore touchscreen</string>
+  <string name="category_whatsnew">What\'s new</string>
+  <string name="category_recentlyupdated">Recently updated</string>
+  <string name="local_repo">Local repo</string>
+  <string name="local_repos_title">Local F-Droid -repos</string>
+  <string name="local_repos_scanning">Discovering local F-Droid -repos...</string>
+  <string name="local_repo_running">App-circulation can commence</string>
+  <string name="waiting_for_ipaddress">waiting for an IP-address…</string>
+  <string name="setup_repo">Set up local repo</string>
+  <string name="touch_to_configure_local_repo">Touch to view details and allow others to circulate the apps you have.</string>
+  <string name="touch_to_turn_on_local_repo">Touch to turn on your local repo.</string>
+  <string name="touch_to_turn_off_local_repo">Touch to turn off your local repo.</string>
   <string name="updating">Updating…</string>
+  <string name="update_repo">Update repo</string>
   <string name="deleting_repo">Deleting current repo…</string>
-  <string name="failed_to_create_index">Failed to create the repo index!</string>
+  <string name="adding_apks_format">Adding %s to repo…</string>
+  <string name="writing_index_jar">Writing signed index-file (index.jar)…</string>
+  <string name="failed_to_create_index">Failed to create the repo-index!</string>
+  <string name="linking_apks">Linking APKs into the repo…</string>
+  <string name="copying_icons">Copying app-icons into the repo…</string>
+  <string name="updated_local_repo">Finished updating local repo</string>
   <string name="no_applications_found">No applications found</string>
+  <string name="icon">icon</string>
   <string name="fingerprint">Fingerprint:</string>
-  <string name="sharing_uri">Sharing URL:</string>
-  <string name="enable_wifi">Enable WiFi</string>
-  <string name="enabling_wifi">Enabling WiFi…</string>
-  <string name="qr_code">QR Code</string>
+  <string name="wifi_network">Wi-Fi network:</string>
+  <string name="sharing_uri">Sharing-URL:</string>
+  <string name="enable_wifi">Enable Wi-Fi</string>
+  <string name="enabling_wifi">Enabling Wi-Fi…</string>
+  <string name="same_wifi_instructions">To connect to other people\'s devices, make sure both devices are on the same Wi-Fi network.  Then either type the URL above into F-Droid, or scan this QR-code:</string>
+  <string name="qr_code">QR-code</string>
   <string name="next">Next</string>
   <string name="skip">Skip</string>
-  <string name="qr_wizard_download_instructions">Scan this QR Code to connect to the website for getting started.</string>
-  <string name="enable_proxy_title">Enable HTTP Proxy</string>
-  <string name="enable_proxy_summary">Configure HTTP Proxy for all network requests</string>
-  <string name="status_inserting">Saving application details (%1$d%%)</string>
+  <string name="qr_content_description">QR-code of repo-URL</string>
+  <string name="qr_wizard_wifi_network_instructions">Scan QR-code to connect to the same Wi-Fi network as this device.</string>
+  <string name="qr_wizard_download_instructions">Scan this QR-code to connect to the website for getting started.</string>
+  <string name="send_fdroid_via_wifi">Send F-Droid via Wi-Fi...</string>
+  <string name="proxy">Proxy</string>
+  <string name="enable_proxy_title">Enable HTTP-proxy</string>
+  <string name="enable_proxy_summary">Configure HTTP-proxy for all network-requests</string>
+  <string name="proxy_host">Proxy-host</string>
+  <string name="proxy_host_summary">Configure your proxy\'s hostname (e.g. 127.0.0.1)</string>
+  <string name="proxy_port">Proxy-port</string>
+  <string name="proxy_port_summary">Configure your proxy\'s port number (e.g. 8118)</string>
+  <string name="status_checking_compatibility">Checking whether apps are compatible with your device...</string>
+  <string name="status_inserting">Saving application-details (%1$d%%)</string>
+  <string name="repos_unchanged">None of the repositories have any package-updates</string>
+  <string name="all_other_repos_fine">None of the other repos returned errors.</string>
+  <string name="global_error_updating_repos">Error during update:</string>
+  <string name="compactlayout">Compact layout</string>
+  <string name="compactlayout_on">Smaller icons</string>
+  <string name="compactlayout_off">Regular sized icons</string>
+  <string name="unverified">Unverified</string>
+  <string name="repo_num_apps">Number of apps</string>
+  <string name="repo_fingerprint">Fingerprint of Repo-signing-key (SHA-256)</string>
   <string name="repo_not_yet_updated">This repository has not been used yet.
         In order to view the apps it provides, you will need to update
         it.
@@ -46,31 +130,56 @@ Once updated, the description and other details will
         repository, which has {1} apps in it? Any installed apps will NOT be
         removed, but you will not be able to update them through F-Droid any
         more.</string>
+  <string name="repo_confirm_delete_title">Delete repository?</string>
   <string name="repo_confirm_delete_body">Deleting a repository means
         apps from it will no longer be available from F-Droid.
 
 Note: All
         previously installed apps will remain on your device.</string>
-  <string name="repo_disabled_notification">Деактиврано \"%1$s\".
+  <string name="repo_disabled_notification">Disabled \"%1$s\".
 
-Трябва да
-        активирате това хранилище отново, за да инсталирате приложения от него.</string>
+You will
+        need to re-enable this repository to install apps from it.</string>
   <string name="up_to_maxsdk">up to %s</string>
-  <string name="requires_features">Προαπαιτούμενο: %1$s</string>
-  <string name="app_icon">App icon</string>
+  <string name="not_on_same_wifi">Your device is not on the same Wi-Fi network as the local repo you just added! Try joining this network instead: %s</string>
+  <string name="requires_features">Requires: %1$s</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"/>
   <string name="Reading">Reading</string>
   <string name="Science_Education"/>
   <string name="Security">Security</string>
   <string name="System">System</string>
   <string name="Wallpaper">Wallpaper</string>
-  <string name="requesting_root_access_title">Root access</string>
-  <string name="root_access_denied_title">Root access denied</string>
+  <string name="requesting_root_access_title">Root-access</string>
+  <string name="requesting_root_access_body">Requesting root-access…</string>
+  <string name="root_access_denied_title">Root-access denied</string>
+  <string name="root_access_denied_body">Either your Android-device is not rooted or you have denied root-access to F-Droid.</string>
   <string name="update_all">Update all</string>
+  <string name="installer_error_title">(De-)installation-error</string>
+  <string name="installer_error_body">The (de-)installation failed. If you are using root-access, try disabling this setting!</string>
+  <string name="system_permission_denied_title">System-permissions denied</string>
+  <string name="system_permission_denied_body">This option is only available when F-Droid is installed as a system-app.</string>
+  <string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. The client makes it easy to browse, install, and keep track of updates on your device.</string>
+  <string name="swap_nfc_description">If you and your friend hold the back of your phones together.</string>
+  <string name="swap_join_same_wifi">Join the same Wi-Fi-network as your friend</string>
   <string name="swap_use_bluetooth">Use Bluetooth instead</string>
+  <string name="swap_wifi_help">Learn more about Wi-Fi</string>
+  <string name="menu_swap">Circulate apps</string>
+  <string name="swap">Circulate apps</string>
+  <string name="swap_no_wifi_network">No network yet</string>
+  <string name="swap_view_available_networks">(Tap to open available networks)</string>
+  <string name="swap_wifi_qr_not_working">It\'s not working</string>
+  <string name="open_qr_code_scanner">Open QR-code-scanner</string>
+  <string name="swap_welcome">Welcome to F-Droid!</string>
+  <string name="swap_confirm_connect">Do you want to acquire apps from %1$s now?</string>
 </resources>
diff --git a/F-Droid/res/values-fr/array.xml b/F-Droid/res/values-fr/array.xml
index e2633cf7a..00c95d4ec 100644
--- a/F-Droid/res/values-fr/array.xml
+++ b/F-Droid/res/values-fr/array.xml
@@ -10,6 +10,6 @@
   <string-array name="themeNames">
     <item>Sombre</item>
     <item>Clair</item>
-    <item>Clair (avec barre d\'action sombre)</item>
+    <item>Clair (avec barre d'action sombre)</item>
   </string-array>
 </resources>
diff --git a/F-Droid/res/values-it/array.xml b/F-Droid/res/values-it/array.xml
index 12c839632..473d49f7b 100644
--- a/F-Droid/res/values-it/array.xml
+++ b/F-Droid/res/values-it/array.xml
@@ -10,6 +10,6 @@
   <string-array name="themeNames">
     <item>Scuro</item>
     <item>Chiaro</item>
-    <item>Light (with dark action bar)</item>
+    <item>Light (con la action bar scura)</item>
   </string-array>
 </resources>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index b41ca6e7f..c20b7aacf 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -27,6 +27,20 @@
   <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="root_installer">Installa con permessi di root</string>
+  <string name="root_installer_on">Richiedi il root per installare,aggiornare e rimuovere i pacchetti</string>
+  <string name="root_installer_off">Non richiedere i permessi root per installare, aggiornare e rimuovere i pacchetti</string>
+  <string name="system_installer">Installa usando i permessi di sistema</string>
+  <string name="system_installer_on">Usa i permessi di sistema per installare,aggiornare e rimuovere i pacchetti</string>
+  <string name="system_installer_off">Non usare i permessi di sistema per installare,aggiornare e rimuovere i pacchetti</string>
+  <string name="local_repo_bonjour">Condividi la Repo locale</string>
+  <string name="local_repo_bonjour_on">Lancia la tua repo usando Bonjour (mDNS)</string>
+  <string name="local_repo_bonjour_off">Non pubblicare la tua repo.</string>
+  <string name="local_repo_name">Nome della tua Repo Locale</string>
+  <string name="local_repo_name_summary">Il testo pubblico della tua repo: %s</string>
+  <string name="local_repo_https">Usa una Connessione Privata</string>
+  <string name="local_repo_https_on">Usa la connessione HTTPS:// criptata per le repo locali</string>
+  <string name="local_repo_https_off">Usa la connessione HTTP:// insicura per le repo locali</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>
@@ -68,6 +82,7 @@ Un indirizzo URL di esempio è: https://f-droid.org/repo</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="send_via_bluetooth">Invia via 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>
@@ -126,8 +141,46 @@ Vuoi aggiornarlo?</string>
   <string name="category_all">Tutte</string>
   <string name="category_whatsnew">Novità</string>
   <string name="category_recentlyupdated">Aggiornate di Recente</string>
+  <string name="local_repo">Repo Locale</string>
   <string name="local_repos_title">Repo FDroid Locali</string>
   <string name="local_repos_scanning">Rilevazione repo FDroid locali…</string>
+  <string name="local_repo_running">F-Droid è pronto per inviare con swap</string>
+  <string name="waiting_for_ipaddress">attendo un indirizzo IP...</string>
+  <string name="setup_repo">Prepara una Repo locale</string>
+  <string name="touch_to_configure_local_repo">Tocca per vedere i dettagli e permettere agli altri di ricevere le tue app.</string>
+  <string name="touch_to_turn_on_local_repo">Tocca per abilitare la tua repo locale.</string>
+  <string name="touch_to_turn_off_local_repo">Tocca per chiudere la tua repo locale.</string>
+  <string name="updating">Aggiorno...</string>
+  <string name="update_repo">Aggiorna Repo</string>
+  <string name="deleting_repo">Cancello la repo corrente...</string>
+  <string name="adding_apks_format">Aggiungo %s alla repo...</string>
+  <string name="writing_index_jar">Scrivo il file di indice fimrato (index.jar)...</string>
+  <string name="failed_to_create_index">Creazione dell\'indice della repo fallita!</string>
+  <string name="linking_apks">Collego gli APK nella repo...</string>
+  <string name="copying_icons">Copio le icone delle app nella repo...</string>
+  <string name="updated_local_repo">Aggiornamento della repo locale completato</string>
+  <string name="no_applications_found">Nessuna applicazione trovata</string>
+  <string name="icon">icona</string>
+  <string name="fingerprint">Impronta:</string>
+  <string name="wifi_network">Rete WiFi:</string>
+  <string name="sharing_uri">URL di condivisione:</string>
+  <string name="enable_wifi">Abilita WiFi</string>
+  <string name="enabling_wifi">Abilito il WiFi...</string>
+  <string name="same_wifi_instructions">Per connetterti a dispositivi di altre persone, assicurati che entrambi i dispositivi siano sulla stessa rete WiFi. Allora o digita l\'URL sopra in F-Droid, o scansiona il codice QR:</string>
+  <string name="qr_code">Codice QR</string>
+  <string name="next">Prossimo</string>
+  <string name="skip">Salta</string>
+  <string name="qr_content_description">Codice QR dell\' URL della repo</string>
+  <string name="qr_wizard_wifi_network_instructions">Scannerizza questo codice QR per connetterti alla stessa wifi di questo dispositivo.</string>
+  <string name="qr_wizard_download_instructions">Scansiona questo codice QR per connetterti al sito web dove cominciare.</string>
+  <string name="send_fdroid_via_wifi">Invio FDroid via WiFi...</string>
+  <string name="proxy">Proxy</string>
+  <string name="enable_proxy_title">Abilita Proxy HTTP</string>
+  <string name="enable_proxy_summary">Configura il proxy HTTP per tutte le richieste di rete</string>
+  <string name="proxy_host">Host Proxy</string>
+  <string name="proxy_host_summary">Configura l\'hostname del tuo proxy (es. 127.0.0.1)</string>
+  <string name="proxy_port">Porta Proxy</string>
+  <string name="proxy_port_summary">Configura la porta del tuo proxy (es. 8118)</string>
   <string name="status_download">Scaricamento
 %2$s / %3$s (%4$d%%) da
 %1$s</string>
@@ -138,6 +191,9 @@ Vuoi aggiornarlo?</string>
 %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="repos_unchanged">Repository aggiornate</string>
+  <string name="all_other_repos_fine">Tutte le altre repo non hanno generato errori.</string>
+  <string name="global_error_updating_repos">Errore nell\'aggiornamento:</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>
@@ -149,6 +205,7 @@ Vuoi aggiornarlo?</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="unverified">Non verificato</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>
@@ -173,4 +230,42 @@ Nota: Tutte le applicazioni installate precedentemente rimarranno sul dispositiv
   <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>
+  <string name="app_icon">Icona App</string>
+  <string name="repo_icon">Icona della Repo</string>
+  <string name="Children">Bambini</string>
+  <string name="Development">Sviluppo</string>
+  <string name="Games">Giochi</string>
+  <string name="Internet">Internet</string>
+  <string name="Mathematics">Matematica</string>
+  <string name="Multimedia">Multimedia</string>
+  <string name="Navigation">Navigazione</string>
+  <string name="News">Novità</string>
+  <string name="Office">Ufficio</string>
+  <string name="Phone_SMS">Telefono e SMS</string>
+  <string name="Reading">Lettura</string>
+  <string name="Science_Education"/>
+  <string name="Security">Sicurezza</string>
+  <string name="System">Sistema</string>
+  <string name="Wallpaper">Wallpaper</string>
+  <string name="requesting_root_access_title">Accesso Root</string>
+  <string name="requesting_root_access_body">Richiedo i permessi root...</string>
+  <string name="root_access_denied_title">Accesso Root negato</string>
+  <string name="root_access_denied_body">Il tuo telefono non ha i permessi di root oppure li hai negati ad F-Droid.</string>
+  <string name="update_all">Aggiorna tutto</string>
+  <string name="installer_error_title">Errore di (Dis-)Installazione</string>
+  <string name="installer_error_body">La (Dis-)Installazione è fallita. Se usi i permessi di root, prova a cambiare le impostazioni!</string>
+  <string name="system_permission_denied_title">Permessi di sistema negati</string>
+  <string name="system_permission_denied_body">Questa opzione è disponibile solo quando F-Droid è installato come app di sistema.</string>
+  <string name="app_description">F-Droid è un catalogo installabile di applicazioni FOSS (Free and Open Source Software) per Android. Il client rende semplice cercare, installare e tenere traccia deglii aggiornamenti sul tuo dispositivo.</string>
+  <string name="swap_join_same_wifi">Collegati alla stessa WiFi del tuo amico</string>
+  <string name="swap_use_bluetooth">Usa il Bluetooth invece</string>
+  <string name="swap_wifi_help">Maggiori informazioni sulla WiFi</string>
+  <string name="menu_swap">Invia apps</string>
+  <string name="swap">Invia apps</string>
+  <string name="swap_no_wifi_network">Nessuna rete disponibile</string>
+  <string name="swap_view_available_networks">(Tocca per mostrare le reti disponibili)</string>
+  <string name="swap_wifi_qr_not_working">Non funziona</string>
+  <string name="open_qr_code_scanner">Apri lo scanner per codici QR</string>
+  <string name="swap_welcome">Benvenuto in F-Droid!</string>
+  <string name="swap_confirm_connect">Vuoi prendere le app da %1$s?</string>
 </resources>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index c4b3561f3..b56dde99c 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -15,7 +15,7 @@
   <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="last_update_check">Forrige oppdatering av pakkebrønn: %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>
@@ -25,10 +25,22 @@
   <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 historikk</string>
   <string name="update_history_summ">Dager nytt innhold skal anses som ferskt: %s</string>
+  <string name="root_installer">Installer ved bruk av root-tilgang</string>
   <string name="root_installer_on">Spør etter root tilgang for å installere, oppdatere, og fjerne applikasjoner.</string>
+  <string name="root_installer_off">Ikke etterspørr root-tilgang for installasjon, oppdatering og fjerning av pakker</string>
+  <string name="system_installer">Installer ved bruk av system-tilgang</string>
   <string name="system_installer_on">Bruk system rettigheter til å installere, oppdatere, og fjerne applikasjoner.</string>
-  <string name="local_repo_bonjour">Kringkast Lokal Repo</string>
+  <string name="system_installer_off">Ikke bruk system-rettigheter for installasjon, oppdatering og fjerning av pakker</string>
+  <string name="local_repo_bonjour">Kringkast lokal pakkebrønn</string>
+  <string name="local_repo_bonjour_on">Reklamer for din lokale pakkebrønn ved bruk av Bonjour (mDNS)</string>
+  <string name="local_repo_bonjour_off">Ikke offentliggjør din private pakkebrønn.</string>
+  <string name="local_repo_name">Navn på lokal pakkebrønn</string>
+  <string name="local_repo_name_summary">Offentliggjort tittel for din lokale pakkebrønn: %s</string>
+  <string name="local_repo_https">Bruk privat tilkobling</string>
+  <string name="local_repo_https_on">Bruk sikret HTTP:// -tilkobling for lokal pakkebrønn</string>
+  <string name="local_repo_https_off">Bruk usikret HTTP:// -tilkobling for lokal pakkebrønn</string>
   <string name="search_results">Søkeresultater</string>
   <string name="app_details">Programdetaljer</string>
   <string name="no_such_app">Program ikke funnet</string>
@@ -39,20 +51,20 @@ Lisensiert GNU GPLv3.</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Versjon:</string>
   <string name="about_website">Nettside</string>
-  <string name="no_repo">Du har ikke konfigurert noen register! Et register er en kilde til applikasjoner. For å legge til et register, trykk på MENY-knappen nå, og skriv inn adresse. En registeradresse ser ut som dette: https://f-droid.org/repo</string>
+  <string name="no_repo">Du har ikke konfigurert noen pakkebrønner! En pakkebrønn er en kilde til applikasjoner. For å legge til en pakkebrønn, trykk på MENY-knappen nå, og skriv inn adresse. En pakkebrønn-adresse ser slik ut: https://f-droid.org/repo</string>
   <string name="inst">Installert</string>
   <string name="not_inst">Ikke installert</string>
   <string name="added_on">Lagt til %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ja</string>
   <string name="no">Nei</string>
-  <string name="repo_add_title">Legg til nytt register</string>
+  <string name="repo_add_title">Legg til ny pakkebrønn</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_delete_title">Velg pakkebrønnen du vil fjerne</string>
   <string name="repo_update_title">Oppdater registerne</string>
   <string name="tab_noninstalled">Tilgjengelig</string>
   <string name="tab_updates">Oppdateringer</string>
@@ -66,9 +78,10 @@ Lisensiert GNU GPLv3.</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="send_via_bluetooth">Send via Blåtann</string>
+  <string name="repo_add_url">Pakkebrønnsadresse</string>
   <string name="repo_add_fingerprint">Fingeravtrykk (valgfritt)</string>
-  <string name="repo_exists">Dette registret eksisterer allerede!</string>
+  <string name="repo_exists">Denne pakkebrønnen er allerede lagt til!</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>
@@ -108,8 +121,12 @@ Lisensiert GNU GPLv3.</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="appcompatibility">Programstøtte</string>
+  <string name="show_incompat_versions">Ukompatible versjoner</string>
+  <string name="show_incompat_versions_on">Vis programvareversjoner som ikke er kompatible med enheten</string>
+  <string name="show_incompat_versions_off">Gjem programvareversjoner som ikke er kompatible 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>
@@ -119,15 +136,46 @@ Lisensiert GNU GPLv3.</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_repo">Lokal pakkebrønn</string>
   <string name="local_repos_title">Lokale F-Droid register</string>
   <string name="local_repos_scanning">Oppdager lokale FDroid register…</string>
+  <string name="local_repo_running">Sirkulering av programmer kan begynne</string>
+  <string name="waiting_for_ipaddress">venter på IP-adresse:</string>
+  <string name="setup_repo">Sett opp lokal pakkebrønn</string>
+  <string name="touch_to_configure_local_repo">Trykk for å se detaljer og for å tillate andre å sirkulere de programmene du har.</string>
+  <string name="touch_to_turn_on_local_repo">Trykk for å skru på din lokale pakkebrønn.</string>
   <string name="touch_to_turn_off_local_repo">Trykk for å skru av din lokale repo.</string>
+  <string name="updating">Oppdaterer...</string>
+  <string name="update_repo">Oppdater pakkebrønn</string>
+  <string name="deleting_repo">Sletter gjeldende pakkebrønn...</string>
+  <string name="adding_apks_format">Legger til %s til pakkebrønn...</string>
+  <string name="writing_index_jar">Skriver signert indekseringsfil (index.jar)...</string>
+  <string name="failed_to_create_index">Klarte ikke å indeksere pakkebrønn!</string>
+  <string name="linking_apks">Lenker APK-er inn i pakkebrønn...</string>
+  <string name="copying_icons">Kopierer program-ikoner til pakkebrønnen...</string>
+  <string name="updated_local_repo">Ferdig med oppdatering av lokal pakkebrønn</string>
   <string name="no_applications_found">Ingen applikasjoner funnet</string>
+  <string name="icon">ikon</string>
+  <string name="fingerprint">Fingeravtrykk:</string>
+  <string name="wifi_network">Wi-Fi-nettverk:</string>
+  <string name="sharing_uri">Delings-nettadresse:</string>
+  <string name="enable_wifi">Skru på Wi-Fi</string>
   <string name="enabling_wifi">Skrur på WiFi...</string>
+  <string name="same_wifi_instructions">Sørg for å være på samme Wi-Fi-nettverk som de enhetene du vil koble til. Skriv enten inn nettadressen ovenfor i F-droid, eller skann denne QR-koden:</string>
   <string name="qr_code">QR Kode</string>
+  <string name="next">Neste</string>
   <string name="skip">Hopp over</string>
+  <string name="qr_content_description">QR-kode for pakkebrønnens nettadresse</string>
+  <string name="qr_wizard_wifi_network_instructions">Skann denne QR-koden for å koble til samme Wi-Fi nettverk som denne enheten.</string>
+  <string name="qr_wizard_download_instructions">Skann denne QR-koden for å koble til nettsiden for å komme i gang.</string>
+  <string name="send_fdroid_via_wifi">Send F-Droid over Wi-Fi...</string>
+  <string name="proxy">Mellomtjener</string>
   <string name="enable_proxy_title">Skru på HTTP Proxy</string>
   <string name="enable_proxy_summary">Konfigurer HTTP Proxy for alle nettverks forespørsler.</string>
+  <string name="proxy_host">Mellomtjener-vert</string>
+  <string name="proxy_host_summary">Sett opp din mellomtjeners tjenernavn (f.eks. 127.0.0.1)</string>
+  <string name="proxy_port">Mellomtjener-port</string>
+  <string name="proxy_port_summary">Sett opp din mellomtjeners portnummer (f.eks. 8118)</string>
   <string name="status_download">Laster ned
 %2$s / %3$s (%4$d%%) fra
 %1$s</string>
@@ -138,6 +186,9 @@ Lisensiert GNU GPLv3.</string>
 %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="repos_unchanged">Ingen av pakkebrønnene hadde noen oppdateringer</string>
+  <string name="all_other_repos_fine">Alle de andre pakkebrønnene lagde ikke noe krøll.</string>
+  <string name="global_error_updating_repos">Feil under oppdatering:</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>
@@ -149,6 +200,7 @@ Lisensiert GNU GPLv3.</string>
   <string name="compactlayout_off">Vis ikoner i vanlig størrelse</string>
   <string name="theme">Utseende</string>
   <string name="unsigned">Usignert</string>
+  <string name="unverified">Ubekreftet</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>
@@ -181,14 +233,42 @@ Du må
   <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>
   <string name="app_icon">App ikon</string>
+  <string name="repo_icon">Pakkebrønns-ikon</string>
+  <string name="Children">Barn</string>
   <string name="Development">Utvikling</string>
+  <string name="Games">Spill</string>
+  <string name="Internet">Internett</string>
+  <string name="Mathematics">Matematikk</string>
   <string name="Multimedia">Multimedia</string>
   <string name="Navigation">Navigasjon</string>
+  <string name="News">Nyheter</string>
+  <string name="Office">Kontor</string>
+  <string name="Phone_SMS">Telefon og SMS</string>
+  <string name="Reading">Leser</string>
   <string name="Science_Education"/>
   <string name="Security">Sikkerhet</string>
+  <string name="System">System</string>
   <string name="Wallpaper">Bakgrunn</string>
   <string name="requesting_root_access_title">Root tilgang</string>
+  <string name="requesting_root_access_body">Etterspørr root-tilgang...</string>
   <string name="root_access_denied_title">Root tilgang nektet</string>
+  <string name="root_access_denied_body">Enten mangler din Android-enhet superbrukertilgang, eller så har du nektet F-droid root-tilgang.</string>
   <string name="update_all">Oppdater alle</string>
+  <string name="installer_error_title">(Av-)Installasjons-feil</string>
+  <string name="installer_error_body">(Av-)installasjon feilet. Hvis du bruker root-tilgang, prøv å skru av dette!</string>
+  <string name="system_permission_denied_title">System-rettigheter avslått</string>
+  <string name="system_permission_denied_body">Dette valget er bare tilgjengelig når F-Droid er installert som system-program.</string>
+  <string name="app_description">F-droid er en ansamling fri programvare som kan installeres på Android-plattformen. Klienten gjør det enkelt å sjekke ut, installere og holde øye med oppdateringer på din enhet.</string>
+  <string name="swap_nfc_description">Hvis din venn holder telefonene deres sammen.</string>
+  <string name="swap_join_same_wifi">Koble til samme Wi-Fi-nett som din venn</string>
   <string name="swap_use_bluetooth">Bruk Bluetooth istedet</string>
+  <string name="swap_wifi_help">Lær mer om Wi-Fi</string>
+  <string name="menu_swap">Sirkuler programvare</string>
+  <string name="swap">Sirkuler programvare</string>
+  <string name="swap_no_wifi_network">Mangler nettverk</string>
+  <string name="swap_view_available_networks">(Trykk for å åpne tilgjengelige nettverk)</string>
+  <string name="swap_wifi_qr_not_working">Det fungerer ikke</string>
+  <string name="open_qr_code_scanner">Åpne QR-kode-skanner</string>
+  <string name="swap_welcome">Velkommen til F-Droid!</string>
+  <string name="swap_confirm_connect">Ønsker du å hente pakker fra %1$s nå?</string>
 </resources>