Merge remote-tracking branch 'origin/dev' into dev

app/appearance/langs/de_DE.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Neue Zeile in ${x} erstellen <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Erstellen Sie einen neuen Eintrag in ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Schlüsselinhalt",
   "addDesc": "Beschreibung hinzufügen",
   "dataRepoAutoPurgeIndexRetentionDays": "Daten-Snapshot-Aufbewahrungstage",

app/appearance/langs/en_US.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Create a new row in ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Create a new entry in ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Key content",
   "addDesc": "Add description",
   "dataRepoAutoPurgeIndexRetentionDays": "Data snapshot retention days",

app/appearance/langs/es_ES.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Crear una nueva fila en ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Crear una nueva entrada en ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Contenido de la clave",
   "addDesc": "Agregar descripción",
   "dataRepoAutoPurgeIndexRetentionDays": "Días de retención de instantáneas de datos",

app/appearance/langs/fr_FR.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Créer une nouvelle ligne dans ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Créer une nouvelle entrée dans ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Contenu de la clé",
   "addDesc": "Ajouter une description",
   "dataRepoAutoPurgeIndexRetentionDays": "Jours de rétention des instantanés de données",

app/appearance/langs/he_IL.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "צור שורה חדשה ב-${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "צור ערך חדש ב-${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "תוכן המפתח",
   "addDesc": "הוסף תיאור",
   "dataRepoAutoPurgeIndexRetentionDays": "ימי שמירת תמונות נתונים",

app/appearance/langs/it_IT.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Crea una nuova riga in ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Crea una nuova voce in ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Contenuto della chiave",
   "addDesc": "Aggiungi descrizione",
   "dataRepoAutoPurgeIndexRetentionDays": "Giorni di conservazione degli snapshot dei dati",

app/appearance/langs/ja_JP.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "${x} に新しい行を作成 <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "${x} に新しい項目を作成 <b class='ft__on-surface'>${y}</b>",
   "keyContent": "キーコンテンツ",
   "addDesc": "説明を追加",
   "dataRepoAutoPurgeIndexRetentionDays": "データスナップショットの保持日数",

app/appearance/langs/pl_PL.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Utwórz nowy wiersz w ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Utwórz nowy wpis w ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Zawartość klucza",
   "addDesc": "Dodaj opis",
   "dataRepoAutoPurgeIndexRetentionDays": "Dni przechowywania migawek danych",

app/appearance/langs/ru_RU.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "Создать новую строку в ${x} <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "Создать новую запись в ${x} <b class='ft__on-surface'>${y}</b>",
   "keyContent": "Содержимое ключа",
   "addDesc": "Добавить описание",
   "dataRepoAutoPurgeIndexRetentionDays": "Срок хранения снимков данных",

app/appearance/langs/zh_CHT.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "在 ${x} 中新建行 <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "在 ${x} 中新建條目 <b class='ft__on-surface'>${y}</b>",
   "keyContent": "主鍵內容",
   "addDesc": "添加描述",
   "dataRepoAutoPurgeIndexRetentionDays": "數據快照保留天數",

app/appearance/langs/zh_CN.json

@@ -1,5 +1,5 @@
 {
-  "newRowInRelation": "在 ${x} 中新建行 <b class='ft__on-surface'>${y}</b>",
+  "newRowInRelation": "在 ${x} 中新建条目 <b class='ft__on-surface'>${y}</b>",
   "keyContent": "主键内容",
   "addDesc": "添加描述",
   "dataRepoAutoPurgeIndexRetentionDays": "数据快照保留天数",

kernel/model/graph.go

@@ -512,9 +512,6 @@ func nodeContentByBlock(block *Block) (ret string) {
 	if ret = block.Name; "" != ret {
 		return
 	}
-	if ret = block.Memo; "" != ret {
-		return
-	}
 	ret = block.Content
 	if maxLen := 48; maxLen < utf8.RuneCountInString(ret) {
 		ret = gulu.Str.SubStr(ret, maxLen) + "..."