Merge branch 'master' of github.com:laurent22/joplin

CliClient/locales/it_IT.po

@@ -538,6 +538,7 @@ msgstr "Errore fatale:"
 #, javascript-format
 msgid "All potential ports are in use - please report the issue at %s"
 msgstr ""
+"Tutte le potenziali porte sono in uso - prego riportare il problema a %s"
 
 msgid ""
 "The application has been authorised - you may now close this browser tab."
@@ -639,25 +640,23 @@ msgid "Web clipper options"
 msgstr "Opzioni Web Clipper"
 
 msgid "Create note from template"
-msgstr ""
+msgstr "Crea nota da modello"
 
 msgid "Create to-do from template"
-msgstr ""
+msgstr "Nuovo \"Cose-da-fare\" da modello"
 
-#, fuzzy
 msgid "Insert template"
-msgstr "Inserisci data e ora"
+msgstr "Inserisci modello"
 
-#, fuzzy
 msgid "Open template directory"
-msgstr "Cartella di esportazione di Joplin"
+msgstr "Apri cartella modelli"
 
 msgid "Refresh templates"
-msgstr ""
+msgstr "Aggiorna modelli"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
+msgstr "Revisione: %s (%s)"
 
 #, javascript-format
 msgid "%s %s (%s, %s)"
@@ -676,7 +675,7 @@ msgid "Check for updates..."
 msgstr "Controlla aggiornamenti..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Modelli"
 
 msgid "Import"
 msgstr "Importa"
@@ -964,8 +963,8 @@ msgstr ""
 "ad essi. È probabile che verranno scaricati tramite la sincronizzazione."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advice on how "
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
-"to enable it please check the documentation:"
+"enable it please check the documentation:"
 msgstr ""
 "Per ulteriori informazioni sulla crittografia end-to-end (E2EE) e consigli "
 "su come abilitarlo, consultare la documentazione:"
@@ -997,7 +996,7 @@ msgid "Notebook title:"
 msgstr "Titolo del Taccuino:"
 
 msgid "Add or remove tags:"
-msgstr "Aggiungi or rimuovi etichetta:"
+msgstr "Aggiungi o rimuovi etichetta:"
 
 msgid "Rename notebook:"
 msgstr "Rinomina il Taccuino:"
@@ -1009,7 +1008,7 @@ msgid "Set alarm:"
 msgstr "Imposta allarme:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "File del modello:"
 
 msgid "Layout"
 msgstr "Disposizione"
@@ -1503,10 +1502,10 @@ msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
-msgstr "Cose da fare incomplete in cima alla lista"
+msgstr "\"Cose-da-fare\" incomplete in cima alla lista"
 
 msgid "Show completed to-dos"
-msgstr "Mostra le cose da fare completate"
+msgstr "Mostra le \"Cose-da-fare\" completate"
 
 msgid "Sort notes by"
 msgstr "Ordina le note per"
@@ -1841,17 +1840,15 @@ msgstr "Seleziona la data"
 msgid "Confirm"
 msgstr "Conferma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Taccuini"
+msgstr "Taccuini: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Gli elementi crittografati non possono essere modificati"
+msgstr "I Taccuini crittografati non possono essere rinominati"
 
-#, fuzzy
 msgid "New Notebook"
-msgstr "Nuovo taccuino"
+msgstr "Nuovo Taccuino"
 
 msgid "Configuration"
 msgstr "Configurazione"
@@ -1864,9 +1861,8 @@ msgstr "Decrittografia Elementi: %d/%d"
 msgid "Fetching resources: %d/%d"
 msgstr "Recupero risorse: %d/%d"
 
-#, fuzzy
 msgid "All notes"
-msgstr "Eliminare le note?"
+msgstr "Tutte le note"
 
 msgid "Notebooks"
 msgstr "Taccuini"
@@ -1914,48 +1910,46 @@ msgid "Type new tags or select from list"
 msgstr "Digita nuovi tag o seleziona dalla lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
 
-#, fuzzy
 msgid "Information"
-msgstr "Maggiori informazioni"
+msgstr "Informazioni"
 
 msgid "Encryption Config"
 msgstr "Configurazione Crittografia"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Strumenti"
+msgstr "Strumenti"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Stato"
+msgstr "Stato sincronizzazione"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Creare nuovo %s..."
+msgstr "Creazione report..."
 
 msgid "Export Debug Report"
 msgstr "Esporta il Report di Debug"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Correzione indice di ricerca..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Correggi indice di ricerca"
 
 msgid ""
 "Use this to rebuild the search index if there is a problem with search. It "
 "may take a long time depending on the number of notes."
 msgstr ""
+"Usa questo per ricostruire l’indice di ricerca se c’è un problema con la "
+"ricerca. Potrebbe richiedere molto tempo, dipende dal numero di note."
 
 msgid "More information"
 msgstr "Maggiori informazioni"
@@ -2025,9 +2019,8 @@ msgstr "Il Taccuino non può essere salvato: %s"
 msgid "Edit notebook"
 msgstr "Modifica Taccuino"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Titolo del Taccuino:"
+msgstr "Inserisci titolo del Taccuino"
 
 msgid "Show all"
 msgstr "Mostra tutto"
@@ -2061,9 +2054,9 @@ msgstr "Collegamenti con protocollo \"%s\" non sono supportati"
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Aggiornato: %d."
+msgstr "Aggiornato: %s"
 
 msgid "View on map"
 msgstr "Guarda sulla mappa"
@@ -2071,13 +2064,11 @@ msgstr "Guarda sulla mappa"
 msgid "Go to source URL"
 msgstr ""
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Cerca..."
+msgstr "Allega..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostra opzioni avanzate"
+msgstr "Scegli un’opzione"
 
 msgid "Take photo"
 msgstr "Scatta foto"
@@ -2097,19 +2088,17 @@ msgstr "Converti in nota"
 msgid "Convert to todo"
 msgstr "Converti in Todo"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Proprietà della nota"
+msgstr "Proprietà"
 
 msgid "Add body"
-msgstr ""
+msgstr "Aggiungi corpo"
 
 msgid "Edit"
 msgstr "Modifica"
 
-#, fuzzy
 msgid "Add title"
-msgstr "titolo"
+msgstr "Aggiungi titolo"
 
 msgid "Login with OneDrive"
 msgstr "Accedi a OneDrive"

README.md

@@ -346,12 +346,12 @@ Joplin implements the SQLite Full Text Search (FTS4) extension. It means the con
 Search type | Description | Example
 ------------|-------------|---------
 Single word | Returns all the notes that contain this term. | For example, searching for `cat` will return all the notes that contain this exact word. Note: it will not return the notes that contain the substring - thus, for "cat", notes that contain "cataclysmic" or "prevaricate" will **not** be returned.
-Multiples words | Returns all the notes that contain **all** these words, but not necessarily next to each other. | `dog cat` - will return any notes that contain the words "dog" and "cat" anywhere in the note, no necessarily in that order nor next to each others. It will **not** return results that contain "dog" or "cat" only.
+Multiples words | Returns all the notes that contain **all** these words, but not necessarily next to each other. | `dog cat` - will return any notes that contain the words "dog" and "cat" anywhere in the note, no necessarily in that order nor next to each other. It will **not** return results that contain "dog" or "cat" only.
-Phrase query | Add double quotes to return the notes that contain exactly this phrase. | `"shopping list"` - will return the notes that contain these **exact terms** next to each others and in this order. It will **not** return for example a note that contain "going shopping with my list".
+Phrase query | Add double quotes to return the notes that contain exactly this phrase. | `"shopping list"` - will return the notes that contain these **exact terms** next to each other and in this order. It will **not** return for example a note that contains "going shopping with my list".
-Prefix | Add a wildmark to return all the notes that contain a term with a specified prefix. | `swim*` - will return all the notes that contain eg. "swim", but also "swimming", "swimsuit", etc. IMPORTANT: The wildcard **can only be at the end** - it will be ignored at the beginning of a word (eg. `*swim`) and will be treated as a literal asterisk in the middle of a word (eg. `ast*rix`)
+Prefix | Add a wildcard to return all the notes that contain a term with a specified prefix. | `swim*` - will return all the notes that contain eg. "swim", but also "swimming", "swimsuit", etc. IMPORTANT: The wildcard **can only be at the end** - it will be ignored at the beginning of a word (eg. `*swim`) and will be treated as a literal asterisk in the middle of a word (eg. `ast*rix`)
 Field restricted | Add either `title:` or `body:` before a note to restrict your search to just the title, or just the body. | `title:shopping`, `body:egg`
 
-Notes are sorted by "relevance". Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matter how close to each others are the terms. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as much details as possible to replicate the issue.
+Notes are sorted by "relevance". Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matters how close to each other the terms are. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as many details as possible to replicate the issue.
 
 # Goto Anything