diff options
| author | l10n daemon script <[email protected]> | 2022-05-02 01:41:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-02 01:41:17 +0000 |
| commit | e148329393c749cd20153bda5b1873f5b93bb6f2 (patch) | |
| tree | 1e67333c18a5c13914b944aaa9b2fb6fb496c0d0 | |
| parent | 8fda69892284144a8aea3845d2aad844021c99d2 (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 cfe09e763..4fd797730 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -2,6 +2,7 @@ "KPlugin": { "Description": "Configure general file manager settings", "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة", + "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", "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", @@ -19,6 +20,7 @@ "Icon": "system-file-manager", "Name": "General", "Name[ar]": "عامّ", + "Name[az]": "Əsas", "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 db11a5cb2..340a0f06e 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -2,6 +2,7 @@ "KPlugin": { "Description": "Configure file manager navigation", "Description[ar]": "اضبط التّنقّل في مدير الملفّات", + "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin", "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 3f1449ee4..219c2053f 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -2,6 +2,7 @@ "KPlugin": { "Description": "Configure file manager view modes", "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات", + "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin", "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", |