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-12-24 05:20:13 +01:00
parent 2f99869c10
commit f1ec1433c8
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

@ -15,7 +15,7 @@ Name[gd]=Ball-eisimpleir le liosta de dhealbhagan uinneige
Name[gl]=Exemplo de lista de miniaturas de xanelas
Name[hu]=Ablakbélyegképek lista - példa
Name[ia]=Lista de miniaturas de fenestra de exemplo
Name[id]=Contoh daftar thumbnail jendela
Name[id]=Contoh daftar thumbnail window
Name[it]=Esempio di elenco di miniature delle finestre
Name[ko]=창 미리 보기 그림 목록 예제
Name[nb]=Eksempelliste over vindus-småbilder
@ -54,7 +54,7 @@ Comment[gd]=Eisimpleir a sheallas dhut mar a nochdas tu dealbhagan uinneagan
Comment[gl]=Un exemplo que como mostrar miniaturas de xanelas
Comment[hu]=Példa ablakok bélyegképeinek megjelenítésére
Comment[ia]=Exemplo monstrante como monstrar miniaturas de fenestra
Comment[id]=Menampilkan contoh bagaimana untuk menampilkan thumbnail jendela
Comment[id]=Menampilkan contoh bagaimana untuk menampilkan thumbnail window
Comment[it]=Esempio che mostra come visualizzare le miniature delle finestre
Comment[ko]=창 미리 보기 그림을 보여 주는 방법 예제
Comment[nb]=Eksempel som viser hvordan vindus-småbildevisning lages