reivilibre/breeze-icons-for-docpond
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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-11-19 12:13:49 +00:00
parent 91847b107c
commit 621349d2fe
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icons-dark/index.theme
View File

@ -1,6 +1,7 @@
[Icon Theme]
Name=Breeze Dark
Name[ca]=Brisa fosca
Name[ca@valencia]=Brisa fosca
Name[en_GB]=Breeze Dark
Name[es]=Brisa oscura
Name[fi]=Breeze Dark
@ -19,6 +20,7 @@ Name[x-test]=xxBreeze Darkxx
Comment=Default Plasma 5 Theme for Dark themes
Comment[ca]=Tema del Plasma 5 per defecte per temes foscos
Comment[ca@valencia]=Tema del Plasma 5 per defecte per temes foscos
Comment[en_GB]=Default Plasma 5 Theme for Dark themes
Comment[es]=Tema por omisión de Plasma 5 para temas oscuros
Comment[fi]=Plasma 5:n oletusteema tummille teemoille

2
icons/index.theme
View File

@ -2,6 +2,7 @@
Name=Breeze
Name[ast]=Breeze
Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[en_GB]=Breeze
Name[es]=Brisa
Name[fi]=Breeze
@ -20,6 +21,7 @@ Name[x-test]=xxBreezexx
Comment=Default Plasma 5 Theme
Comment[ca]=Tema del Plasma 5 per defecte
Comment[ca@valencia]=Tema del Plasma 5 per defecte
Comment[en_GB]=Default Plasma 5 Theme
Comment[es]=Tema por omisión de Plasma 5
Comment[fi]=Plasma 5:n oletusteema