Tag: Branch: Tree: 35eb251d7c

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 '35eb251d7c'

${ noResults }

Commit Graph

46 Commits (35eb251d7ca4bd010b927402d2c7dbdcd35a9263)

Author	SHA1	Message	Date
l10n daemon script	e83998f381	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"	5 years ago
l10n daemon script	811d85cbd7	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	2aecf659a6	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	6d0c45a6bc	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
Nicolas Fella	57cfab21ac	Drop empty X-KDE-PluginInfo-Depends ... The whole concept is almost unused and there's no point in having it there but empty See also https://phabricator.kde.org/T13553	6 years ago
l10n daemon script	5f13bcabf9	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	98397d7fd1	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	8fda734647	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	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	fd832ae350	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	70ad54479f	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	ff84d31359	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
Heiko Becker	6f7a878e6d	Replace plasma.kde.org with kde.org/plasma-desktop ... Summary: plasma.kde.org doesn't exist anymore and causes the appstream test to to fail. Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D27304	6 years ago
l10n daemon script	db54291a8f	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	ad18e1e8dd	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	b84c1cad85	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	dac6be5855	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	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	e91c5b2ace	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	2d4742d854	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
l10n daemon script	fc5bff8db6	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	4dfc454d51	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	92a6d3f3a3	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	45388fa383	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	5b63edb807	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	9ffafd2c15	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	4434af7725	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	5d6410de38	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
Aleix Pol	722aff93b5	Include the website on the metadata.desktop files	7 years ago
Friedrich W. H. Kossebau	3dc1e3e7bd	Consistently use X-KDE-ServiceTypes instead of ServiceTypes	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
l10n daemon script	ee6cecaf50	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	1384cc92ce	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	ffd47216c2	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	1564553705	Remove long-time deprecated Encoding=UTF-8 from desktop format files	8 years ago
l10n daemon script	234f8c3765	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	e7fb53714a	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
l10n daemon script	0e35c812b0	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	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	fb88c728e1	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	2569d35ff4	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	5e058803f7	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	6ef6c7e692	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	cf13f672b0	SVN_SILENT made messages (.desktop file)	12 years ago