plasma-workspace

Commit Graph

Author	SHA1	Message	Date
l10n daemon script	fe7320494b	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"	6 years ago
l10n daemon script	6236df5138	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"	6 years ago
l10n daemon script	f04038a367	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"	6 years ago
l10n daemon script	d0cb0bd49f	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"	6 years ago
l10n daemon script	b547a75572	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"	6 years ago
l10n daemon script	909f9145e7	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"	6 years ago
l10n daemon script	4c244e6081	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	8b6ae12b70	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	472aebf17f	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	cef2688a0f	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	45a19fa16c	Remove long-time deprecated Encoding=UTF-8 from desktop format files Summary: The "Encoding" entry had been deprecated in 2006 (https://cgit.freedesktop.org/xdg/xdg-specs/commit/?id=6855384d021d88557f80674798c584c15b547f36) and there is no current workspace known which still requires it being set (incl. Plasma itself). Also has the usage been incomplete and sometimes not at the beginning as required if used (once scripty had sorted all entries in desktop files alphabetically and it was not restored everywhere). Removing them altogether creates consistency and avoids further confusion about and wasted resources for this unused data bit. Removing those entries also from Plasma/5.12 branch avoid conflicts on merging to master, given the entries are often next to translated entries, or generous merging which lets the entries slip back into existance. Reviewers: #plasma, fvogt, broulik, mart Reviewed By: #plasma, mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D11563	8 years ago
Friedrich W. H. Kossebau	1564553705	Remove long-time deprecated Encoding=UTF-8 from desktop format files	8 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
l10n daemon script	40f0461650	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	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	738b59196a	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	b4d7c387c7	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	700ffb1dc8	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	53549eb063	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	5386b47a87	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	f516e0b07e	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	6ef6c7e692	SVN_SILENT made messages (.desktop file)	12 years ago
Jonathan Riddell	53eccfad47	REVIEW:118724 rename .directory files to kf5 prefix to prevent clashes with kde-runtime files	12 years ago
l10n daemon script	cf13f672b0	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	f6fa9c9cd7	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	7340ee7972	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	02b92c46d5	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	55744e1106	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	bc51c4f2b0	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	c12cad775c	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	8356528abc	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	0054ac7f20	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	ff239e820c	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	153478d6ca	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	d2c65e4c9d	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	666d8a9ffe	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	b6e8e4dcf8	SVN_SILENT made messages (.desktop file)	12 years ago
Aleix Pol	718baeb36f	Initial import from the monolithic kde-runtime. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the techbase wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://community.kde.org/Frameworks/GitOldHistory If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo kde-runtime, frameworks branch, at commit 85b1a18736650e28d8addd441f83083987298233	12 years ago

19 Commits (fe7320494be872e8a564e8342fb849229da1cfca)