marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2024-03-16 01:16:20 +00:00
parent d5b038c0bc
commit 07e2acbc1b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/time/kcm_mobile_time.json
View file

@ -39,7 +39,7 @@
"Icon": "preferences-system-time",
"Name": "Time and Date",
"Name[ar]": "الوقت والتّاريخ",
"Name[ast]": "Hora ya data",
"Name[ast]": "Hora y data",
"Name[ca@valencia]": "Hora i data",
"Name[ca]": "Hora i data",
"Name[cs]": "Datum a čas",