Commit Graph

13 Commits

Author SHA1 Message Date
Tobias Fella f0e32a526a Fix minor issues in the desktop file
Drop the mimetype for now since it's not implemented anyways
Add 'Network' as a category
2020-09-11 23:49:10 +02:00
l10n daemon script c3b3a9505e 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"
2020-09-01 06:23:01 +02:00
l10n daemon script a0da7b7f41 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"
2020-08-27 06:07:22 +02:00
Tobias Fella 1bd0a8b235 Improve desktop file 2020-08-03 21:32:24 +02:00
l10n daemon script 6dc1ef11e2 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"
2020-07-30 05:56:43 +02:00
l10n daemon script d6e65e4fab 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"
2020-07-18 05:48:08 +02:00
l10n daemon script f2948904eb 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"
2020-07-13 05:37:57 +02:00
l10n daemon script ae62f70871 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"
2020-07-09 05:56:17 +02:00
l10n daemon script 5d8865a8f1 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"
2020-06-18 05:46:40 +02:00
l10n daemon script 2396692226 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"
2020-06-17 14:14:06 +02:00
l10n daemon script 6bfc732ac7 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"
2020-06-13 05:33:05 +02:00
l10n daemon script c172a91627 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"
2020-06-08 05:15:01 +02:00
Tobias Fella b8ee516162 Change file names 2020-06-06 18:23:04 +02:00