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"
This commit is contained in:
l10n daemon script 2021-08-23 02:29:46 +00:00
parent 943af95605
commit 6964140699
5 changed files with 6 additions and 6 deletions

View file

@ -232,7 +232,7 @@ Name[tr]=Ayrıntılar
Name[uk]=Подробиці
Name[vi]=Chi tiết
Name[x-test]=xxDetailsxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_TW]=
Icon=view-list-tree
# Dummy

View file

@ -99,7 +99,7 @@ Comment[tr]=Bu servis genel Dolphin ayarlarını yapılandırmanızı sağlar.
Comment[uk]=Ця служба надасть змогу налаштувати загальні параметри Dolphin.
Comment[vi]=Dch v này cho phép cu hình các thiết lp chung ca Dolphin.
Comment[x-test]=xxThis service allows configuration of general Dolphin settings.xx
Comment[zh_CN]= Dolphin
Comment[zh_CN]= Dolphin
Comment[zh_TW]= Dolphin
[Desktop Entry]

View file

@ -99,7 +99,7 @@ Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar.
Comment[uk]=Ця служба надасть змогу налаштувати навігацію у Dolphin.
Comment[vi]=Dch v này cho phép cu hình điu hưng Dolphin.
Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx
Comment[zh_CN]= Dolphin
Comment[zh_CN]= Dolphin
Comment[zh_TW]= Dolphin
[Desktop Entry]
@ -212,7 +212,7 @@ Comment[tr]=Dosya yöneticisi gezintisini yapılandır
Comment[uk]=Налаштувати навігацію у менеджері файлів
Comment[vi]=Cu hình điu hưng trình qun lí tp
Comment[x-test]=xxConfigure file manager navigationxx
Comment[zh_CN]=
Comment[zh_CN]=
Comment[zh_TW]=
X-KDE-Keywords=file manager
X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات

View file

@ -97,7 +97,7 @@ Comment[tr]=Bu servis Dolphin görünüm kiplerini yapılandırmanızı sağlar.
Comment[uk]=Ця служба надасть змогу налаштувати режими перегляду Dolphin.
Comment[vi]=Dch v này cho phép cu hình các chế đ xem Dolphin.
Comment[x-test]=xxThis service allows configuration of the Dolphin view modes.xx
Comment[zh_CN]= Dolphin
Comment[zh_CN]= Dolphin
Comment[zh_TW]= Dolphin
[Desktop Entry]

View file

@ -49,5 +49,5 @@ Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi
Comment[uk]=Додаток керування версіями для панелей перегляду файлів
Comment[vi]=Phn cài cm "Qun lí phiên bn" cho khung xem tp
Comment[x-test]=xxVersion Control Plugin for File Viewsxx
Comment[zh_CN]=
Comment[zh_CN]=
Comment[zh_TW]=