diff options
| author | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
| commit | 3333246dba8df1da7f0e735c7816efbce270c96a (patch) | |
| tree | b8ae20ea3aeac484dbccdfc5da09f227c3108eff /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | 58ff9c9cc8f6023f484fd4dbf436e4f598b9fad4 (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, 0 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index bbeba9a2a..0f8530b88 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -39,7 +39,6 @@ "Icon": "preferences-desktop-navigation", "Name": "Navigation", "Name[ar]": "التّنقّل", - "Name[ast]": "Navegación", "Name[az]": "Naviqasiya", "Name[bg]": "Навигация", "Name[ca@valencia]": "Navegació", |