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-12-07 08:23:17 +01:00
parent 732dc07b87
commit da6b89dda0
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/logout/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Logout
Name[ca]=Sortida Name[ca]=Sortida
Name[ca@valencia]=Eixida Name[ca@valencia]=Eixida
Name[cs]=Odhlášení Name[cs]=Odhlášení
Name[da]=Log ud
Name[de]=Abmeldung Name[de]=Abmeldung
Name[el]=Αποσύνδεση Name[el]=Αποσύνδεση
Name[en_GB]=Logout Name[en_GB]=Logout

1
effects/scale/scale_config.desktop
View file

@ -9,6 +9,7 @@ Name=Scale
Name[ca]=Escala Name[ca]=Escala
Name[ca@valencia]=Escala Name[ca@valencia]=Escala
Name[cs]=Měřítko Name[cs]=Měřítko
Name[da]=Skalér
Name[de]=Skalieren Name[de]=Skalieren
Name[el]=Κλιμάκωση Name[el]=Κλιμάκωση
Name[en_GB]=Scale Name[en_GB]=Scale