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"
This commit is contained in:
parent
1296cfd861
commit
8484a2a3a0
2 changed files with 2 additions and 0 deletions
|
@ -19,6 +19,7 @@ Name[sr@latin]=KWinova skripta
|
|||
Name[sv]=Kwin-skript
|
||||
Name[uk]=Скрипт KWin
|
||||
Name[x-test]=xxKWin Scriptxx
|
||||
Name[zh_CN]=KWin 脚本
|
||||
Name[zh_TW]=KWin 指令稿
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=KPackage/PackageStructure
|
||||
|
|
|
@ -19,6 +19,7 @@ Name[sr@latin]=KWinov menjač prozora
|
|||
Name[sv]=Kwin-fönsterbyte
|
||||
Name[uk]=Перемикач вікон KWin
|
||||
Name[x-test]=xxKWin Window Switcherxx
|
||||
Name[zh_CN]=KWin 窗口切换器
|
||||
Name[zh_TW]=KWin 視窗切換器
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=KPackage/PackageStructure
|
||||
|
|
Loading…
Reference in a new issue