diff options
| author | l10n daemon script <[email protected]> | 2022-04-29 01:44:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-29 01:44:43 +0000 |
| commit | 776d746c6795b19dd5e21390654a69bce3c4dc3f (patch) | |
| tree | 46f16c92e9e3ad506c0ab9d8346acc0e0095a5ee | |
| parent | f08a8dd06b5658a4b62fa3a1550ef39fec722a7e (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"
| -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 c42d98ca7..3cd24c02c 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Configure general file manager settings", + "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", "Description[es]": "Configurar las preferencias generales del gestor de archivos", @@ -14,6 +15,7 @@ "Description[zh_CN]": "配置文件管理器常规设置", "Icon": "system-file-manager", "Name": "General", + "Name[ar]": "عامّ", "Name[ca@valencia]": "General", "Name[ca]": "General", "Name[es]": "General", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 1b0f9ba9d..f799446ce 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Configure file manager navigation", + "Description[ar]": "اضبط التّنقّل في مدير الملفّات", "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[es]": "Configurar la navegación del gestor de archivos", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 164dbc135..125158e14 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Configure file manager view modes", + "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات", "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers", "Description[ca]": "Configura els modes de vista del gestor de fitxers", "Description[es]": "Configurar los modos de vistas del gestor de archivos", |