diff options
| author | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
| commit | 6401e69a4fff3de68fd372e3e0db0a99eba27bde (patch) | |
| tree | 817ac7446c8848b8f0d700ebe05c9ea664fcf760 /src/views | |
| parent | bce1f06b2692d77be92caae9d9c3d7dbf5f9d7f1 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 3f7b7b971..bf788612f 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 fitxers +Comment[ca@valencia]=Connector 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 |