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 2019-02-22 05:35:03 +01:00
parent 06ad76df24
commit 32e16e8c98
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ Comment[gd]=Aplaid-eisimpleir a sheallas mar a chleachdas tu modailean leabaicht
Comment[gl]=Un miniaplicativo de exemplo que mostra como usar os modelos incorporados nos DataEngines
Comment[hu]=Példa kisalkalmazás a DataEngine-be ágyazott modellek használatának bemutatására
Comment[ia]=Applet de exemplo que monstra como usar Models (modellos) insertate in DataEngines (Motores de datos)
Comment[id]=Contoh applet yang menampilkan bagaimana untuk menggunakan Model terbenam dalam DataEngine
Comment[id]=Contoh applet yang menampilkan bagaimana untuk menggunakan Model tertanam dalam DataEngine
Comment[it]=Applet di esempio che mostra come utilizzare i modelli integrati nei motori di dati
Comment[ko]=데이터 엔진에 임베드된 모델 사용법 시연 애플릿
Comment[nb]=Eksempel-applet som viser bruk av Modeller innebygget i DataEngines

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

@ -44,6 +44,7 @@ Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca pel VDG del KDE
Comment[es]=Brisa oscuro por KDE VDG
Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG
Comment[nl]=Breeze Dark door de KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE
Comment[pt_BR]=Breeze Dark pelo KDE VDG

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

@ -41,6 +41,7 @@ Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara pel VDG del KDE
Comment[es]=Brisa claro por KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG
Comment[nl]=Breeze Light door de KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE
Comment[pt_BR]=Breeze Light pelo KDE VDG

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

@ -44,6 +44,7 @@ Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[es]=Brisa por KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[id]=Breeze oleh KDE VDG
Comment[nl]=Breeze door de KDE VDG
Comment[pt]=Brisa da VDG do KDE
Comment[pt_BR]=Breeze pelo KDE VDG