Increase version to v1.10.5

## Changes
- Fix Zip Release workflow

.github/ISSUE_TEMPLATE/bug-report.md

@@ -36,7 +36,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Bug occurs on official PairDrop instance https://pairdrop.net/**
 No | Yes
-Version: v1.10.1
+Version: v1.10.5
 
 **Bug occurs on self-hosted PairDrop instance**
 No | Yes
@@ -44,7 +44,7 @@ No | Yes
 **Self-Hosted Setup**
 Proxy: Nginx | Apache2
 Deployment: docker run | docker compose | npm run start:prod
-Version: v1.10.1
+Version: v1.10.5
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/zip-release.yml

@@ -26,12 +26,11 @@ jobs:
       - name: Archive Release
         uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # v0.7.6
         with:
-          type: 'zip'
           filename: 'pairdrop-cli.zip'
-          path: 'pairdrop-cli'
+          directory: 'pairdrop-cli'
           exclusions: '*.git* /*node_modules/* .editorconfig'
       - name: Upload Release
         uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5 # v1.13.0
         with:
-          artifacts: "pairdrop-cli.zip"
+          artifacts: "pairdrop-cli/pairdrop-cli.zip"
           token: ${{ secrets.GITHUB_TOKEN }}

docs/host-your-own.md

@@ -399,7 +399,8 @@ RTC_CONFIG="rtc_config.json"
 
 You can host an instance that uses another signaling server
 This can be useful if you don't want to trust the client files that are hosted on another instance but still want to connect to devices that use https://pairdrop.net.
-### Host Websocket Server (for VPN)
+
+### Specify Signaling Server
 
 ```bash
 SIGNALING_SERVER="pairdrop.net"
@@ -415,9 +416,9 @@ SIGNALING_SERVER="pairdrop.net"
 > E.g. host your own client files under *pairdrop.your-domain.com* but use the official signaling server under *pairdrop.net*
 > This way devices connecting to *pairdrop.your-domain.com* and *pairdrop.net* can discover each other.
 > 
-> Beware that the version of your PairDrop server is compatible with the version of the signaling server. 
+> Beware that the version of your PairDrop server must be compatible with the version of the signaling server.
 >
-> `WS_SERVER` must be a valid url without the protocol prefix. 
+> `SIGNALING_SERVER` must be a valid url without the protocol prefix. 
 > Examples of valid values: `pairdrop.net`, `pairdrop.your-domain.com:3000`, `your-domain.com/pairdrop`
 
 <br>

docs/how-to.md

@@ -24,7 +24,7 @@ This opens PairDrop in the default browser where you can choose the receiver.
 ```bash
 pairdrop -h
 ```
-```bash
+```
 Send files or text with PairDrop via command-line interface.
 Current domain: https://pairdrop-dev.onrender.com/
 
@@ -35,44 +35,61 @@ Send text:		pairdrop -t "text"
 Specify domain:		pairdrop -d "https://pairdrop.net/"
 Show this help text:	pairdrop (-h|--help)
 
-This pairdrop-cli version was released alongside v1.10.0
+This pairdrop-cli version was released alongside v1.10.4
 ```
 
 <br>
 
 ### Setup
-Download the bash file: [pairdrop-cli/pairdrop](/pairdrop-cli/pairdrop).
 
-#### Linux
+#### Linux / Mac
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
-2. Unzip the archive to a folder of your choice e.g. `/usr/local/bin/pairdrop-cli/`
+   ```shell
-3. Make sure the bash file `/usr/local/bin/pairdrop-cli/pairdrop` is executable. Otherwise, use `chmod +x pairdrop`
+   wget "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.5/pairdrop-cli.zip"
-4. Add absolute path of the folder to PATH variable to make `pairdrop` available globally by executing
+   ```
-   `export PATH=$PATH:/usr/local/bin/pairdrop-cli/`
+   or
-
+   ```shell
-<br>
+   curl -LO "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.5/pairdrop-cli.zip"
-
+   ```
-#### Mac
+2. Unzip the archive to a folder of your choice e.g. `/usr/share/pairdrop-cli/`
-1. add bash file to `/usr/local/bin`
+   ```shell
+   sudo unzip pairdrop-cli.zip -d /usr/share/pairdrop-cli/
+   ```
+3. Copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
+   ```shell
+   sudo cp /usr/share/pairdrop-cli/.pairdrop-cli-config.example /usr/share/pairdrop-cli/.pairdrop-cli-config
+   ```
+4. Make the bash file _pairdrop_ executable
+   ```shell
+   sudo chmod +x /usr/share/pairdrop-cli/pairdrop
+   ```
+5. Add a symlink to /usr/local/bin/ to include _pairdrop_ to _PATH_
+   ```shell
+   sudo ln -s /usr/share/pairdrop-cli/pairdrop /usr/local/bin/pairdrop
+   ```
 
 <br>
 
 #### Windows
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
 2. Put file in a preferred folder e.g. `C:\Program Files\pairdrop-cli`
-3. Search for and open `Edit environment variables for your account`
+3. Inside this folder, copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
-4. Click `Environment Variables…`
+4. Search for and open `Edit environment variables for your account`
-5. Under *System Variables* select `Path` and click *Edit...*
+5. Click `Environment Variables…`
-6. Click *New*, insert the preferred folder (`C:\Program Files\pairdrop-cli`), click *OK* until all windows are closed
+6. Under _System Variables_ select `Path` and click _Edit..._
-7. Reopen Command prompt window
+7. Click _New_, insert the preferred folder (`C:\Program Files\pairdrop-cli`), click *OK* until all windows are closed
+8. Reopen Command prompt window
 
-<br>
+**Requirements**
 
-### Requirements
 As Windows cannot execute bash scripts natively, you need to install [Git Bash](https://gitforwindows.org/).
-Then, you can also use pairdrop-cli from the default Windows Command Prompt \
+
-by using the shell file instead of the bash file: `pairdrop.sh -h` which then itself executes \
+Then, you can also use pairdrop-cli from the default Windows Command Prompt 
-pairdrop-cli (the bash file) via the Git Bash.
+by using the shell file instead of the bash file which then itself executes 
+_pairdrop-cli_ (the bash file) via the Git Bash.
+```shell
+pairdrop.sh -h
+```
 
 <br>
 
@@ -82,14 +99,15 @@ pairdrop-cli (the bash file) via the Git Bash.
 It is possible to send multiple files with PairDrop via the context menu by adding pairdrop-cli to Windows `Send to` menu:
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
 2. Unzip the archive to a folder of your choice e.g. `C:\Program Files\pairdrop-cli\`
-3. Copy the shortcut _send with PairDrop.lnk_
+3. Inside this folder, copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
-4. Hit Windows Key+R, type: `shell:sendto` and hit Enter.
+4. Copy the shortcut _send with PairDrop.lnk_
-5. Paste the copied shortcut into the directory
+5. Hit Windows Key+R, type: `shell:sendto` and hit Enter.
-6. Open the properties window of the shortcut and edit the link field to point to _send-with-pairdrop.ps1_ located in the folder you used in step 2: \
+6. Paste the copied shortcut into the directory
+7. Open the properties window of the shortcut and edit the link field to point to _send-with-pairdrop.ps1_ located in the folder you used in step 2: \
    `"C:\Program Files\PowerShell\7\pwsh.exe" -File "C:\Program Files\pairdrop-cli\send-with-pairdrop.ps1"`
-7. You are done! You can now send multiple files and directories directly via PairDrop:
+8. You are done! You can now send multiple files and directories directly via PairDrop:
 
-> _context menu > Send to > PairDrop_
+   _context menu_ > _Send to_ > _PairDrop_
 
 ##### Requirements
 As Windows cannot execute bash scripts natively, you need to install [Git Bash](https://gitforwindows.org/).
@@ -100,14 +118,18 @@ As Windows cannot execute bash scripts natively, you need to install [Git Bash](
 
 ### Registering to open files with PairDrop
 It is possible to send multiple files with PairDrop via the context menu by adding pairdrop-cli to Nautilus `Scripts` menu:
-1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
+1. Register _pairdrop_ as executable via [guide above](#linux).
-2. Unzip the archive to a folder of your choice e.g. `/usr/local/bin/pairdrop-cli/`
+2. Copy the shell file _send-with-pairdrop_ to `~/.local/share/nautilus/scripts/` to include it in the context menu
-3. Copy the shell file _send-with-pairdrop.sh_ to `/home/<user>/.local/share/nautilus/scripts/`
+   ```shell
-4. Edit the shell file and edit the variable `pathToPairDropCli` to point to the pairdrop-cli executable from step 2 (e.g. `/usr/local/bin/pairdrop-cli/pairdrop`) 
+   cp /usr/share/pairdrop-cli/send-with-pairdrop ~/.local/share/nautilus/scripts/
-5. Make sure the shell file `/home/<user>/.local/share/nautilus/scripts/send-with-pairdrop.sh` is executable. Otherwise, use `chmod +x send-with-pairdrop.sh`
+   ```
-6. You are done! You can now send multiple files and directories directly via PairDrop:
+3. Make the shell file _send-with-pairdrop_ executable
+   ```shell
+   chmod +x ~/.local/share/nautilus/scripts/send-with-pairdrop`
+   ```
+4. You are done! You can now send multiple files and directories directly via PairDrop:
 
-> _context menu > Scripts > send-with-pairdrop.sh_
+   _context menu_ > _Scripts_ > _send-with-pairdrop_
 
 <br>
 
@@ -115,6 +137,6 @@ It is possible to send multiple files with PairDrop via the context menu by addi
 The [File Handling API](https://learn.microsoft.com/en-us/microsoft-edge/progressive-web-apps-chromium/how-to/handle-files)
 was implemented, but it was removed as default file associations were overwritten ([#17](https://github.com/schlagmichdoch/PairDrop/issues/17),
 [#116](https://github.com/schlagmichdoch/PairDrop/issues/116) [#190](https://github.com/schlagmichdoch/PairDrop/issues/190))
-and it only worked with explicitly specified file types and not with directories at all.
+and it only worked with explicitly specified file types and couldn't handle directories at all.
 
 [< Back](/README.md)

package-lock.json

@@ -1,19 +1,19 @@
 {
   "name": "pairdrop",
-  "version": "1.10.1",
+  "version": "1.10.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "pairdrop",
-      "version": "1.10.1",
+      "version": "1.10.5",
       "license": "ISC",
       "dependencies": {
         "express": "^4.18.2",
         "express-rate-limit": "^7.1.5",
         "ua-parser-js": "^1.0.37",
         "unique-names-generator": "^4.3.0",
-        "ws": "^8.15.0"
+        "ws": "^8.16.0"
       },
       "engines": {
         "node": ">=15"
@@ -640,9 +640,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.15.0",
+      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-H/Z3H55mrcrgjFwI+5jKavgXvwQLtfPCUEp6pi35VhoB0pfcHnSoyuTzkBEZpzq49g1193CUEwIvmsjcotenYw==",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -1102,9 +1102,9 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "ws": {
-      "version": "8.15.0",
+      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-H/Z3H55mrcrgjFwI+5jKavgXvwQLtfPCUEp6pi35VhoB0pfcHnSoyuTzkBEZpzq49g1193CUEwIvmsjcotenYw==",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "requires": {}
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairdrop",
-  "version": "1.10.1",
+  "version": "1.10.5",
   "type": "module",
   "description": "",
   "main": "server/index.js",
@@ -15,7 +15,7 @@
     "express-rate-limit": "^7.1.5",
     "ua-parser-js": "^1.0.37",
     "unique-names-generator": "^4.3.0",
-    "ws": "^8.15.0"
+    "ws": "^8.16.0"
   },
   "engines": {
     "node": ">=15"

pairdrop-cli/.pairdrop-cli-config.example

@@ -0,0 +1 @@
+DOMAIN=https://pairdrop.net/

pairdrop-cli/pairdrop

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+# PairDrop version when this file was last changed
+version="v1.10.4"
+
 ############################################################
 # Help                                                     #
 ############################################################
@@ -17,7 +20,7 @@ help()
    echo -e "Specify domain:\t\t$(basename "$0") -d \"https://pairdrop.net/\""
    echo -e "Show this help text:\t$(basename "$0") (-h|--help)"
    echo
-   echo "This pairdrop-cli version was released alongside v1.10.0"
+   echo "This pairdrop-cli version was released alongside ${version}"
 }
 
 openPairDrop()
@@ -337,12 +340,15 @@ popd  > '/dev/null';
 
 config_path="${script_path}/.pairdrop-cli-config"
 
+# If config file does not exist, try to create it. If it fails log error message and exit
 [ ! -f "$config_path" ] &&
   specifyDomain "https://pairdrop.net/" &&
   [ ! -f "$config_path" ] &&
-  echo "Could not create config file. Add 'DOMAIN=https://pairdrop.net/' to a file called .pairdrop-cli-config in the same file as this 'pairdrop' bash file"
+  echo "Could not create config file. Add 'DOMAIN=https://pairdrop.net/' to a file called .pairdrop-cli-config in the same file as this 'pairdrop' bash file (${script_path})" &&
+  exit
 
-[ ! -f "$config_path" ] || export "$(grep -v '^#' "$config_path" | xargs)"
+# Read config variables
+export "$(grep -v '^#' "$config_path" | xargs)"
 
 setOs
 

pairdrop-cli/send-with-pairdrop

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# edit this to point to the pairdrop-cli executable
-pathToPairDropCli="/usr/local/bin/pairdrop-cli/pairdrop"
-
 # Initialize an array
 lines=()
 
@@ -17,4 +14,4 @@ length=${#lines[@]}
 # Remove the last entry
 unset 'lines[length-1]'
 
-$pathToPairDropCli "${lines[@]}"
+pairdrop "${lines[@]}"

public/index.html

@@ -225,6 +225,11 @@
                         <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
                         <span>(Italian)</span>
                     </button>
+                    <button class="btn fw wrap" value="kn">
+                        <span>ಕನ್ನಡ</span>
+                        <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
+                        <span>(Kannada)</span>
+                    </button>
                     <button class="btn fw wrap" value="nl">
                         <span>Nederlands</span>
                         <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
@@ -577,7 +582,7 @@
             </svg>
             <div class="title-wrapper" dir="ltr">
                 <h1>PairDrop</h1>
-                <div class="font-subheading">v1.10.1</div>
+                <div class="font-subheading">v1.10.5</div>
             </div>
             <div class="font-subheading" data-i18n-key="about.claim" data-i18n-attrs="text"></div>
             <div class="row">
@@ -734,10 +739,10 @@
         </symbol>
     </svg>
     <!-- Scripts -->
-    <script src="scripts/localization.js"></script>
+    <script src="scripts/localization.js" defer></script>
-    <script src="scripts/persistent-storage.js"></script>
+    <script src="scripts/persistent-storage.js" defer></script>
-    <script src="scripts/ui-main.js"></script>
+    <script src="scripts/ui-main.js" defer></script>
-    <script src="scripts/main.js"></script>
+    <script src="scripts/main.js" defer></script>
     <!-- Sounds -->
     <audio id="blop" autobuffer="true">
         <source src="sounds/blop.mp3" type="audio/mpeg">

public/lang/ar.json

@@ -66,7 +66,8 @@
         "language-selector_title": "إختر اللغة",
         "about_title": "حول PairDrop",
         "about_aria-label": "افتح حول PairDrop",
-        "theme-light_title": "إستخدم دائماً المظهر الفاتح"
+        "theme-light_title": "إستخدم دائماً المظهر الفاتح",
+        "edit-share-mode": "ت٧ارف"
     },
     "instructions": {
         "x-instructions_mobile": "انقر لإرسال الملفات أو انقر لفترة طويلة لإرسال رسالة",

public/lang/de.json

@@ -12,7 +12,8 @@
         "cancel-share-mode": "Fertig",
         "language-selector_title": "Sprache Wählen",
         "join-public-room_title": "Öffentlichen Raum temporär betreten",
-        "edit-share-mode": "Bearbeiten"
+        "edit-share-mode": "Bearbeiten",
+        "expand_title": "Schaltflächenzeile ausklappen"
     },
     "dialogs": {
         "share": "Teilen",
@@ -81,7 +82,11 @@
         "close-about_aria-label": "Schließe Über PairDrop",
         "github_title": "PairDrop auf GitHub",
         "buy-me-a-coffee_title": "Kauf mir einen Kaffee!",
-        "claim": "Der einfachste Weg, Dateien zwischen Geräten zu übertragen"
+        "claim": "Der einfachste Weg, Dateien zwischen Geräten zu übertragen",
+        "bluesky_title": "Folge uns auf BlueSky",
+        "privacypolicy_title": "Öffne unsere Datenschutzerklärung",
+        "mastodon_title": "Schreibe über PairDrop auf Mastodon",
+        "custom_title": "Folge uns"
     },
     "footer": {
         "known-as": "Du wirst angezeigt als:",
@@ -147,7 +152,7 @@
         "x-instructions_desktop": "Klicke, um Dateien zu senden oder benutze einen Rechtsklick, um eine Nachricht zu senden",
         "no-peers-title": "Öffne PairDrop auf anderen Geräten, um Dateien zu senden",
         "no-peers_data-drop-bg": "Hier ablegen, um Empfänger auszuwählen",
-        "no-peers-subtitle": "Kopple Geräte oder betrete einen öffentlichen Raum, um in anderen Netzwerken sichtbar zu sein",
+        "no-peers-subtitle": "Kopple Geräte oder betritt einen öffentlichen Raum, um in anderen Netzwerken sichtbar zu sein",
         "x-instructions-share-mode_desktop": "Klicke zum Senden von {{descriptor}}",
         "x-instructions-share-mode_mobile": "Tippe zum Senden von {{descriptor}}",
         "x-instructions_data-drop-peer": "Hier ablegen, um an Peer zu senden",

public/lang/es.json

@@ -11,7 +11,9 @@
         "join-public-room_title": "Unirse a una sala pública temporalmente",
         "notification_title": "Activar notificaciones",
         "edit-paired-devices_title": "Editar dispositivos emparejados",
-        "theme-light_title": "Siempre usar tema claro"
+        "theme-light_title": "Siempre usar tema claro",
+        "expand_title": "Ampliar la fila de botones de la cabecera",
+        "edit-share-mode": "Editar"
     },
     "footer": {
         "webrtc": "si WebRTC no está disponible.",
@@ -73,9 +75,9 @@
     },
     "instructions": {
         "x-instructions_mobile": "Toque para enviar archivos o toque prologádamente para enviar un mensaje",
-        "x-instructions-share-mode_desktop": "Haga clic para enviar",
+        "x-instructions-share-mode_desktop": "Haga clic para enviar {{descriptor}}",
         "activate-share-mode-and-other-files-plural": "y {{count}} archivos diferentes",
-        "x-instructions-share-mode_mobile": "Toca para enviar",
+        "x-instructions-share-mode_mobile": "Toque para enviar {{descriptor}}",
         "activate-share-mode-base": "Abra PairDrop en otros dispositivos para enviar",
         "no-peers-subtitle": "Empareje dispositivos o ingrese a una sala pública para que lo puedan encontrar en otras redes",
         "activate-share-mode-shared-text": "texto compartido",
@@ -84,7 +86,10 @@
         "x-instructions_data-drop-peer": "Liberar para enviar a un par",
         "x-instructions_data-drop-bg": "Liberar para seleccionar destinatario",
         "no-peers_data-drop-bg": "Liberar para seleccionar destinatario",
-        "webrtc-requirement": "Para utilizar esta instancia de PairDrop, ¡WebRTC debe estar activado!"
+        "webrtc-requirement": "Para utilizar esta instancia de PairDrop, ¡WebRTC debe estar activado!",
+        "activate-share-mode-shared-files-plural": "{{count}} archivos compartidos",
+        "activate-share-mode-shared-file": "archivo compartido",
+        "activate-share-mode-and-other-file": "y 1 archivo más"
     },
     "peer-ui": {
         "processing": "Procesando…",
@@ -96,7 +101,7 @@
         "transferring": "Transferiendo…"
     },
     "dialogs": {
-        "base64-paste-to-send": "Pegar aquí para enviar {{type}}",
+        "base64-paste-to-send": "Pegar el portapapeles aquí para compartir {{type}}",
         "auto-accept-instructions-2": "para aceptar automáticamente todos los archivos enviados desde ese dispositivo.",
         "receive-text-title": "Mensaje Recibido",
         "edit-paired-devices-title": "Editar Dispositivos Emparejados",
@@ -112,7 +117,7 @@
         "join": "Unirse",
         "title-image-plural": "Imágenes",
         "send": "Enviar",
-        "base64-tap-to-paste": "Toca aquí para pegar {{type}}",
+        "base64-tap-to-paste": "Pulse aquí para compartir {{type}}",
         "base64-text": "texto",
         "copy": "Copiar",
         "file-other-description-image": "y una imagen mas",
@@ -146,7 +151,15 @@
         "message_title": "Insertar el mensaje a enviar",
         "pair-devices-qr-code_title": "Haz clic para copiar el enlace para emparejar este dispositivo",
         "public-room-qr-code_title": "Haz clic para copiar el enlace a la sala pública",
-        "message_placeholder": "Texto"
+        "message_placeholder": "Texto",
+        "close-toast_title": "Cerrar la notificación",
+        "share-text-checkbox": "Mostrar siempre este cuadro de diálogo al compartir texto",
+        "base64-title-files": "Compartir archivos",
+        "approve": "aprobar",
+        "paired-device-removed": "Se ha eliminado el dispositivo emparejado.",
+        "share-text-title": "Compartir un mensaje de texto",
+        "share-text-subtitle": "Edita el mensaje antes de enviarlo:",
+        "base64-title-text": "Compartir el texto"
     },
     "about": {
         "claim": "La forma más sencilla de transferir archivos entre dispositivos",
@@ -154,7 +167,11 @@
         "close-about_aria-label": "Cerrar Sobre PairDrop",
         "buy-me-a-coffee_title": "¡Cómprame un café!",
         "github_title": "PairDrop en GitHub",
-        "faq_title": "Preguntas frecuentes"
+        "faq_title": "Preguntas frecuentes",
+        "bluesky_title": "Síganos en BlueSky",
+        "privacypolicy_title": "Abrir nuestra política de privacidad",
+        "mastodon_title": "Escriba sobre PairDrop en Mastodon",
+        "custom_title": "Síguenos en"
     },
     "document-titles": {
         "file-transfer-requested": "Transferencia de archivos solicitada",

public/lang/id.json

@@ -58,7 +58,7 @@
         "room-url-copied-to-clipboard": "Tautan ke ruang publik disalin ke papan klip"
     },
     "header": {
-        "cancel-share-mode": "Selesai",
+        "cancel-share-mode": "Batalkan",
         "theme-auto_title": "Sesuaikan tema dengan sistem",
         "install_title": "Instal PairDrop",
         "theme-dark_title": "Selalu gunakan tema gelap",

public/lang/it.json

@@ -40,7 +40,8 @@
         "no-peers-title": "Apri PairDrop su altri dispositivi per inviare files",
         "x-instructions_data-drop-peer": "Rilascia per inviare al peer",
         "x-instructions_data-drop-bg": "Rilascia per selezionare il destinatario",
-        "no-peers_data-drop-bg": "Rilascia per selezionare il destinatario"
+        "no-peers_data-drop-bg": "Rilascia per selezionare il destinatario",
+        "webrtc-requirement": "Per usare questa istanza di PairDrop, devi attivare WebRTC!"
     },
     "dialogs": {
         "auto-accept-instructions-2": "per accettare automaticamente tutti i files inviati da quel dispositivo.",

public/lang/kn.json

@@ -11,11 +11,14 @@
         "edit-paired-devices_title": "ಜೋಡಿಯಾಗಿರುವ ಸಾಧನಗಳನ್ನು ಎಡಿಟ್ ಮಾಡಿ",
         "language-selector_title": "ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
         "about_aria-label": "PairDrop ಕುರಿತು ಪುಟವನ್ನು ತೆರೆಯಿರಿ",
-        "theme-light_title": "ಯಾವಾಗಲೂ ಲೈಟ್ ಥೀಮ್ ಅನ್ನು ಬಳಸಿ"
+        "theme-light_title": "ಯಾವಾಗಲೂ ಲೈಟ್ ಥೀಮ್ ಅನ್ನು ಬಳಸಿ",
+        "edit-share-mode": "ಎಡಿಟ್ ಮಾಡಿ",
+        "cancel-share-mode": "ರದ್ದುಗೊಳಿಸಿ",
+        "expand_title": "ಹೆಡರ್ ಬಟನ್ ಸಾಲನ್ನು ವಿಸ್ತರಿಸಿ"
     },
     "dialogs": {
         "message_placeholder": "ಪಠ್ಯ",
-        "base64-paste-to-send": "{{type}} ಕಳುಹಿಸಲು ಇಲ್ಲಿ ಅಂಟಿಸಿ",
+        "base64-paste-to-send": "{{type}} ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಅನ್ನು ಇಲ್ಲಿ ಅಂಟಿಸಿ",
         "auto-accept-instructions-2": "ಆ ಸಾಧನದಿಂದ ಕಳುಹಿಸಲಾದ ಎಲ್ಲಾ ಫೈಲ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸ್ವೀಕರಿಸಲು.",
         "receive-text-title": "ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ",
         "edit-paired-devices-title": "ಜೋಡಿಯಾಗಿರುವ ಸಾಧನಗಳನ್ನು ಎಡಿಟ್ ಮಾಡಿ",
@@ -32,7 +35,7 @@
         "join": "ಸೇರಿಕೊಳ್ಳಿ",
         "title-image-plural": "ಚಿತ್ರಗಳು",
         "send": "ಕಳುಹಿಸಿ",
-        "base64-tap-to-paste": "{{type}} ಅಂಟಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ",
+        "base64-tap-to-paste": "{{type}} ಹಂಚಿಕೊಳ್ಳಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ",
         "base64-text": "ಪಠ್ಯ",
         "copy": "ನಕಲು ಮಾಡಿ",
         "file-other-description-image": "ಮತ್ತು ಇನ್ನೊಂದು ಚಿತ್ರ",
@@ -64,7 +67,15 @@
         "send-message-title": "ಸಂದೇಶ ಕಳುಹಿಸಿ",
         "input-room-id-on-another-device": "ಇನ್ನೊಂದು ಸಾಧನದಲ್ಲಿ ಈ ರೂಮ್ ಐಡಿಯನ್ನು ನಮೂದಿಸಿ",
         "file-other-description-image-plural": "ಮತ್ತು {{count}} ಇತರ ಚಿತ್ರಗಳು",
-        "enter-room-id-from-another-device": "ಕೊಠಡಿ ಸೇರಲು ಇನ್ನೊಂದು ಸಾಧನದಿಂದ ರೂಮ್ ಐಡಿ ನಮೂದಿಸಿ."
+        "enter-room-id-from-another-device": "ಕೊಠಡಿ ಸೇರಲು ಇನ್ನೊಂದು ಸಾಧನದಿಂದ ರೂಮ್ ಐಡಿ ನಮೂದಿಸಿ.",
+        "close-toast_title": "ಅಧಿಸೂಚನೆಯನ್ನು ಮುಚ್ಚಿರಿ",
+        "share-text-checkbox": "ಪಠ್ಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುವಾಗ ಯಾವಾಗಲೂ ಈ ಡೈಲಾಗ್ ಅನ್ನು ತೋರಿಸಿ",
+        "base64-title-files": "ಫೈಲ್‌ಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ",
+        "approve": "ಅನುಮೋದಿಸಿ",
+        "paired-device-removed": "ಜೋಡಿಸಲಾದ ಸಾಧನವನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ.",
+        "share-text-title": "ಪಠ್ಯ ಸಂದೇಶವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ",
+        "share-text-subtitle": "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವ ಮೊದಲು ಎಡಿಟ್ ಮಾಡಿ:",
+        "base64-title-text": "ಪಠ್ಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
     },
     "footer": {
         "webrtc": "WebRTC ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ.",
@@ -137,7 +148,15 @@
         "x-instructions_data-drop-peer": "ಪೀರ್‌ಗೆ ಕಳುಹಿಸಲು ಬಿಡುಗಡೆ ಮಾಡಿ",
         "x-instructions_data-drop-bg": "ಸ್ವೀಕರಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಬಿಡುಗಡೆ ಮಾಡಿ",
         "no-peers_data-drop-bg": "ಸ್ವೀಕರಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಬಿಡುಗಡೆ ಮಾಡಿ",
-        "webrtc-requirement": "ಈ PairDrop ನಿದರ್ಶನವನ್ನು ಬಳಸಲು, WebRTC ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು!"
+        "webrtc-requirement": "ಈ PairDrop ನಿದರ್ಶನವನ್ನು ಬಳಸಲು, WebRTC ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು!",
+        "activate-share-mode-base": "ಕಳುಹಿಸಲು ಇತರ ಸಾಧನಗಳಲ್ಲಿ PairDrop ತೆರೆಯಿರಿ",
+        "activate-share-mode-shared-files-plural": "{{count}} ಹಂಚಿದ ಫೈಲ್‌ಗಳು",
+        "x-instructions-share-mode_desktop": "{{descriptor}} ಕಳುಹಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ",
+        "activate-share-mode-shared-file": "ಹಂಚಿದ ಫೈಲ್",
+        "activate-share-mode-and-other-file": "ಮತ್ತು ಇತರ 1 ಫೈಲ್",
+        "x-instructions-share-mode_mobile": "{{descriptor}} ಕಳುಹಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ",
+        "activate-share-mode-and-other-files-plural": "ಮತ್ತು ಇತರ {{count}} ಫೈಲ್‌ಗಳು",
+        "activate-share-mode-shared-text": "ಹಂಚಿದ ಪಠ್ಯ"
     },
     "peer-ui": {
         "processing": "ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲಾಗುತ್ತಿದೆ…",
@@ -146,7 +165,8 @@
         "waiting": "ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ…",
         "connection-hash": "ಎಂಡ್-ಟು-ಎಂಡ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ನ ಭದ್ರತೆಯನ್ನು ಪರಿಶೀಲಿಸಲು, ಎರಡೂ ಸಾಧನಗಳಲ್ಲಿ ಈ ಭದ್ರತಾ ಸಂಖ್ಯೆಯನ್ನು ಹೋಲಿಸಿ",
         "preparing": "ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ…",
-        "transferring": "ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ…"
+        "transferring": "ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ…",
+        "click-to-send-share-mode": "{{descriptor}} ಕಳುಹಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
     },
     "about": {
         "claim": "ಸಾಧನಗಳಾದ್ಯಂತ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಲು ಸುಲಭವಾದ ಮಾರ್ಗ",
@@ -154,7 +174,11 @@
         "close-about_aria-label": "PairDrop ಕುರಿತು ಪುಟವನ್ನು ಮುಚ್ಚಿ",
         "buy-me-a-coffee_title": "ನನಗೆ ಕಾಫಿ ಖರೀದಿಸಿ!",
         "github_title": "GitHub ನಲ್ಲಿ PairDrop",
-        "faq_title": "ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು"
+        "faq_title": "ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು",
+        "bluesky_title": "BlueSky ನಲ್ಲಿ ನಮ್ಮನ್ನು ಅನುಸರಿಸಿ",
+        "privacypolicy_title": "ನಮ್ಮ ಗೌಪ್ಯತೆ ನೀತಿ ತೆರೆಯಿರಿ",
+        "mastodon_title": "Mastodon ನಲ್ಲಿ PairDrop ಕುರಿತು ಬರೆಯಿರಿ",
+        "custom_title": "ನಮ್ಮನ್ನು ಅನುಸರಿಸಿ"
     },
     "document-titles": {
         "file-transfer-requested": "ಫೈಲ್ ವರ್ಗಾವಣೆಗೆ ವಿನಂತಿಸಲಾಗಿದೆ",

public/lang/ro.json

@@ -58,7 +58,7 @@
         "room-url-copied-to-clipboard": "Link către sala publică copiat în clipboard"
     },
     "header": {
-        "cancel-share-mode": "Gata",
+        "cancel-share-mode": "Anulare",
         "theme-auto_title": "Adaptează tema la sistem",
         "install_title": "Instalează PairDrop",
         "theme-dark_title": "Utilizați mereu tema întunecoasă",
@@ -69,13 +69,15 @@
         "language-selector_title": "Setează Limba",
         "about_title": "Despre PairDrop",
         "about_aria-label": "Deschide Despre PairDrop",
-        "theme-light_title": "Utilizați mereu tema luminoasă"
+        "theme-light_title": "Utilizați mereu tema luminoasă",
+        "expand_title": "Extindeți rândul de butoane antet",
+        "edit-share-mode": "Editați"
     },
     "instructions": {
         "x-instructions_mobile": "Atingeți pentru a trimite fișiere sau atingeți lung pentru a trimite un mesaj",
-        "x-instructions-share-mode_desktop": "Clic pentru a trimite",
+        "x-instructions-share-mode_desktop": "Faceți clic pentru a trimite {{descriptor}}",
         "activate-share-mode-and-other-files-plural": "și {{count}} alte fișiere",
-        "x-instructions-share-mode_mobile": "Atinge pentru a trimite",
+        "x-instructions-share-mode_mobile": "Atingeți pentru a trimite {{descriptor}}",
         "activate-share-mode-base": "Deschideți PairDrop pe alte dispozitive pentru a trimite",
         "no-peers-subtitle": "Împerecheați dispozitive sau intrați într-o cameră publică pentru a fi descoperit în alte rețele",
         "activate-share-mode-shared-text": "text partajat",
@@ -83,7 +85,11 @@
         "no-peers-title": "Deschideți PairDrop pe alte dispozitive pentru a trimite fișiere",
         "x-instructions_data-drop-peer": "Eliberare pentru a trimite la peer",
         "x-instructions_data-drop-bg": "Eliberați pentru a selecta recipientul",
-        "no-peers_data-drop-bg": "Eliberare pentru a selecta recipientul"
+        "no-peers_data-drop-bg": "Eliberați pentru a selecta destinatarul",
+        "activate-share-mode-shared-files-plural": "{{count}} fișiere partajate",
+        "activate-share-mode-shared-file": "fișier partajat",
+        "activate-share-mode-and-other-file": "și încă 1 fișier",
+        "webrtc-requirement": "Pentru a utiliza această instanță PairDrop, WebRTC trebuie să fie activat!"
     },
     "peer-ui": {
         "processing": "Procesarea…",
@@ -95,7 +101,7 @@
         "transferring": "Transferul…"
     },
     "dialogs": {
-        "base64-paste-to-send": "Lipiți aici pentru a trimite {{type}}",
+        "base64-paste-to-send": "Inserați clipboard aici pentru a distribui {{type}}",
         "auto-accept-instructions-2": "pentru a accepta automat toate fișierele trimise de la dispozitivul respectiv.",
         "receive-text-title": "Mesaj primit",
         "edit-paired-devices-title": "Editați dispozitivele asociate",
@@ -111,7 +117,7 @@
         "join": "Alătură-te",
         "title-image-plural": "Imagini",
         "send": "Trimite",
-        "base64-tap-to-paste": "Atinge aici pentru a lipi {{type}}",
+        "base64-tap-to-paste": "Atingeți aici pentru a distribui {{type}}",
         "base64-text": "text",
         "copy": "Copiază",
         "file-other-description-image": "și 1 altă imagine",
@@ -125,7 +131,7 @@
         "title-image": "Imagine",
         "file-other-description-file-plural": "și {{count}} alte fișiere",
         "would-like-to-share": "ar dori să împărtășească",
-        "send-message-to": "Trimite un mesaj la",
+        "send-message-to": "La:",
         "language-selector-title": "Setați Limba",
         "pair": "Cuplu",
         "hr-or": "SAU",
@@ -144,7 +150,16 @@
         "enter-room-id-from-another-device": "Introdu ID-ul camerei de pe un alt dispozitiv pentru a intra în cameră.",
         "message_title": "Inserați mesajul de trimis",
         "pair-devices-qr-code_title": "Dați clic pentru a copia link-ul pentru a asocia acest dispozitiv",
-        "public-room-qr-code_title": "Dați clic pentru a copia link-ul în sala publică"
+        "public-room-qr-code_title": "Dați clic pentru a copia link-ul în sala publică",
+        "message_placeholder": "Text",
+        "close-toast_title": "Închideți notificarea",
+        "share-text-checkbox": "Afișați întotdeauna acest dialog atunci când partajați text",
+        "base64-title-files": "Distribuie fisiere",
+        "approve": "aprobă",
+        "paired-device-removed": "Dispozitivul asociat a fost eliminat.",
+        "share-text-title": "Partajați un mesaj text",
+        "share-text-subtitle": "Editați mesajul înainte de a-l trimite:",
+        "base64-title-text": "Partajați textul"
     },
     "about": {
         "claim": "Cel mai simplu mod de a transfera fișiere între dispozitive",
@@ -152,7 +167,11 @@
         "close-about_aria-label": "Închide Despre PairDrop",
         "buy-me-a-coffee_title": "Cumpără-mi o cafea!",
         "github_title": "PairDrop pe GitHub",
-        "faq_title": "Întrebări frecvente"
+        "faq_title": "Întrebări frecvente",
+        "bluesky_title": "Urmărește-ne pe BlueSky",
+        "privacypolicy_title": "Deschideți politica noastră de confidențialitate",
+        "mastodon_title": "Scrieți despre PairDrop pe Mastodon",
+        "custom_title": "Urmăriți-ne"
     },
     "document-titles": {
         "file-transfer-requested": "Transfer de fișiere cerut",

public/lang/tr.json

@@ -1,7 +1,7 @@
 {
     "header": {
         "about_title": "PairDrop Hakkında",
-        "about_aria-label": "PairDrop Hakkında Aç",
+        "about_aria-label": "PairDrop Hakkındayı Aç",
         "theme-auto_title": "Temayı sisteme uyarla",
         "theme-light_title": "Daima açık tema kullan",
         "theme-dark_title": "Daima koyu tema kullan",
@@ -17,13 +17,13 @@
     "instructions": {
         "no-peers_data-drop-bg": "Alıcıyı seçmek için bırakın",
         "x-instructions_mobile": "Dosya göndermek için dokun veya mesaj göndermek için uzun dokun",
-        "x-instructions-share-mode_desktop": "Göndermek için tıkla {{descriptor}}",
+        "x-instructions-share-mode_desktop": "{{descriptor}} kişisine göndermek için tıkla",
         "activate-share-mode-and-other-files-plural": "ve {{count}} diğer dosya",
-        "x-instructions-share-mode_mobile": "Göndermek için dokun {{descriptor}}",
+        "x-instructions-share-mode_mobile": "{{descriptor}} kişisine göndermek için dokun",
         "activate-share-mode-base": "Göndermek için diğer cihazlarda PairDrop'u açın",
         "no-peers-subtitle": "Diğer ağlarda keşfedilebilir olmak için cihazları eşleştirin veya ortak bir odaya girin",
         "activate-share-mode-shared-text": "paylaşılan metin",
-        "x-instructions_desktop": "Dosya göndermek için tıkla ya da mesaj göndermek için sağ tıkla",
+        "x-instructions_desktop": "Dosya göndermek için tıkla veya mesaj göndermek için sağ tıkla",
         "no-peers-title": "Dosya göndermek için diğer cihazlarda PairDrop'u açın",
         "x-instructions_data-drop-peer": "Göndermek için serbest bırak",
         "x-instructions_data-drop-bg": "Alıcıyı seçmek için bırakın",
@@ -131,11 +131,11 @@
         "public-room-left": "{{publicRoomId}} genel odasından ayrıldın",
         "copied-text": "Metin panoya kopyalandı",
         "display-name-random-again": "Mevcut adın tekrardan rastgele oluşturuldu",
-        "display-name-changed-permanently": "Mevcut adın kalıcı olarak değiştirilir",
+        "display-name-changed-permanently": "Mevcut adın kalıcı olarak değiştirildi",
         "copied-to-clipboard-error": "Kopyalama mümkün değil. Manuel olarak kopyalayın.",
         "pairing-success": "Cihazlar eşleştirildi",
         "clipboard-content-incorrect": "Pano içeriği yanlış",
-        "display-name-changed-temporarily": "Mevcut adın yalnızca bu oturum için değiştirilir",
+        "display-name-changed-temporarily": "Mevcut adın yalnızca bu oturum için değiştirildi",
         "copied-to-clipboard": "Panoya kopyalandı",
         "offline": "Çevrimdışısın",
         "pairing-tabs-error": "İki web tarayıcı sekmesini eşleştirmek mümkün değildir",
@@ -149,7 +149,7 @@
         "room-url-copied-to-clipboard": "Genel oda bağlantı linki panoya kopyalandı",
         "copied-text-error": "Panoya kopyalanamadı. Lütfen manuel olarak kopyalayın!",
         "download-successful": "{{descriptor}} indirildi",
-        "click-to-show": "Göstermek için tıkla"
+        "click-to-show": "Görmek için tıkla"
     },
     "peer-ui": {
         "processing": "İşleniyor…",

public/lang/zh-CN.json

@@ -12,7 +12,8 @@
         "cancel-share-mode": "完成",
         "join-public-room_title": "暂时加入公共房间",
         "language-selector_title": "设置语言",
-        "edit-share-mode": "编辑"
+        "edit-share-mode": "编辑",
+        "expand_title": "展开标题按钮行"
     },
     "instructions": {
         "x-instructions_data-drop-peer": "释放以发送到此设备",
@@ -114,7 +115,11 @@
         "github_title": "PairDrop 在 GitHub 上开源",
         "claim": "最简单的跨设备传输方案",
         "buy-me-a-coffee_title": "帮我买杯咖啡！",
-        "tweet_title": "关于 PairDrop 的推特"
+        "tweet_title": "关于 PairDrop 的推特",
+        "bluesky_title": "在 BlueSky 上关注",
+        "privacypolicy_title": "打开隐私政策",
+        "mastodon_title": "在 Maston 上推广 PairDrop",
+        "custom_title": "关注我们"
     },
     "notifications": {
         "display-name-changed-permanently": "展示的名字已经永久变更",

public/scripts/localization.js

@@ -1,40 +1,49 @@
 class Localization {
     constructor() {
+        Localization.$htmlRoot = document.querySelector('html');
+
         Localization.defaultLocale = "en";
-        Localization.supportedLocales = ["ar", "ca", "de", "en", "es", "fr", "id", "it", "ja", "nb", "nl", "pt-BR", "ro", "ru", "tr", "zh-CN"];
+        Localization.supportedLocales = ["ar", "ca", "de", "en", "es", "fr", "id", "it", "ja", "kn", "nb", "nl", "pt-BR", "ro", "ru", "tr", "zh-CN"];
         Localization.supportedLocalesRtl = ["ar"];
 
         Localization.translations = {};
-        Localization.defaultTranslations = {};
+        Localization.translationsDefaultLocale = {};
 
-        Localization.systemLocale = Localization.getSupportedOrDefault(navigator.languages);
+        Localization.systemLocale = Localization.getSupportedOrDefaultLocales(navigator.languages);
 
         let storedLanguageCode = localStorage.getItem('language_code');
 
-        Localization.initialLocale = storedLanguageCode && Localization.isSupported(storedLanguageCode)
+        Localization.initialLocale = storedLanguageCode && Localization.localeIsSupported(storedLanguageCode)
             ? storedLanguageCode
             : Localization.systemLocale;
     }
 
-    static isSupported(locale) {
+    static localeIsSupported(locale) {
         return Localization.supportedLocales.indexOf(locale) > -1;
     }
 
-    static isRtlLanguage(locale) {
+    static localeIsRtl(locale) {
         return Localization.supportedLocalesRtl.indexOf(locale) > -1;
     }
 
-    static isCurrentLocaleRtl() {
+    static currentLocaleIsRtl() {
-        return Localization.isRtlLanguage(Localization.locale);
+        return Localization.localeIsRtl(Localization.locale);
     }
 
-    static getSupportedOrDefault(locales) {
+    static currentLocaleIsDefault() {
+        return Localization.locale === Localization.defaultLocale
+    }
+
+    static getSupportedOrDefaultLocales(locales) {
+        // get generic locales not included in locales
+        // ["en-us", "de-CH", "fr"] --> ["en", "de"]
         let localesGeneric = locales
             .map(locale => locale.split("-")[0])
             .filter(locale => locales.indexOf(locale) === -1);
 
-        return locales.find(Localization.isSupported)
+        // If there is no perfect match for browser locales, try generic locales first before resorting to the default locale
-            || localesGeneric.find(Localization.isSupported)
+        return locales.find(Localization.localeIsSupported)
+            || localesGeneric.find(Localization.localeIsSupported)
             || Localization.defaultLocale;
     }
 
@@ -48,16 +57,14 @@ class Localization {
         await Localization.setLocale(locale)
         await Localization.translatePage();
 
-        const htmlRootNode = document.querySelector('html');
+        if (Localization.localeIsRtl(locale)) {
-
+            Localization.$htmlRoot.setAttribute('dir', 'rtl');
-        if (Localization.isRtlLanguage(locale)) {
-            htmlRootNode.setAttribute('dir', 'rtl');
         }
         else {
-            htmlRootNode.removeAttribute('dir');
+            Localization.$htmlRoot.removeAttribute('dir');
         }
 
-        htmlRootNode.setAttribute('lang', locale);
+        Localization.$htmlRoot.setAttribute('lang', locale);
 
 
         console.log("Page successfully translated",
@@ -111,75 +118,108 @@ class Localization {
         const key = element.getAttribute("data-i18n-key");
         const attrs = element.getAttribute("data-i18n-attrs").split(" ");
 
-        for (let i in attrs) {
+        attrs.forEach(attr => {
-            let attr = attrs[i];
             if (attr === "text") {
                 element.innerText = Localization.getTranslation(key);
             }
             else {
                 element.setAttribute(attr, Localization.getTranslation(key, attr));
             }
-        }
+        })
     }
 
-    static getTranslation(key, attr = null, data = {}, useDefault = false) {
+    static getTranslationFromTranslationsObj(translationObj, key, attr) {
-        const keys = key.split(".");
-
-        let translationCandidates = useDefault
-            ? Localization.defaultTranslations
-            : Localization.translations;
-
         let translation;
-
         try {
+            const keys = key.split(".");
+
             for (let i = 0; i < keys.length - 1; i++) {
-                translationCandidates = translationCandidates[keys[i]]
+                // iterate into translation object until last layer
+                translationObj = translationObj[keys[i]]
             }
 
             let lastKey = keys[keys.length - 1];
 
             if (attr) lastKey += "_" + attr;
 
-            translation = translationCandidates[lastKey];
+            translation = translationObj[lastKey];
 
-            for (let j in data) {
-                if (translation.includes(`{{${j}}}`)) {
-                    translation = translation.replace(`{{${j}}}`, data[j]);
-                } else {
-                    console.warn(`Translation for your language ${Localization.locale.toUpperCase()} misses at least one data placeholder:`, key, attr, data);
-                    Localization.logHelpCallKey(key);
-                    Localization.logHelpCall();
-                    translation = "";
-                    break;
-                }
-            }
         } catch (e) {
             console.error(e);
-            translation = "";
         }
 
         if (!translation) {
-            if (!useDefault) {
+            throw new Error(`Translation misses entry. Key: ${key} Attribute: ${attr}`);
-                console.warn(`Missing translation entry for your language ${Localization.locale.toUpperCase()}. Using ${Localization.defaultLocale.toUpperCase()} instead.`, key, attr);
+        }
-                Localization.logHelpCallKey(key);
+
-                Localization.logHelpCall();
+        return translation;
-                translation = this.getTranslation(key, attr, data, true);
+    }
+
+    static addDataToTranslation(translation, data) {
+        for (let j in data) {
+            if (!translation.includes(`{{${j}}}`)) {
+                throw new Error(`Translation misses data placeholder: ${j}`);
+            }
+            // Add data to translation
+            translation = translation.replace(`{{${j}}}`, data[j]);
+        }
+        return translation;
+    }
+
+    static getTranslation(key, attr = null, data = {}, useDefault = false) {
+        let translationObj = useDefault
+            ? Localization.translationsDefaultLocale
+            : Localization.translations;
+
+        let translation;
+
+        try {
+            translation = Localization.getTranslationFromTranslationsObj(translationObj, key, attr);
+            translation = Localization.addDataToTranslation(translation, data);
+        }
+        catch (e) {
+            // Log warnings and help calls
+            console.warn(e);
+            Localization.logTranslationMissingOrBroken(key, attr, data, useDefault);
+            Localization.logHelpCallKey(key, attr);
+            Localization.logHelpCall();
+
+            if (useDefault || Localization.currentLocaleIsDefault()) {
+                // Is default locale already
+                // Use empty string as translation
+                translation = ""
             }
             else {
-                console.warn("Missing translation in default language:", key, attr);
+                // Is not default locale yet
-                Localization.logHelpCall();
+                // Get translation for default language with same arguments
+                console.log(`Using default language ${Localization.defaultLocale.toUpperCase()} instead.`);
+                translation = this.getTranslation(key, attr, data, true);
             }
         }
 
         return Localization.escapeHTML(translation);
     }
 
+    static logTranslationMissingOrBroken(key, attr, data, useDefault) {
+        let usedLocale = useDefault
+            ? Localization.defaultLocale.toUpperCase()
+            : Localization.locale.toUpperCase();
+
+        console.warn(`Missing or broken translation for language ${usedLocale}.\n`, 'key:', key, 'attr:', attr, 'data:', data);
+    }
+
     static logHelpCall() {
         console.log("Help translating PairDrop: https://hosted.weblate.org/engage/pairdrop/");
     }
 
-    static logHelpCallKey(key) {
+    static logHelpCallKey(key, attr) {
-        console.warn(`Translate this string here: https://hosted.weblate.org/browse/pairdrop/pairdrop-spa/${Localization.locale.toLowerCase()}/?q=${key}`);
+        let locale = Localization.locale.toLowerCase();
+
+        let keyComplete = !attr || attr === "text"
+            ? key
+            : `${key}_${attr}`;
+
+        console.warn(`Translate this string here: https://hosted.weblate.org/browse/pairdrop/pairdrop-spa/${locale}/?q=${keyComplete}`);
     }
 
     static escapeHTML(unsafeText) {

public/scripts/main.js

@@ -56,13 +56,16 @@ class PairDrop {
         await this.backgroundCanvas.fadeIn();
 
         // Load deferred assets
+        console.log("Load deferred assets...");
         await this.loadDeferredAssets();
         console.log("Loading of deferred assets completed.");
 
+        console.log("Hydrate UI...");
         await this.hydrate();
         console.log("UI hydrated.");
 
         // Evaluate url params as soon as ws is connected
+        console.log("Evaluate URL params as soon as websocket connection is established.");
         Events.on('ws-connected', _ => this.evaluateUrlParams(), {once: true});
     }
 
@@ -102,36 +105,40 @@ class PairDrop {
         }
     }
 
-    async loadDeferredAssets() {
+    loadDeferredAssets() {
-        console.log("Load deferred assets");
+        const stylePromises = this.deferredStyles.map(url => this.loadAndApplyStylesheet(url));
-        for (const url of this.deferredStyles) {
+        const scriptPromises = this.deferredScripts.map(url => this.loadAndApplyScript(url));
-            await this.loadAndApplyStylesheet(url);
+
-        }
+        return Promise.all([...stylePromises, ...scriptPromises]);
-        for (const url of this.deferredScripts) {
-            await this.loadAndApplyScript(url);
-        }
     }
 
     loadStyleSheet(url) {
         return new Promise((resolve, reject) => {
             let stylesheet = document.createElement('link');
-            stylesheet.rel = 'stylesheet';
+            stylesheet.rel = 'preload';
+            stylesheet.as = 'style';
             stylesheet.href = url;
-            stylesheet.type = 'text/css';
+            stylesheet.onload = _ => {
-            stylesheet.onload = resolve;
+                stylesheet.onload = null;
+                stylesheet.rel = 'stylesheet';
+                resolve();
+            };
             stylesheet.onerror = reject;
 
             document.head.appendChild(stylesheet);
         });
     }
 
-    async loadAndApplyStylesheet(url) {
+    loadAndApplyStylesheet(url) {
-        try {
+        return new Promise( async (resolve) => {
-            await this.loadStyleSheet(url);
+            try {
-            console.log(`Stylesheet loaded successfully: ${url}`);
+                await this.loadStyleSheet(url);
-        } catch (error) {
+                console.log(`Stylesheet loaded successfully: ${url}`);
-            console.error('Error loading stylesheet:', error);
+                resolve();
-        }
+            } catch (error) {
+                console.error('Error loading stylesheet:', error);
+            }
+        });
     }
 
     loadScript(url) {
@@ -145,13 +152,16 @@ class PairDrop {
         });
     }
 
-    async loadAndApplyScript(url) {
+    loadAndApplyScript(url) {
-        try {
+        return new Promise( async (resolve) => {
-            await this.loadScript(url);
+            try {
-            console.log(`Script loaded successfully: ${url}`);
+                await this.loadScript(url);
-        } catch (error) {
+                console.log(`Script loaded successfully: ${url}`);
-            console.error('Error loading script:', error);
+                resolve();
-        }
+            } catch (error) {
+                console.error('Error loading script:', error);
+            }
+        });
     }
 
     async hydrate() {
@@ -223,6 +233,8 @@ class PairDrop {
         // remove url params from url
         const urlWithoutParams = getUrlWithoutArguments();
         window.history.replaceState({}, "Rewrite URL", urlWithoutParams);
+
+        console.log("URL params evaluated.");
     }
 }
 

public/scripts/ui-main.js

@@ -132,7 +132,7 @@ class HeaderUI {
         this.$header.classList.remove('overflow-expanded');
 
 
-        const rtlLocale = Localization.isCurrentLocaleRtl();
+        const rtlLocale = Localization.currentLocaleIsRtl();
         let icon;
         const $headerIconsShown = document.querySelectorAll('body > header:first-of-type > *:not([hidden])');
 

public/scripts/ui.js

@@ -1978,12 +1978,15 @@ class ReceiveTextDialog extends Dialog {
         this._receiveTextQueue = [];
     }
 
+    selectionEmpty() {
+        return !window.getSelection().toString()
+    }
+
     async _onKeyDown(e) {
         if (!this.isShown()) return
 
-        if (e.code === "KeyC" && (e.ctrlKey || e.metaKey)) {
+        if (e.code === "KeyC" && (e.ctrlKey || e.metaKey) && this.selectionEmpty()) {
             await this._onCopy()
-            this.hide();
         }
         else if (e.code === "Escape") {
             this.hide();
@@ -2014,10 +2017,19 @@ class ReceiveTextDialog extends Dialog {
 
         // Beautify text if text is short
         if (text.length < 2000) {
-            // replace urls with actual links
+            // replace URLs with actual links
-            this.$text.innerHTML = this.$text.innerHTML.replace(/((https?:\/\/|www)[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\-._~:\/?#\[\]@!$&'()*+,;=]+)/g, url => {
+            this.$text.innerHTML = this.$text.innerHTML
-                return `<a href="${url}" target="_blank">${url}</a>`;
+                .replace(/(^|(?<=(<br>|\s)))(https?:\/\/|www.)(([a-z]|[A-Z]|[0-9]|[\-_~:\/?#\[\]@!$&'()*+,;=%]){2,}\.)(([a-z]|[A-Z]|[0-9]|[\-_~:\/?#\[\]@!$&'()*+,;=%.]){2,})/g,
-            });
+                (url) => {
+                        let link = url;
+
+                        // prefix www.example.com with http protocol to prevent it from being a relative link
+                        if (link.startsWith('www')) {
+                            link = "http://" + link
+                        }
+
+                        return `<a href="${link}" target="_blank">${url}</a>`;
+                });
         }
 
         this._evaluateOverflowing(this.$text);
@@ -2049,7 +2061,10 @@ class ReceiveTextDialog extends Dialog {
 
     hide() {
         super.hide();
-        setTimeout(() => this._dequeueRequests(), 500);
+        setTimeout(() => {
+            this._dequeueRequests();
+            this.$text.innerHTML = "";
+        }, 500);
     }
 }
 
@@ -2420,14 +2435,9 @@ class Notifications {
 
     _downloadNotification(files) {
         if (document.visibilityState !== 'visible') {
-            let imagesOnly = true;
+            let imagesOnly = files.every(file => file.type.split('/')[0] === 'image');
-            for(let i=0; i<files.length; i++) {
-                if (files[i].type.split('/')[0] !== 'image') {
-                    imagesOnly = false;
-                    break;
-                }
-            }
             let title;
+
             if (files.length === 1) {
                 title = `${files[0].name}`;
             }
@@ -2452,15 +2462,8 @@ class Notifications {
 
     _requestNotification(request, peerId) {
         if (document.visibilityState !== 'visible') {
-            let imagesOnly = true;
+            let imagesOnly = request.header.every(header => header.mime.split('/')[0] === 'image');
-            for(let i=0; i<request.header.length; i++) {
+            let displayName = $(peerId).querySelector('.name').textContent;
-                if (request.header[i].mime.split('/')[0] !== 'image') {
-                    imagesOnly = false;
-                    break;
-                }
-            }
-
-            let displayName = $(peerId).querySelector('.name').textContent
 
             let descriptor;
             if (request.header.length === 1) {

public/service-worker.js

@@ -1,4 +1,4 @@
-const cacheVersion = 'v1.10.1';
+const cacheVersion = 'v1.10.5';
 const cacheTitle = `pairdrop-cache-${cacheVersion}`;
 const forceFetch = false; // FOR DEVELOPMENT: Set to true to always update assets instead of using cached versions
 const relativePathsToCache = [
@@ -35,6 +35,7 @@ const relativePathsToCache = [
     'lang/id.json',
     'lang/it.json',
     'lang/ja.json',
+    'lang/kn.json',
     'lang/nb.json',
     'lang/nl.json',
     'lang/pt-BR.json',

public/styles/styles-deferred.css

@@ -16,6 +16,7 @@
     max-height: 350px;
     word-break: break-word;
     word-wrap: anywhere;
+    white-space: pre-wrap;
 }
 
 .textarea:before {
@@ -335,6 +336,7 @@ x-dialog x-paper {
     display: flex;
     margin: auto;
     flex-direction: column;
+    width: 100%;
     max-width: 450px;
     z-index: 3;
     border-radius: 30px;
@@ -382,10 +384,6 @@ x-dialog:not([show]) x-paper {
     transform: scale(0.1);
 }
 
-x-dialog a {
-    color: var(--primary-color);
-}
-
 /* Pair Devices Dialog & Public Room Dialog */
 
 .input-key-container {
@@ -784,7 +782,7 @@ x-dialog x-paper {
     background-color: var(--bg-color-secondary) !important;
 }
 
-.textarea * {
+.textarea *:not(a) {
     margin: 0 !important;
     padding: 0 !important;
     color: unset !important;
@@ -797,6 +795,10 @@ x-dialog x-paper {
     font-weight: unset !important;
 }
 
+x-dialog a {
+    color: var(--primary-color);
+}
+
 /* Image/Video/Audio Preview */
 .file-preview {
     margin-bottom: 15px;

server/index.js

@@ -32,10 +32,14 @@ process.on('unhandledRejection', (reason, promise) => {
 
 // Evaluate arguments for deployment with Docker and Node.js
 let conf = {};
+
 conf.debugMode = process.env.DEBUG_MODE === "true";
+
 conf.port = process.env.PORT || 3000;
+
 conf.wsFallback = process.argv.includes('--include-ws-fallback') || process.env.WS_FALLBACK === "true";
-conf.rtcConfig = process.env.RTC_CONFIG
+
+conf.rtcConfig = process.env.RTC_CONFIG && process.env.RTC_CONFIG !== "false"
     ? JSON.parse(fs.readFileSync(process.env.RTC_CONFIG, 'utf8'))
     : {
         "sdpSemantics": "unified-plan",
@@ -47,7 +51,10 @@ conf.rtcConfig = process.env.RTC_CONFIG
     };
 
 
-conf.signalingServer = process.env.SIGNALING_SERVER || false;
+conf.signalingServer = process.env.SIGNALING_SERVER && process.env.SIGNALING_SERVER !== "false"
+    ? process.env.SIGNALING_SERVER
+    : false;
+
 conf.ipv6Localize = parseInt(process.env.IPV6_LOCALIZE) || false;
 
 let rateLimit = false;
@@ -61,6 +68,7 @@ else {
     }
 }
 conf.rateLimit = rateLimit;
+
 conf.buttons = {
     "donation_button": {
         "active": process.env.DONATION_BUTTON_ACTIVE,
@@ -96,8 +104,10 @@ conf.buttons = {
 
 // Evaluate arguments for deployment with Node.js only
 conf.autoStart = process.argv.includes('--auto-restart');
+
 conf.localhostOnly = process.argv.includes('--localhost-only');
 
+
 // Validate configuration
 if (conf.ipv6Localize) {
     if (!(0 < conf.ipv6Localize && conf.ipv6Localize < 8)) {