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.14.5
parent
5dc942ac5e
commit
5ca26de280
|
@ -11,6 +11,7 @@ Name[nl]=Scripts van vensterbeheerder
|
||||||
Name[nn]=Skript for vindaugshandsamar
|
Name[nn]=Skript for vindaugshandsamar
|
||||||
Name[pl]=Skrypty zarządzania oknami
|
Name[pl]=Skrypty zarządzania oknami
|
||||||
Name[pt]=Programas do Gestor de Janelas
|
Name[pt]=Programas do Gestor de Janelas
|
||||||
|
Name[ru]=Сценарии для диспетчера окон KWin
|
||||||
Name[sk]=Skripty správcu okien
|
Name[sk]=Skripty správcu okien
|
||||||
Name[sr]=Скрипте менаџера прозора
|
Name[sr]=Скрипте менаџера прозора
|
||||||
Name[sr@ijekavian]=Скрипте менаџера прозора
|
Name[sr@ijekavian]=Скрипте менаџера прозора
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=KWin Script
|
Name=KWin Script
|
||||||
|
Name[ca]=Script del KWin
|
||||||
|
Name[nl]=KWin-script
|
||||||
|
Name[uk]=Скрипт KWin
|
||||||
|
Name[x-test]=xxKWin Scriptxx
|
||||||
Type=Service
|
Type=Service
|
||||||
X-KDE-ServiceTypes=KPackage/PackageStructure
|
X-KDE-ServiceTypes=KPackage/PackageStructure
|
||||||
X-KDE-Library=kwin_packagestructure_scripts
|
X-KDE-Library=kwin_packagestructure_scripts
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=KWin Window Switcher
|
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
|
Type=Service
|
||||||
X-KDE-ServiceTypes=KPackage/PackageStructure
|
X-KDE-ServiceTypes=KPackage/PackageStructure
|
||||||
X-KDE-Library=kwin_packagestructure_windowswitcher
|
X-KDE-Library=kwin_packagestructure_windowswitcher
|
||||||
|
|
Loading…
Reference in New Issue