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-22 07:26:36 +01:00
parent 5dc942ac5e
commit 5ca26de280
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -11,6 +11,7 @@ Name[nl]=Scripts van vensterbeheerder
Name[nn]=Skript for vindaugshandsamar
Name[pl]=Skrypty zarządzania oknami
Name[pt]=Programas do Gestor de Janelas
Name[ru]=Сценарии для диспетчера окон KWin
Name[sk]=Skripty správcu okien
Name[sr]=Скрипте менаџера прозора
Name[sr@ijekavian]=Скрипте менаџера прозора

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

@ -1,5 +1,9 @@
[Desktop Entry]
Name=KWin Script
Name[ca]=Script del KWin
Name[nl]=KWin-script
Name[uk]=Скрипт KWin
Name[x-test]=xxKWin Scriptxx
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_scripts

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

@ -1,5 +1,9 @@
[Desktop Entry]
Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin
Name[nl]=KWin-vensterwisselaar
Name[uk]=Перемикач вікон KWin
Name[x-test]=xxKWin Window Switcherxx
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_windowswitcher