Merge branch 'origin/master' into Weblate.

This commit is contained in:
Hosted Weblate 2018-12-07 17:54:33 +01:00
commit 431f64a52a
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
2 changed files with 5 additions and 4 deletions

View File

@ -11,7 +11,7 @@
"database-source/alert-initial-database": "Du må angi en initiell database",
"database-source/alert-query": "Du må angi en gyldig spørring",
"database-source/alert-invalid-query-select": "Spørringen må starte med nøkkelordet SELECT",
"database-source/alert-connection-edit": "Tilkoblingen ble redigert",
"database-source/alert-connection-edit": "Tilkobling redigert",
"database-source/connectionNameLabel": "Navn:",
"database-source/databaseTypeLabel": "Type:",
"database-source/databaseHostLabel": "Vert:",
@ -26,7 +26,7 @@
"database-source/newConnectionButtonDiv": "Ny tilkobling",
"database-source/savedConnectionSpan": "Lagrede tilkoblinger",
"database-parsing/start-over": "« Begynn på nytt",
"database-parsing/conf-pars": "Konfigurer tolkningsinnstillinger",
"database-parsing/conf-pars": "Sett opp tolkningsinnstillinger",
"database-parsing/proj-name": "Prosjektnavn",
"database-parsing/create-proj": "Opprett prosjekt »",
"database-parsing/updating-preview": "Oppdaterer forhåndsvisning …",
@ -43,6 +43,6 @@
"database-parsing/store-row": "Lagre blanke rader",
"database-parsing/store-cell": "Lagre blanke celler som null",
"database-source/alert-invalid-query-keyword": "Spørring kan ikke inneholde datamanipuleringsnøkkelord:",
"database-source/form-validation-failure": "Nytt tilkoblingsskjema er ugyldig!",
"database-source/form-validation-failure": "Nytt tilkoblingsskjema ugyldig!",
"database-parsing/worksheet": "Regneark"
}

View File

@ -340,5 +340,6 @@
"core-views/errors": "Feil",
"core-views/copy-to-col": "Kopier til kolonner",
"core-views/copy-opt": "Kopieringsvalg",
"core-views/what-to-copy": "Hva som skal kopieres:"
"core-views/what-to-copy": "Hva som skal kopieres:",
"core-index/metaDatas": "Prosjektmetadata"
}