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 2016-06-29 09:34:42 +00:00
parent 05b346bd69
commit 19e8f37753
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/developerguide/basic/metadata.desktop
View File

@ -28,6 +28,7 @@ Comment[sv]=Enkel applikation
Comment[uk]=Базова програма Comment[uk]=Базова програма
Comment[x-test]=xxBasic Appxx Comment[x-test]=xxBasic Appxx
Comment[zh_CN]=基础小程序 Comment[zh_CN]=基础小程序
Comment[zh_TW]=基本應用程式
Name=Bug Name=Bug
Name[ast]=Fallu Name[ast]=Fallu
Name[ca]=Error Name[ca]=Error

1
src/desktoptheme/breeze-light/metadata.desktop
View File

@ -27,6 +27,7 @@ Name[sv]=Breeze ljus
Name[uk]=Світла Breeze Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风 Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light
X-KDE-PluginInfo-Author=KDE Visual Design Group X-KDE-PluginInfo-Author=KDE Visual Design Group

2
templates/cpp-plasmoid/src/package/metadata.desktop
View File

@ -30,6 +30,7 @@ Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME} Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx Name[x-test]=xx%{APPNAME}xx
Name[zh_CN]=%{APPNAME} Name[zh_CN]=%{APPNAME}
Name[zh_TW]=%{APPNAME}
Comment=what your app does in a few words Comment=what your app does in a few words
Comment[ast]=lo que fai la to aplicación en poques pallabres Comment[ast]=lo que fai la to aplicación en poques pallabres
Comment[ca]=Què fa aquesta aplicació en poques paraules Comment[ca]=Què fa aquesta aplicació en poques paraules
@ -60,6 +61,7 @@ Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx Comment[x-test]=xxwhat your app does in a few wordsxx
Comment[zh_CN]=简单几个词概括您的小程序的功能 Comment[zh_CN]=简单几个词概括您的小程序的功能
Comment[zh_TW]=以數個字描述您的應用程式的用途
Icon=applications-system Icon=applications-system

2
templates/qml-plasmoid/package/metadata.desktop
View File

@ -30,6 +30,7 @@ Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME} Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx Name[x-test]=xx%{APPNAME}xx
Name[zh_CN]=%{APPNAME} Name[zh_CN]=%{APPNAME}
Name[zh_TW]=%{APPNAME}
Comment=what your app does in a few words Comment=what your app does in a few words
Comment[ast]=lo que fai la to aplicación en poques pallabres Comment[ast]=lo que fai la to aplicación en poques pallabres
Comment[ca]=Què fa aquesta aplicació en poques paraules Comment[ca]=Què fa aquesta aplicació en poques paraules
@ -60,6 +61,7 @@ Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx Comment[x-test]=xxwhat your app does in a few wordsxx
Comment[zh_CN]=简单几个词概括您的小程序的功能 Comment[zh_CN]=简单几个词概括您的小程序的功能
Comment[zh_TW]=以數個字描述您的應用程式的用途
Icon=applications-system Icon=applications-system
Type=Service Type=Service