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 2022-09-14 01:45:56 +00:00
parent 3a9b60f350
commit a15475b8f3
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
containments/homescreens/folio/package/metadata.json
View file

@ -51,6 +51,7 @@
"Name[ca]": "Folio", "Name[ca]": "Folio",
"Name[es]": "Folio", "Name[es]": "Folio",
"Name[eu]": "Folio", "Name[eu]": "Folio",
"Name[fr]": "Porte-feuille",
"Name[nl]": "Folio", "Name[nl]": "Folio",
"Name[pt]": "Folio", "Name[pt]": "Folio",
"Name[sl]": "Folio", "Name[sl]": "Folio",