diff options
| author | l10n daemon script <[email protected]> | 2021-08-09 01:11:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-09 01:11:30 +0000 |
| commit | cb9142a9bbabe0d4adc65253ede01bc998cf0edb (patch) | |
| tree | 92a9a4fed741625bef08ac80da953d2c6c29e527 /src/views | |
| parent | a38f1c8eaedd30eabe3d55feb251119d74244852 (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')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 5cffe9aac..26bee0bce 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -18,6 +18,7 @@ Comment[eu]=Bertsio-kontrolerako plugina fitxategi ikuspegietarako Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers Comment[gl]=Complemento de control de versión para vistas de ficheiros. +Comment[hi]=फ़ाइल दृश्यों के लिए संस्करण नियंत्रण प्लगइन Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kendali Versi untuk Tampilan File |