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 /src/settings/kcm/kcmdolphingeneral.json | |
| 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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 |
1 files changed, 2 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", |