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-28 02:34:13 +00:00
parent a710ddbbe1
commit 24a5290ed2
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/krunner-integration/kwin-runner-windows.desktop
View file

@ -66,7 +66,7 @@ Comment[ka]=ფანჯრებისა და სამუშაო მა
Comment[ko]=창 및 바탕 화면 목록을 보여 주고 전환합니다
Comment[lt]=Išvardyti langus ir darbalaukius bei perjungti į juos
Comment[nl]=Toon vensters en bureaubladen en schakel ze om
Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei
Comment[nn]=Vis vindauge/skrivebord, og byt mellom dei
Comment[pl]=Wypisuje okna i pulpity oraz przełącza pomiędzy nimi
Comment[pt]=Listar as janelas e ecrãs e mudar entre elas
Comment[pt_BR]=Lista as janelas e áreas de trabalho e troca entre elas

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

@ -17,6 +17,7 @@
"Name[it]": "Chris Holland",
"Name[ka]": "Chris Holland",
"Name[nl]": "Chris Holland",
"Name[nn]": "Chris Holland",
"Name[pl]": "Chris Holland",
"Name[sl]": "Chris Holland",
"Name[ta]": "கிரிஸ் ஹாளண்டு",
@ -39,6 +40,7 @@
"Description[ia]": "Un disposition de commutator de fenestra usante un parve grillia de miniaturas",
"Description[it]": "Una disposizione per il cambio finestra che utilizza una piccola griglia di miniature",
"Description[nl]": "Een indeling van de vensterwisselaar met een klein raster van miniaturen",
"Description[nn]": "Vindaugsbytar som viser eit rutenett med miniatyrbilete",
"Description[pl]": "Układ przełączania okien, używający małej siatki miniatur",
"Description[sl]": "Okenski preklopnik postavitve z uporabo majhne mreže predoglednih sličic",
"Description[tr]": "Küçük bir küçük görsel ızgarası kullanan pencere değiştirici yerleşimi",
@ -62,6 +64,7 @@
"Name[it]": "Griglia delle miniature",
"Name[ka]": "მინიატურის ბადე",
"Name[nl]": "Raster voor miniaturen",
"Name[nn]": "Rutenett med miniatyrbilete",
"Name[pl]": "Siatka miniatur",
"Name[sl]": "Mreža predoglednih sličic",
"Name[ta]": "சிறுபட கிரிட்",