yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests 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 2023-05-15 02:17:59 +00:00
parent 5a287fe37c
commit aa5e8612d0
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tabbox/switchers/thumbnail_grid/metadata.json
View file

@ -17,6 +17,7 @@
"Name[nl]": "Chris Holland", "Name[nl]": "Chris Holland",
"Name[pl]": "Chris Holland", "Name[pl]": "Chris Holland",
"Name[sl]": "Chris Holland", "Name[sl]": "Chris Holland",
"Name[ta]": "கிரிஸ் ஹாளண்டு",
"Name[tr]": "Chris Holland", "Name[tr]": "Chris Holland",
"Name[uk]": "Chris Holland", "Name[uk]": "Chris Holland",
"Name[x-test]": "xxChris Hollandxx" "Name[x-test]": "xxChris Hollandxx"
@ -53,6 +54,7 @@
"Name[nl]": "Raster voor miniaturen", "Name[nl]": "Raster voor miniaturen",
"Name[pl]": "Siatka miniatur", "Name[pl]": "Siatka miniatur",
"Name[sl]": "Mreža predoglednih sličic", "Name[sl]": "Mreža predoglednih sličic",
"Name[ta]": "சிறுபட கிரிட்",
"Name[tr]": "Küçük Görsel Izgarası", "Name[tr]": "Küçük Görsel Izgarası",
"Name[uk]": "Таблиця мініатюр", "Name[uk]": "Таблиця мініатюр",
"Name[x-test]": "xxThumbnail Gridxx", "Name[x-test]": "xxThumbnail Gridxx",