alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 2018-03-30 05:21:16 +02:00
parent e5dcc0b47f
commit d93ecddd14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/data/servicetypes/plasma-generic.desktop
View File

@ -44,7 +44,7 @@ Name[tr]=Plasma Paketi
Name[uk]=Пакунок Плазми
Name[x-test]=xxPlasma Packagexx
Name[zh_CN]=Plasma 包
Name[zh_TW]=Plasma 套件
Name[zh_TW]=Plasma 套件包
Comment=Generic Plasma Package
Comment[ar]=حزمة «بلازما» عامّة
Comment[ast]=Paquete xenéricu de Plasma
@ -87,5 +87,5 @@ Comment[tr]=Genel Plasma Paketi
Comment[uk]=Типовий пакунок Плазми
Comment[x-test]=xxGeneric Plasma Packagexx
Comment[zh_CN]=通用 Plasma 包
Comment[zh_TW]=一般 Plasma 套件
Comment[zh_TW]=一般 Plasma 套件包

2
src/plasma/data/servicetypes/plasma-packagestructure.desktop
View File

@ -45,7 +45,7 @@ Comment[ug]=Plasma بوغچا قۇرۇلما ئېنىقلىمىسى
Comment[uk]=Опис структури пакунка плазми
Comment[x-test]=xxPlasma package structure definitionxx
Comment[zh_CN]=Plasma 包结构定义
Comment[zh_TW]=Plasma 套件結構定義
Comment[zh_TW]=Plasma 套件包結構定義
[PropertyDef::X-Plasma-PackageFileFilter]
Type=QString