diff options
| author | l10n daemon script <[email protected]> | 2022-05-03 01:50:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-03 01:50:40 +0000 |
| commit | d958aa57d87ba1b391bac8043949f49fb23fb43c (patch) | |
| tree | a8e37ca78a43786af94e38d88d2471ec49803987 /src | |
| parent | 9b5f56980bc4d2f399a6b828c94b23f3626c9d21 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 4fd797730..825e51854 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -15,6 +15,7 @@ "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்", "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır", "Description[uk]": "Налаштувати загальні параметри менеджера файлів", + "Description[vi]": "Cấu hình các thiết lập chung cho trình quản lí tệp", "Description[x-test]": "xxConfigure general file manager settingsxx", "Description[zh_CN]": "配置文件管理器常规设置", "Icon": "system-file-manager", @@ -33,6 +34,7 @@ "Name[ta]": "பொதுவானவை", "Name[tr]": "Genel", "Name[uk]": "Загальне", + "Name[vi]": "Chung", "Name[x-test]": "xxGeneralxx", "Name[zh_CN]": "常规", "ServiceTypes": [ diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 340a0f06e..f5254d096 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -15,6 +15,7 @@ "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır", "Description[uk]": "Налаштувати навігацію у менеджері файлів", + "Description[vi]": "Cấu hình điều hướng trình quản lí tệp", "Description[x-test]": "xxConfigure file manager navigationxx", "Description[zh_CN]": "配置文件管理器导航功能", "Icon": "preferences-desktop-navigation", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 219c2053f..cd2e83e94 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -15,6 +15,7 @@ "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır", "Description[uk]": "Налаштувати режими перегляду менеджера файлів", + "Description[vi]": "Cấu hình các chế độ xem trình quản lí tệp", "Description[x-test]": "xxConfigure file manager view modesxx", "Description[zh_CN]": "配置文件管理器视图模式", "Icon": "preferences-desktop-icons", |