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 2020-10-05 06:03:37 +02:00
parent 3073465b82
commit af5e487a45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/applets/windowthumbnails/metadata.desktop
View File

@ -18,7 +18,7 @@ Name[hu]=Ablakbélyegképek lista - példa
Name[ia]=Lista de miniaturas de fenestra de exemplo Name[ia]=Lista de miniaturas de fenestra de exemplo
Name[id]=Contoh daftar gambar-mini window Name[id]=Contoh daftar gambar-mini window
Name[it]=Esempio di elenco di miniature delle finestre Name[it]=Esempio di elenco di miniature delle finestre
Name[ko]=창 미리 보기 그림 목록 예제 Name[ko]=창 축소판 목록 예제
Name[nb]=Eksempelliste over vindus-småbilder Name[nb]=Eksempelliste over vindus-småbilder
Name[nds]=Bispill-Finstervöransichten-List Name[nds]=Bispill-Finstervöransichten-List
Name[nl]=Voorbeeld van lijst met miniaturen van vensters Name[nl]=Voorbeeld van lijst met miniaturen van vensters
@ -61,7 +61,7 @@ Comment[hu]=Példa ablakok bélyegképeinek megjelenítésére
Comment[ia]=Exemplo monstrante como monstrar miniaturas de fenestra Comment[ia]=Exemplo monstrante como monstrar miniaturas de fenestra
Comment[id]=Menampilkan contoh bagaimana untuk menampilkan gambar-mini window Comment[id]=Menampilkan contoh bagaimana untuk menampilkan gambar-mini window
Comment[it]=Esempio che mostra come visualizzare le miniature delle finestre Comment[it]=Esempio che mostra come visualizzare le miniature delle finestre
Comment[ko]=창 미리 보기 그림을 보여 주는 방법 예제 Comment[ko]=창 축소판을 보여 주는 방법 예제
Comment[nb]=Eksempel som viser hvordan vindus-småbildevisning lages Comment[nb]=Eksempel som viser hvordan vindus-småbildevisning lages
Comment[nds]=En Bispill, dat wiest, wodennig sik Finstervöransichten dorstellen laat Comment[nds]=En Bispill, dat wiest, wodennig sik Finstervöransichten dorstellen laat
Comment[nl]=Voorbeeld van hoe miniaturen van vensters te tonen Comment[nl]=Voorbeeld van hoe miniaturen van vensters te tonen