diff options
| author | l10n daemon script <[email protected]> | 2022-05-28 02:27:04 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-28 02:27:04 +0000 |
| commit | 734df72e900f500e091a815bf557898b7c302e07 (patch) | |
| tree | d8baa2aab2e8943fb3100d78fd40b79c187b74ae /src/settings | |
| parent | 4cd1b6f9ff2d4aa6304f189121ef8d1ac3783cfb (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')
| -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 77689a467..3f3f1c96d 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 modes de vista del gestor de fitxers", + "Description[ca@valencia]": "Configura els modos 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", @@ -30,7 +30,7 @@ "Name[ar]": "أوضاع المنظور", "Name[ast]": "Moos de vista", "Name[az]": "Baxış rejimləri", - "Name[ca@valencia]": "Modes de vista", + "Name[ca@valencia]": "Modos de vista", "Name[ca]": "Modes de vista", "Name[cs]": "Režimy pohledu", "Name[da]": "Visningstilstande", |