Merge branch 'master' into js-unit-testing

i18n/it.json

@@ -18,7 +18,7 @@
     "Invalid data.":
         "Dati non validi.",
     "You are unlucky. Try again.":
-        "Riprova, sarai più fortunato.",
+        "Ritenta, sarai più fortunato.",
     "Error saving comment. Sorry.":
         "Errore durante il salvataggio del commento.",
     "Error saving paste. Sorry.":
@@ -93,7 +93,7 @@
     "Anonymous":
         "Anonimo",
     "Avatar generated from IP address":
-        "Avatar Anonimo (Vizhash dell'indirizzo IP)",
+        "Avatar generato dall'indirizzo IP)",
     "Add comment":
         "Aggiungi un commento",
     "Optional nickname…":
@@ -107,7 +107,7 @@
     "Could not refresh display: %s":
         "Non riesco ad aggiornare il display: %s",
     "unknown status":
-        "errore sconosciuto",
+        "stato sconosciuto",
     "server error or not responding":
         "errore o mancata risposta dal server",
     "Could not post comment: %s":
@@ -117,11 +117,11 @@
     "Sending paste…":
         "Messaggio in fase di invio…",
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-        "Il tuo messaggio è qui: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">([CTRL | CMD]+[C] per copiare il link)</span>",
+        "Il tuo messaggio è qui: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Premi [Ctrl]+[c] (Windows) o [Cmd]+[c] (Mac) per copiare il link)</span>",
     "Delete data":
         "Cancella i dati",
     "Could not create paste: %s":
-        "Non rieco a creare il messaggio: %s",
+        "Non riesco a creare il messaggio: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
         "Non riesco a decifrare il messaggio: manca la chiave di decifrazione nell'URL (La chiave è parte integrante dell'URL. Per caso hai usato un Redirector o un altro servizio che ha rimosso una parte dell'URL?)",
     "Format": "Formato",
@@ -129,8 +129,8 @@
     "Source Code": "Codice Sorgente",
     "Markdown": "Markdown",
     "Download attachment": "Scarica Allegato",
-    "Cloned: '%s'": "Copia: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
+    "Cloned: '%s'": "Clonato: '%s'",
+    "The cloned file '%s' was attached to this paste.": "Il file clonato '%s' era allegato a questo messaggio.",
     "Attach a file": "Allega un file",
     "Remove attachment": "Rimuovi allegato",
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
@@ -143,13 +143,13 @@
     "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
         "%s necessita che PATH termini con \"%s\". Aggiorna la variabile PATH nel tuo index.php.",
     "Decrypt":
-        "Decrypt",
+        "Decifra",
     "Enter password":
         "Inserisci la password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
+    "Loading…": "Carico…",
+    "Decrypting paste…": "Decifro il messaggio…",
+    "Preparing new paste…": "Preparo il nuovo messaggio…",
     "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
         "Nel caso questo messaggio non scompaia, controlla questa <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">FAQ</a> per trovare informazioni su come risolvere il problema (in Inglese).",
-    "+++ no paste text +++": "+++ no paste text +++"
+    "+++ no paste text +++": "+++ nessun testo nel messaggio +++"
 }

i18n/no.json

@@ -26,13 +26,13 @@
     "Invalid paste ID.":
         "Feil innlegg ID.",
     "Paste is not of burn-after-reading type.":
-        "Innlegg er ikke av type slett-etter-lesing.",
+        "Innlegg er ikke av typen slett etter lesing.",
     "Wrong deletion token. Paste was not deleted.":
         "Feil slettingsnøkkel. Innlegg ble ikke fjernet.",
     "Paste was properly deleted.":
         "Innlegget er slettet.",
     "JavaScript is required for %s to work.<br />Sorry for the inconvenience.":
-        "Javascript kreves for at %s skal fungere<br />Beklager ulempene.",
+        "Javascript kreves for at %s skal fungere<br />Beklager.",
     "%s requires a modern browser to work.":
         "%s krever en moderne nettleser for å fungere.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
@@ -83,7 +83,7 @@
     "Could not decrypt data (Wrong key?)":
         "Kunne ikke dekryptere data (Feil nøkkel?)",
     "Could not delete the paste, it was not stored in burn after reading mode.":
-        "Kan ikke slette innlegget, det ble ikke lagret i slett-etter-les modus.",
+        "Kan ikke slette innlegget, det ble ikke lagret som 'slett etter les' type.",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
         "KUN FOR DINE ØYNE. Ikke lukk dette vinduet, denne meldingen kan ikke bli vist igjen.",
     "Could not decrypt comment; Wrong key?":
@@ -93,7 +93,7 @@
     "Anonymous":
         "Anonym",
     "Avatar generated from IP address":
-        "Anonym avatar (Vizhash av IP adressen)",
+        "Anonym avatar generert med data fra IP adressen)",
     "Add comment":
         "Legg til kommentar",
     "Optional nickname…":
@@ -105,15 +105,15 @@
     "Comment posted.":
         "Kommentar sendt.",
     "Could not refresh display: %s":
-        "Kunne ikke oppdatere skjermen: %s",
+        "Kunne ikke oppdatere bildet: %s",
     "unknown status":
         "ukjent status",
     "server error or not responding":
-        "server feilet eller svarer ikke",
+        "tjener feilet eller svarer ikke",
     "Could not post comment: %s":
         "Kunne ikke sende kommentar: %s",
     "Please move your mouse for more entropy…":
-        "Flytt musen for mere entropi…",
+        "Flytt musen for mer entropi…",
     "Sending paste…":
         "Sender innlegg…",
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
@@ -129,7 +129,7 @@
     "Source Code": "Kildekode",
     "Markdown": "Oppmerket",
     "Download attachment": "Last ned vedlegg",
-    "Cloned: '%s'": "Kopier: '%s'",
+    "Cloned: '%s'": "Kopiert: '%s'",
     "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
     "Attach a file": "Legg til fil",
     "Remove attachment": "Slett vedlegg",
@@ -137,7 +137,7 @@
         "Nettleseren din støtter ikke å laste opp krypterte filer. Vennligst bruk en nyere nettleser.",
     "Invalid attachment.": "Ugyldig vedlegg.",
     "Options": "Alternativer",
-    "Shorten URL": "Adresse-forkorter",
+    "Shorten URL": "Adresse forkorter",
     "Editor": "Rediger",
     "Preview": "Forhåndsvis",
     "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
@@ -147,9 +147,9 @@
     "Enter password":
         "Skriv inn passord",
     "Loading…": "Laster…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
+    "Decrypting paste…": "Dekrypterer innlegg…",
+    "Preparing new paste…": "Klargjør nytt innlegg…",
     "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
         "Hvis denne meldingen ikke forsvinner kan du ta en titt på siden med <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">ofte stilte spørsmål</a> for informasjon om feilsøking.",
-    "+++ no paste text +++": "+++ no paste text +++"
+    "+++ no paste text +++": "+++ ingen innleggstekst +++"
 }