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 2020-12-05 06:33:37 +01:00
parent c50acc0179
commit b1a115aa76
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

@ -3,6 +3,7 @@
Name=Windows
Name[az]=Pəncərələr
Name[ca]=Finestres
Name[cs]=Okna
Name[en_GB]=Windows
Name[es]=Ventanas
Name[fr]=Fenêtres
@ -21,6 +22,7 @@ Name[x-test]=xxWindowsxx
Comment=List windows and desktops and switch them
Comment[az]=Pəncərələrin, İş Masalarının siyahısı və onlar arası keçid
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[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.