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 2017-01-30 06:04:34 +01:00
parent 3088b50ad4
commit 4b5cd32849
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packageplugins/scripts/kwin-packagestructure-scripts.desktop
View file

@ -11,6 +11,11 @@ Name[ko]=KWin 스크립트
Name[nl]=KWin-script
Name[pl]=Skrypt KWin
Name[pt]=Programa do KWin
Name[sk]=KWin skript
Name[sr]=К‑винова скрипта
Name[sr@ijekavian]=К‑винова скрипта
Name[sr@ijekavianlatin]=KWinova skripta
Name[sr@latin]=KWinova skripta
Name[sv]=Kwin-skript
Name[uk]=Скрипт KWin
Name[x-test]=xxKWin Scriptxx

5
packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
View file

@ -11,6 +11,11 @@ Name[ko]=KWin 창 전환기
Name[nl]=KWin-vensterwisselaar
Name[pl]=Przełącznik okien KWin
Name[pt]=Mudança de Janelas do KWin
Name[sk]=Prepínač okien KWin
Name[sr]=К‑винов мењач прозора
Name[sr@ijekavian]=К‑винов мењач прозора
Name[sr@ijekavianlatin]=KWinov menjač prozora
Name[sr@latin]=KWinov menjač prozora
Name[sv]=Kwin-fönsterbyte
Name[uk]=Перемикач вікон KWin
Name[x-test]=xxKWin Window Switcherxx