diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 05:25:52 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 05:25:52 +0200 |
| commit | 90e1cc9c03aed8299583f7714e05809d32d73357 (patch) | |
| tree | 9f2f8e770f00448c7db8047c064a617fb9065250 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | ded82601ef42f86a2437696edc1d2c77a5fc2362 (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/fileviewversioncontrolplugin.desktop')
| -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 1e4c5b381..b42ed91a6 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -12,6 +12,7 @@ Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολ Comment[en_GB]=Version Control Plugin for File Views Comment[es]=Complemento de control de versiones para las vistas de archivos Comment[et]=Failivaadete versioonihaldusplugin +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. |