mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-11-21 01:21:37 -08:00
Merge branch 'master' into develop
Conflicts: src/CMakeLists.txt src/autotype/xcb/AutoTypeXCB.cpp src/browser/BrowserAction.cpp src/browser/BrowserService.cpp src/browser/BrowserService.h src/browser/BrowserSettings.h src/browser/NativeMessagingHost.cpp src/browser/NativeMessagingHost.h src/gui/EditWidgetIcons.cpp src/gui/EditWidgetIcons.h src/gui/MainWindow.cpp src/proxy/NativeMessagingHost.cpp tests/TestOpenSSHKey.cpp
This commit is contained in:
53 files changed
+9771
-1125
No files matched your search
@@ -185,7 +185,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
|
||||
return result;
|
||||
case Notes:
|
||||
// Display only first line of notes in simplified format
|
||||
result = entry->resolveMultiplePlaceholders(entry->notes().section("\n", 0, 0).simplified());
|
||||
result = entry->notes().section("\n", 0, 0).simplified();
|
||||
if (attr->isReference(EntryAttributes::NotesKey)) {
|
||||
result.prepend(tr("Ref: ", "Reference abbreviation"));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user