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-12-24 05:45:06 +01:00
parent ba2c0324d2
commit b78a104f50
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwinoptions/kwinadvanced.desktop
View file

@ -45,7 +45,7 @@ Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
Comment[et]=Muude aknahalduse valikute seadistamine
Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak
Comment[fi]=Ikkunanhallinnan lisäasetukset
Comment[fr]=Configuré les options de gestion avancée des fenêtres
Comment[fr]=Configurer les options de gestion avancée des fenêtres
Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas
Comment[id]=Konfigurasikan opsi pengelolaan window tingkat-lanjut
Comment[it]=Configura opzioni avanzate della gestione delle finestre