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 2018-06-02 05:45:32 +02:00
parent c629d282ac
commit 3f18e2b6ee
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/frozenapp/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Desaturate Unresponsive Applications
Name[ca]=Dessatura les aplicacions que no responen Name[ca]=Dessatura les aplicacions que no responen
Name[ca@valencia]=Dessatura les aplicacions que no responen Name[ca@valencia]=Dessatura les aplicacions que no responen
Name[da]=Dæmp programmer som ikke svarer Name[da]=Dæmp programmer som ikke svarer
Name[de]=Sättigung von nicht reagierenden Anwendungen verringern
Name[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών Name[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών
Name[en_GB]=Desaturate Unresponsive Applications Name[en_GB]=Desaturate Unresponsive Applications
Name[es]=Desaturar las aplicaciones que no responden Name[es]=Desaturar las aplicaciones que no responden
@ -37,6 +38,7 @@ Comment=Desaturate windows of unresponsive (frozen) applications
Comment[ca]=Dessatura les finestres de les aplicacions que no responen (congelades) Comment[ca]=Dessatura les finestres de les aplicacions que no responen (congelades)
Comment[ca@valencia]=Dessatura les finestres de les aplicacions que no responen (congelades) Comment[ca@valencia]=Dessatura les finestres de les aplicacions que no responen (congelades)
Comment[da]=Dæmp vinduerne for programmer der ikke svarer (er frosset) Comment[da]=Dæmp vinduerne for programmer der ikke svarer (er frosset)
Comment[de]=Verringert die Sättigung von nicht reagierenden, eingefrorenen Anwendungen
Comment[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών Comment[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών
Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications
Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas) Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas)