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 2015-03-19 09:50:52 +00:00
parent ca1e2377fb
commit b7e5392a7b
6 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autotests/data/signedPackage/metadata.desktop
View File

@ -70,6 +70,7 @@ Comment[sv]=Förevisar åtkomst av data via HTTP i Javascript
Comment[tr]=JavaScript HTTP üzerinden veri erişimini gösterir
Comment[uk]=Демонстрації доступу до даних за допомогою HTTP мовою JavaScript
Comment[x-test]=xxDemonstrates accessing data via HTTP in JavaScriptxx
Comment[zh_CN]=展示在 JavaScript 中通过 HTTP 访问数据
Comment[zh_TW]=展示如何在 JavaScript 中透過 HTTP 存取資料
Icon=text-x-generic

1
examples/applets/bugreport/metadata.desktop
View File

@ -62,6 +62,7 @@ Keywords[sv]=plasma;bugzilla;fel;utveckling;support;
Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek;
Keywords[uk]=plasma;bugzilla;bug;development;support;плазма;багзілла;вада;баг;розробка;підтримка;супровід;помилка;
Keywords[x-test]=xxplasmaxx;xxbugzillaxx;xxbugxx;xxdevelopmentxx;xxsupportxx;
Keywords[zh_CN]=plasma;bugzilla;bug;development;support;错误;开发;支持;
Keywords[zh_TW]=plasma;bugzilla;bug;development;support;
Name=Bug
Name[ast]=Fallu

1
examples/applets/dataenginemodel/metadata.desktop
View File

@ -30,6 +30,7 @@ Comment[sv]=Miniprogramexempel som visar hur modeller används inbäddade i data
Comment[tr]=VeriMotorları içinde gömülü Modellerin nasıl kullanılacağını gösteren uygulama programı örneği
Comment[uk]=Приклад аплету, який демонструє використання моделей, вбудованих до рушіїв даних
Comment[x-test]=xxExample applet that shows how to use Models embedded in DataEnginesxx
Comment[zh_CN]=展示如何使用数据引擎内嵌的模型的样例小部件
Comment[zh_TW]=顯示如何使用嵌入於資料引擎中的模型的範例小程式
Encoding=UTF-8
Keywords=

1
examples/applets/notes/metadata.desktop
View File

@ -68,6 +68,7 @@ Name[sv]=Exempelanteckningar
Name[tr]=Örnek notlar
Name[uk]=Приклад нотаток
Name[x-test]=xxExample notesxx
Name[zh_CN]=示例便笺
Name[zh_TW]=範例備忘
Type=Service
Icon=knotes

2
examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop
View File

@ -31,6 +31,7 @@ Name[sv]=Egen DataContainer
Name[tr]=Özel Veri Kapları
Name[uk]=Нетипові контейнери даних
Name[x-test]=xxCustom DataContainersxx
Name[zh_CN]=自定义数据容器
Name[zh_TW]=自訂資料容器
Comment=A demonstration of how to subclass DataContainer
Comment[bs]=Demonstracija kako se podklasira kontejner podataka
@ -64,6 +65,7 @@ Comment[sv]=En demonstration av hur en delklass av DataContainer skapas
Comment[tr]=Veri haznesinin nasıl altı sınıf yapıldığının bir göstergesi
Comment[uk]=Демонстрація створення підкласу DataContainer
Comment[x-test]=xxA demonstration of how to subclass DataContainerxx
Comment[zh_CN]=展示如何继承 DataContainer
Comment[zh_TW]=DataContainer 子類別的範例
Type=Service
Icon=plasma

1
examples/kpart/plasma-example-kpart-shell.desktop
View File

@ -70,5 +70,6 @@ GenericName[sv]=Ett delprogramskal för Plasma
GenericName[tr]=Plasma için bir KPart kabuğu
GenericName[uk]=Оболонка модулів для Плазми
GenericName[x-test]=xxA KPart shell for Plasmaxx
GenericName[zh_CN]=Plasma 的 KPart 外壳
GenericName[zh_TW]=Plasma 的 KPart shell
Terminal=false