diff options
| author | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
| commit | f0749ee42ccb2e0a7caee165b9934de8e61bfcbc (patch) | |
| tree | 504e56807cab4bca7b4c87aa2973bbd586ce2153 /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | d0c3e373a131f9e9d1dc183c4d8c8b24fa89346c (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/kcmdolphinnavigation.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 07b7d245a..337932850 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -8,6 +8,7 @@ "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[cs]": "Nastavení navigace správce souborů", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", + "Description[en_GB]": "Configure file manager navigation", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[fi]": "Tiedostonhallinnan selausasetukset", |