marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2025-10-04 01:35:27 +00:00
parent 747bc62c0e
commit 42a4727bff
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcms/navigation/kcm_navigation.json
View file

@ -57,6 +57,7 @@
"Name[ar]": "التّنقّل", "Name[ar]": "التّنقّل",
"Name[ca@valencia]": "Navegueu", "Name[ca@valencia]": "Navegueu",
"Name[ca]": "Navegació", "Name[ca]": "Navegació",
"Name[cs]": "Navigace",
"Name[es]": "Navegación", "Name[es]": "Navegación",
"Name[eu]": "Nabigazioa", "Name[eu]": "Nabigazioa",
"Name[fi]": "Navigointi", "Name[fi]": "Navigointi",