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 2019-08-15 04:57:48 +02:00
parent 1296ad3986
commit 9608a8b579
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinscreenedges/kwinscreenedges.desktop
View file

@ -87,6 +87,7 @@ Comment[en_GB]=Configure active screen corners and edges
Comment[es]=Configurar los bordes y las esquinas de pantalla activos
Comment[eu]=Konfiguratu pantailaren izkina eta ertz aktiboak
Comment[fr]=Configurer les bords et les coins d'écran actifs
Comment[id]=Konfigurasikan tepian dan sudut layar aktif
Comment[it]=Configura angoli e bordi attivi dello schermo
Comment[nl]=Actieve schermhoeken en -randen configureren
Comment[nn]=Set opp aktive skjermhjørne og skjermkantar

1
kcmkwin/kwinscreenedges/kwintouchscreen.desktop
View file

@ -55,6 +55,7 @@ Comment[en_GB]=Configure touch screen swipe gestures
Comment[es]=Configurar los gestos de deslizamiento en pantalla táctil
Comment[eu]=Konfiguratu ukimen-pantailako kolpe arinen keinuak
Comment[fr]=Configurer les mouvements sur l'écran tactile
Comment[id]=Konfigurasikan gestur usapan layar sentuh
Comment[it]=Configura gesti dello schermo a sfioramento
Comment[nl]=Veeggebaren voor aanraakscherm configureren
Comment[nn]=Set opp fingerrørsler på trykkskjerm