marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 06:13: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 2026-03-31 01:41:23 +00:00
parent 9e58810698
commit 6a48931c7c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcms/time/kcm_mobile_time.json
View file

@ -3,8 +3,8 @@
"KPlugin": { "KPlugin": {
"Description": "Timezone, Date Display", "Description": "Timezone, Date Display",
"Description[ar]": "المنطقة الزمنية,عرض التاريخ", "Description[ar]": "المنطقة الزمنية,عرض التاريخ",
"Description[ca@valencia]": "Zona horària, Mostra la data", "Description[ca@valencia]": "Fus horari, Mostra la data",
"Description[ca]": "Zona horària, Mostra la data", "Description[ca]": "Fus horari, Mostra la data",
"Description[cs]": "Zobrazení data a časového pásma", "Description[cs]": "Zobrazení data a časového pásma",
"Description[de]": "Zeitzone, Datumsanzeige", "Description[de]": "Zeitzone, Datumsanzeige",
"Description[en_GB]": "Timezone, Date Display", "Description[en_GB]": "Timezone, Date Display",