l10n daemon script f3356b1f4f 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 09:05:32 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
CMakeLists.txt	[scripting] Provide conversion functions for AbstractClient	2019-10-25 17:39:45 +03:00
Messages.sh	Extract messages from scripts and scripting module	2013-03-04 10:29:25 +01:00