diff options
| author | l10n daemon script <[email protected]> | 2022-06-09 02:11:47 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-09 02:11:47 +0000 |
| commit | eb4a3cb45a18a46649da9145cbe2fef73fd38ca6 (patch) | |
| tree | 884b87e68483be712ec2e546451938b7cf723701 /src/views/versioncontrol | |
| parent | 3207ed3b97b8394192e58b89731b975d4230096f (diff) | |
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"
Diffstat (limited to 'src/views/versioncontrol')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index a63df3c50..3f7b7b971 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -6,7 +6,7 @@ Comment[ar]=ملحقة تحكّم بالإصدارات لمناظير الملف Comment[ast]=Complementu de control de versiones pa les vistes de ficheros Comment[az]=Fayl meneceri üçün versiyaya nəzarət əlavəsi Comment[ca]=Connector de control de versions per a les vistes de fitxers -Comment[ca@valencia]=Conector de control de versions per a les vistes de fichers +Comment[ca@valencia]=Conector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory Comment[da]=Versionsstyringsplugin til filvisninger Comment[de]=Versionskontroll-Modul für Dateiansichten |