vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

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"
icc-effect-5.17.5
l10n daemon script 2019-12-24 09:23:30 +01:00
parent 867552fce4
commit 92817c5ac6
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

@ -42,7 +42,7 @@ Comment[en_GB]=Configure advanced window management options
Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
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