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-24 12:53:38 +01:00
parent 1e4fbcc5ed
commit d9e7498593
6 changed files with 6 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

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

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

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

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -20,6 +20,7 @@ Name[sv]=Fönsterbyteslayouter
Name[uk]=Компонування засобу перемикання вікон
Name[x-test]=xxWindow Manager Switching Layoutsxx
Name[zh_CN]=窗口切换器布局
Name[zh_TW]=視窗切換器佈局
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Switching Layouts

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

@ -11,6 +11,7 @@ Name[pt]=Programa do KWin
Name[sv]=Kwin-skript
Name[uk]=Скрипт KWin
Name[x-test]=xxKWin Scriptxx
Name[zh_TW]=KWin 指令稿
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_scripts

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

@ -11,6 +11,7 @@ Name[pt]=Mudança de Janelas do KWin
Name[sv]=Kwin-fönsterbyte
Name[uk]=Перемикач вікон KWin
Name[x-test]=xxKWin Window Switcherxx
Name[zh_TW]=KWin 視窗切換器
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_windowswitcher

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

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