diff options
| author | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
| commit | f8c292c556b87a19e9099cc98bf0ab88424472b2 (patch) | |
| tree | c0f088c45041b562e517b9c9c173430626d894e3 /src/views | |
| parent | 084dbbe2f7b62a50a9c2d44fb5f6ae0aebac97eb (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 b82ac8483..3867b88a2 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -28,6 +28,7 @@ Comment[ko]=파일 보기용 버전 제어 플러그인 Comment[lt]=Failo rodinių versijų tvarkymo papildinys Comment[lv]=Versiju kontroles spraudnis priekš datņu skata Comment[ml]=ഫയൽ കാഴ്ചകൾക്കായുള്ള പതിപ്പ് നിയന്ത്രണ പ്ലഗിൻ +Comment[my]=ဖိုင်လ်မြင်ကွင်းများအတွက် ဗားရှင်းထိန်းချုပ်ပလပ်ဂင် Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar |