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 2021-02-02 07:28:08 +01:00
parent 76effae5ca
commit 1d8ebfa475
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ Name[ca]=Finestres
Name[cs]=Okna
Name[en_GB]=Windows
Name[es]=Ventanas
Name[eu]=Leihoak
Name[fi]=Ikkunat
Name[fr]=Fenêtres
Name[ia]=Fenestras
@ -29,6 +30,7 @@ Comment[ca]=Llista finestres i escriptoris, i canvia entre ells
Comment[cs]=Seznam oken a ploch k přepínání
Comment[en_GB]=List windows and desktops and switch them
Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
Comment[eu]=Leihoak eta mahaigainak zerrendatzea eta haien artean aldatzea
Comment[fi]=Luettele ikkunat ja työpöydät ja vaihda niihin
Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.
Comment[ia]=Lista fenestras e scriptorios e commuta los