diff options
| author | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
| commit | 6401e69a4fff3de68fd372e3e0db0a99eba27bde (patch) | |
| tree | 817ac7446c8848b8f0d700ebe05c9ea664fcf760 /src/settings/kcm | |
| parent | bce1f06b2692d77be92caae9d9c3d7dbf5f9d7f1 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index a0713967c..86a0191f8 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -3,7 +3,7 @@ "Description": "Configure file manager view modes", "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات", "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin", - "Description[ca@valencia]": "Configura els modos de vista del gestor de fitxers", + "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", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", @@ -31,7 +31,7 @@ "Name[ar]": "أوضاع المنظور", "Name[ast]": "Moos de vista", "Name[az]": "Baxış rejimləri", - "Name[ca@valencia]": "Modos de vista", + "Name[ca@valencia]": "Modes de vista", "Name[ca]": "Modes de vista", "Name[cs]": "Režimy pohledu", "Name[da]": "Visningstilstande", |