Merge branch 'origin/master' into Weblate.

extensions/database/module/langs/translation-jp.json

@@ -1,14 +1,14 @@
 {
     "database-import/title": "データベースサーバー",
-    "database-import/preparing": "準備しています...",
-    "database-import/checking": "クエリーをチェックしています...",
-    "database-import/creating": "プロジェクトを作成中...",
-    "database-source/alert-host": "Database Hostを指定してください",
-    "database-source/alert-port": "Database Portを指定してください",
-    "database-source/alert-user": "Database Userを指定してください",
-    "database-source/alert-password": "Database Passwordを指定してください",
-    "database-source/alert-connection-name": "Connection Nameを指定してください",
-    "database-source/alert-initial-database": "第一Databaseを指定してください",
+    "database-import/preparing": "準備しています…",
+    "database-import/checking": "クエリーをチェックしています…",
+    "database-import/creating": "プロジェクトを作成中…",
+    "database-source/alert-host": "database hostを指定してください",
+    "database-source/alert-port": "database portを指定してください",
+    "database-source/alert-user": "database userを指定してください",
+    "database-source/alert-password": "database passwordを指定してください",
+    "database-source/alert-connection-name": "connection nameを指定してください",
+    "database-source/alert-initial-database": "最初のdatabaseを指定してください",
     "database-source/alert-query": "有効なクエリーを設定してください",
     "database-source/alert-invalid-query-keyword": "クエリーにデータ操作語があります:",
     "database-source/alert-invalid-query-select": "クエリーはSELECTで始まります",
@@ -31,7 +31,7 @@
     "database-parsing/conf-pars": "パースオプションの設定",
     "database-parsing/proj-name": "プロジェクト 名",
     "database-parsing/create-proj": "プロジェクトを作成 »",
-    "database-parsing/updating-preview": "プレビューを更新中...",
+    "database-parsing/updating-preview": "プレビューを更新中…",
     "database-parsing/worksheet": "シート名",
     "database-parsing/option": "オプション",
     "database-parsing/preview-button": "プレビュー 更新",
@@ -45,4 +45,4 @@
     "database-parsing/limit": "行を読み込む",
     "database-parsing/store-row": "空白行を保存",
     "database-parsing/store-cell": "空白行をnullとして保存"
-}
+}

extensions/database/module/langs/translation-nb_NO.json

@@ -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"
 }

main/webapp/modules/core/langs/translation-nb_NO.json

@@ -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"
 }