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-09-26 05:57:20 +02:00
parent 375691c6c2
commit e534d5abad
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -25,7 +25,7 @@ Name[da]=Vinduesdekorationer
Name[de]=Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου
Name[en_GB]=Window Decorations
Name[es]=Decoración de ventanas
Name[es]=Decoraciones de las ventanas
Name[et]=Akna dekoratsioonid
Name[eu]=Leiho-apaindurak
Name[fi]=Ikkunakehykset

2
kcmkwin/kwindecoration/package/metadata.desktop
View file

@ -27,7 +27,7 @@ Name[da]=Vinduesdekorationer
Name[de]=Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου
Name[en_GB]=Window Decorations
Name[es]=Decoración de ventanas
Name[es]=Decoraciones de las ventanas
Name[et]=Akna dekoratsioonid
Name[eu]=Leiho-apaindurak
Name[fi]=Ikkunakehykset

2
kcmkwin/kwindecoration/window-decorations.knsrc
View file

@ -11,7 +11,7 @@ Name[da]=Vinduesdekorationer
Name[de]=Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου
Name[en_GB]=Window Decorations
Name[es]=Decoración de ventanas
Name[es]=Decoraciones de las ventanas
Name[et]=Akna dekoratsioonid
Name[eu]=Leiho-apaindurak
Name[fi]=Ikkunakehykset

2
plugins/kdecorations/aurorae/src/aurorae.knsrc
View file

@ -8,7 +8,7 @@ Name[da]=Aurorae vinduesdekorationer
Name[de]=Aurorae-Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου Aurorae
Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[es]=Decoraciones de las ventanas Aurorae
Name[et]=Aurorae aknadekoratsioonid
Name[eu]=Aurorae leihoentzako apaingarriak
Name[fi]=Aurorae-ikkunakehykset

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

@ -13,7 +13,7 @@ Comment[da]=KWin vinduesdekoration
Comment[de]=KWin-Fensterdekoration
Comment[el]=Διακοσμήσεις παραθύρου KWin
Comment[en_GB]=KWin Window Decoration
Comment[es]=Decoración de ventanas de KWin
Comment[es]=Decoración de las ventanas de KWin
Comment[et]=KWini akna dekoratsioon
Comment[eu]=KWin leihoen apainketa
Comment[fi]=KWin-ikkunakehys