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-18 10:30:07 +00:00
parent 44d30e0ddf
commit de28930960
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

@ -3,6 +3,7 @@ Name=Breeze Dark
Name[ca]=Brisa fosca
Name[en_GB]=Breeze Dark
Name[es]=Brisa oscura
Name[fi]=Breeze Dark
Name[gl]=Breeze escuro
Name[ko]=어두운 Breeze
Name[nl]=Breeze Dark
@ -20,6 +21,7 @@ Comment=Default Plasma 5 Theme for Dark themes
Comment[ca]=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
Comment[gl]=Tema predeterminado de Plasma 5 para temas escuros
Comment[ko]=기본 Plasma 5 어두운 테마
Comment[nl]=Standaard Plasma 5 thema voor donkere thema's

2
icons/index.theme
View File

@ -4,6 +4,7 @@ Name[ast]=Breeze
Name[ca]=Brisa
Name[en_GB]=Breeze
Name[es]=Brisa
Name[fi]=Breeze
Name[gl]=Breeze
Name[ko]=Breeze
Name[nl]=Breeze
@ -21,6 +22,7 @@ Comment=Default Plasma 5 Theme
Comment[ca]=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
Comment[gl]=Tema predeterminado de Plasma 5
Comment[ko]=기본 Plasma 5 테마
Comment[nl]=Standaard Plasma 5 thema