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 14:28:34 +01:00
parent 705cb1a9ad
commit 6fae26cc25
6 changed files with 8 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[uk]=Ефекти засобу керування вікнами
Name[x-test]=xxWindow Manager Effectsxx Name[x-test]=xxWindow Manager Effectsxx
Name[zh_CN]=窗口管理器效果 Name[zh_CN]=窗口管理器效果
Name[zh_TW]=視窗管理員效果
ProvidersUrl=http://download.kde.org/ocs/providers.xml ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Effects Categories=KWin Effects

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

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

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

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

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

@ -7,9 +7,11 @@ Name[it]=Script di KWin
Name[ko]=KWin 스크립트 Name[ko]=KWin 스크립트
Name[nl]=KWin-script Name[nl]=KWin-script
Name[pl]=Skrypt KWin Name[pl]=Skrypt KWin
Name[pt]=Programa do KWin
Name[sv]=Kwin-skript Name[sv]=Kwin-skript
Name[uk]=Скрипт KWin Name[uk]=Скрипт KWin
Name[x-test]=xxKWin Scriptxx Name[x-test]=xxKWin Scriptxx
Name[zh_TW]=KWin 指令稿
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

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

@ -7,9 +7,11 @@ Name[it]=Scambiafinestre di KWin
Name[ko]=KWin 창 전환기 Name[ko]=KWin 창 전환기
Name[nl]=KWin-vensterwisselaar Name[nl]=KWin-vensterwisselaar
Name[pl]=Przełącznik okien KWin Name[pl]=Przełącznik okien KWin
Name[pt]=Mudança de Janelas do KWin
Name[sv]=Kwin-fönsterbyte Name[sv]=Kwin-fönsterbyte
Name[uk]=Перемикач вікон KWin Name[uk]=Перемикач вікон KWin
Name[x-test]=xxKWin Window Switcherxx Name[x-test]=xxKWin Window Switcherxx
Name[zh_TW]=KWin 視窗切換器
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

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

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