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-03-03 07:52:05 +01:00
parent 7cc95d931b
commit 5f7a2806f0
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/kcmkwin/kwinoptions/kwinfocus.desktop
View file

@ -45,6 +45,7 @@ Comment[az]=Pəncərə aktivliyi qaydalarını tənzimləmək
Comment[ca]=Configura la política d'activació de les finestres
Comment[cs]=Nastavení pravidel aktivování oken
Comment[da]=Indstil vinduers aktiveringspolitik
Comment[de]=Regeln zur Fensteraktivierung einrichten
Comment[en_GB]=Configure window activation policy
Comment[es]=Configurar la política de activación de ventanas
Comment[et]=Akende aktiveerimise reeglite seadistamine

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

@ -29,6 +29,7 @@ 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[de]=Listet Fenster und Arbeitsflächen auf und wechselt zwischen ihnen.
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