~neon/kajongg/master : changes

~neon/kajongg/master » Changes from revision 3782

From Revision 3755 to 3736

Rev	Summary	Authors	Tags	Date
3755	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3754	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3753	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3752	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3751	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	v19.07.80	4 years ago
3750	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3749	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3748	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3747	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3746	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3745	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3744	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3743	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3742	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3741	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3740	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3739	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3738	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script		4 years ago
3737	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		4 years ago
3736	use consistent spelling for Mahjong and use a generic name a... use consistent spelling for Mahjong and use a generic name as the generic name	Jonathan Riddell		4 years ago