Tag: Branch: Tree: 88c1f2093c

wilder

wilder-5.14

wilder-5.17

wilder-5.18

wilder-5.19

wilder-5.22

wilder-5.24

wilder-5.25

wilder-5.26

wilder-5.26-rebase

wilder-broken-krunner

wilder-portage

wilder-portage-prov

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '88c1f2093c'

${ noResults }

Commit Graph

68 Commits (88c1f2093cac777fe6a6f35594c389eda1c713bd)

Author	SHA1	Message	Date
l10n daemon script	de4197e6ee	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
l10n daemon script	dbc616f0fd	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
l10n daemon script	592df93013	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
Nate Graham	6a5a38f128	[Powerdevil runner] Make Sleep/Suspend command work again ... BUG: 408735 FIXED-IN: 5.16.1	7 years ago
Nate Graham	9524117322	[KRunner, SDDM theme, Logout screen, Login widget] Use the word "Sleep" instead of "Suspend" ... Summary: [copy-pasted from T10500:] Problems with the current term: - It's a somewhat severe-sounding technical term that doesn't intrinsically mean much to the average person. To the extent that it does, the connotations may be negative (e.g. when a misbehaving kid is being kept out of school) - Our two major closed-source desktop competitors (macOS and Windows) both use the term "Sleep", so user familiarity with "Suspend" is low and falling all the time I'd like to propose that we use "Sleep" instead, to address the above issues. It's a nicer word in general, and since it's what our competitors use, we benefit from user familiarity. We also recently adopted a moon icon with Zs for this, which visually connotes sleep. So it would make sense to update the string too, because then the string and the icon will both match. Test Plan: KRunner, searched for "Sleep": {F6640273} KRunner, searched for "Suspend": {F6640284} Kickoff, searched for "Sleep": {F6640309} Kickoff, searched for "Suspend": {F6640315} SDDM theme: {F6626026} Logout screen: {F6626010} Logout widget, UI: {F6626034} Logout widget, config: {F6626035} Reviewers: #vdg, #plasma, davidedmundson, filipf, mart Reviewed By: #vdg, #plasma, filipf, mart Subscribers: abetts, filipf, davidedmundson, plasma-devel Tags: #plasma Maniphest Tasks: T10500 Differential Revision: https://phabricator.kde.org/D19185	7 years ago
l10n daemon script	abc2d564a7	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
l10n daemon script	9428884630	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
l10n daemon script	c761342a0f	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
l10n daemon script	d20799548a	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	7 years ago
Nathaniel Graham	4500ff9de1	Use consistent "Suspend" terminology ... Summary: We use "Suspend" and "Hibernate" in most places except for KRunner, where we currently use more technical terms that expose the implementation details (suspend to ram vs suspend to disk). Let's be consistent. Reviewers: #plasma, #vdg, davidedmundson, broulik Reviewed By: #plasma, davidedmundson, broulik Subscribers: sudhirkhanger, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D15386	8 years ago
l10n daemon script	6816ccdb48	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	887d225c17	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	4332eceebf	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
Friedrich W. H. Kossebau	2608ccce81	Use nullptr	8 years ago
Laurent Montel	42db878101	Use nullptr. Port some code for compiling with strict flags	8 years ago
Laurent Montel	d863086f67	use override everywhere	8 years ago
l10n daemon script	d389cde75f	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	6ea0292868	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	1c8eb7a732	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	c758248f4d	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
l10n daemon script	5947632bd6	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	8 years ago
Kai Uwe Broulik	4174ceb762	[PowerDevil Runner] Obliterate traces of power profiles ... They have been removed way back in Plasma 4.7 and are the cause of the "Error contacting the daemon!" message on KRunner startup. Differential Revision: https://phabricator.kde.org/D7919	9 years ago
l10n daemon script	49d79637c5	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	9 years ago
l10n daemon script	f1167336c1	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	9 years ago
l10n daemon script	60eb1564da	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	9 years ago
l10n daemon script	50b7c832f3	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	9 years ago
Kai Uwe Broulik	e1692f1a21	Use iconName instead of icon in all runners ... Also bump Frameworks version requirement to 5.24 for this Differential Revision: https://phabricator.kde.org/D1922	10 years ago
l10n daemon script	f5546cb5e6	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	10 years ago
l10n daemon script	f9893549ba	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	10 years ago
Aleix Pol	96ff1c868e	Properly define overrides as suggested by the c++ standard	10 years ago
l10n daemon script	5435e568df	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	10 years ago
l10n daemon script	278ba70509	SVN_SILENT made messages (.desktop file)	10 years ago
l10n daemon script	b2173723ce	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	10 years ago
l10n daemon script	3453aa8aa0	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	10 years ago
l10n daemon script	ed0ce07ac5	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	b87767969a	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	aadd4b5683	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
Montel Laurent	a007f294b4	Use new connect api + QStringLiteral	11 years ago
l10n daemon script	80c1c7eada	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	d3277e8269	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	ef8e9abb33	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	6635cdc956	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	4207c67625	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	4dbb05ac96	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	0cd67e377b	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	171d751f65	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	744c916af9	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	59292eea40	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	1f37ac1fa2	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago
l10n daemon script	c83d196e77	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	11 years ago