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 2017-06-10 06:00:45 +02:00
parent 754e205bd0
commit c6dc3ed2cd
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -26,7 +26,7 @@ Name[en_GB]=Window Decorations
Name[es]=Decoración de ventanas
Name[et]=Akna dekoratsioonid
Name[eu]=Leiho-apaindurak
Name[fi]=Ikkunoiden kehykset
Name[fi]=Ikkunakehykset
Name[fr]=Décorations de fenêtres
Name[ga]=Maisiúcháin Fhuinneog
Name[gl]=Decoración da xanela

2
plugins/kdecorations/aurorae/src/kwindecoration.desktop
View file

@ -15,7 +15,7 @@ Comment[en_GB]=KWin Window Decoration
Comment[es]=Decoración de ventanas de KWin
Comment[et]=KWini akna dekoratsioon
Comment[eu]=KWin leihoen apainketa
Comment[fi]=KWin-ikkunan kehys
Comment[fi]=KWin-ikkunakehys
Comment[fr]=Décorations de fenêtres KWin
Comment[ga]=Maisiúchán Fuinneog KWin
Comment[gl]=Decoración de xanela de Kwin

2
scripts/enforcedeco/metadata.desktop
View file

@ -11,7 +11,7 @@ Name[en_GB]=Enforces Window Decorations on GTK+ window
Name[es]=Fuerza decoraciones en las ventanas de GTK+
Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas
Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu
Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille
Name[fi]=Pakottaa GTK+-ikkunoiden ikkunakehykset
Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
Name[gl]=Aplica a decoración ás xanelas de GTK+
Name[he]=אכוף עיצוב מסגרת חלון לחלונות GTK