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-03-14 05:38:31 +01:00
parent ebae2d6303
commit d7e2f921d7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ Name[es]=Brisa oscuro
Name[et]=Breeze Dark Name[et]=Breeze Dark
Name[eu]=Breeze iluna Name[eu]=Breeze iluna
Name[fi]=Breeze Dark Name[fi]=Breeze Dark
Name[fr]=Breeze foncé Name[fr]=Breeze sombre
Name[gd]=Dorch-oiteag Name[gd]=Dorch-oiteag
Name[gl]=Breeze escuro Name[gl]=Breeze escuro
Name[hu]=Breeze Dark Name[hu]=Breeze Dark
@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa fosca pel VDG del KDE
Comment[de]=Breeze-Dunkel von der KDE VDG Comment[de]=Breeze-Dunkel von der KDE VDG
Comment[es]=Brisa oscuro por KDE VDG Comment[es]=Brisa oscuro por KDE VDG
Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fi]=Breeze Dark KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG
Comment[gl]=Breeze escuro de KDE VDG Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG Comment[id]=Breeze Dark oleh KDE VDG
Comment[it]=Brezza scuro del KDE VDG Comment[it]=Brezza scuro del KDE VDG

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

@ -11,7 +11,7 @@ Name[es]=Brisa claro
Name[et]=Breeze Light Name[et]=Breeze Light
Name[eu]=Breeze argia Name[eu]=Breeze argia
Name[fi]=Breeze Light Name[fi]=Breeze Light
Name[fr]=Brise claire Name[fr]=Breeze clair
Name[gd]=Oiteag shoilleir Name[gd]=Oiteag shoilleir
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[hu]=Breeze Light Name[hu]=Breeze Light
@ -43,6 +43,7 @@ Comment[ca@valencia]=Brisa clara pel VDG del KDE
Comment[de]=Breeze-Hell von der KDE VDG Comment[de]=Breeze-Hell von der KDE VDG
Comment[es]=Brisa claro por KDE VDG Comment[es]=Brisa claro por KDE VDG
Comment[fi]=Breeze Light KDE VDG:ltä Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Breeze clair, par KDE VDG
Comment[gl]=Breeze claro de KDE VDG Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG Comment[id]=Breeze Light oleh KDE VDG
Comment[it]=Brezza chiaro del KDE VDG Comment[it]=Brezza chiaro del KDE VDG

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

@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa pel VDG del KDE
Comment[de]=Breeze von der KDE VDG Comment[de]=Breeze von der KDE VDG
Comment[es]=Brisa por KDE VDG Comment[es]=Brisa por KDE VDG
Comment[fi]=Breeze KDE VDG:ltä Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Breeze, par KDE VDG
Comment[gl]=Breeze de KDE VDG Comment[gl]=Breeze de KDE VDG
Comment[id]=Breeze oleh KDE VDG Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza del KDE VDG Comment[it]=Brezza del KDE VDG