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 2016-12-23 05:44:53 +01:00
parent 8e32dd4fdc
commit 286ad7104d
4 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -6,6 +6,7 @@ Name[pt]=Efeitos do Gestor de Janelas
Name[sv]=Fönsterhanteringseffekter
Name[uk]=Ефекти засобу керування вікнами
Name[x-test]=xxWindow Manager Effectsxx
Name[zh_CN]=窗口管理器效果
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Effects

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -6,6 +6,7 @@ Name[pt]=Programas do Gestor de Janelas
Name[sv]=Fönsterhanteringsskript
Name[uk]=Скрипти засобу керування вікнами
Name[x-test]=xxWindow Manager Scriptsxx
Name[zh_CN]=窗口管理器脚本
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Scripts

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -6,6 +6,7 @@ Name[pt]=Disposições da Mudança de Janelas do KWin
Name[sv]=Fönsterbyteslayouter
Name[uk]=Компонування засобу перемикання вікон
Name[x-test]=xxWindow Manager Switching Layoutsxx
Name[zh_CN]=窗口切换器布局
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Switching Layouts

1
plugins/kdecorations/aurorae/src/aurorae.knsrc
View file

@ -6,6 +6,7 @@ Name[pt]=Decorações das Janelas do Aurorae
Name[sv]=Aurorae-fönsterdekorationer
Name[uk]=Обрамлення вікон Aurorae
Name[x-test]=xxAurorae Window Decorationsxx
Name[zh_CN]=Aurorae 窗口装饰
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Window Decoration Aurorae