SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
64d70029ec
commit
ec43eb08df
2 changed files with 8 additions and 0 deletions
|
@ -13,10 +13,12 @@ Name[fr]=Breeze clair
|
|||
Name[he]=בריזה בהירה
|
||||
Name[hu]=Breeze Light
|
||||
Name[ia]=Breeze Light (Brisa Ligier)
|
||||
Name[is]=Breeze Light
|
||||
Name[ka]=Breeze ღია
|
||||
Name[nl]=Breeze Light
|
||||
Name[pl]=Jasna Bryza
|
||||
Name[sl]=Sapica svetla
|
||||
Name[sv]=Breeze lätt
|
||||
Name[ta]=வெளிர் பிரீஸ்
|
||||
Name[tr]=Esinti Açık
|
||||
Name[uk]=Світла Breeze
|
||||
|
@ -37,10 +39,12 @@ Comment[fr]=Breeze clair par le groupe de conception graphique de KDE
|
|||
Comment[he]=בריזה בהירה מאת צוות העיצוב החזותי של KDE
|
||||
Comment[hu]=Breeze Light a KDE VDG-től
|
||||
Comment[ia]=Breeze (Brisa) Ligier per KDE VDG
|
||||
Comment[is]=Breeze Light frá KDE VDG
|
||||
Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან
|
||||
Comment[nl]=Breeze Light door de KDE VDG
|
||||
Comment[pl]=Jasna Bryza autorstwa KDE VDG
|
||||
Comment[sl]=Sapica svetla od KDE VDG
|
||||
Comment[sv]=Breeze lätt av KDE:s visuella designgrupp
|
||||
Comment[ta]=கே.டீ.யீ. VDG வழங்கும் வெளிர் பிரீஸ்
|
||||
Comment[tr]=KDE VDG tarafından Esinti Açık
|
||||
Comment[uk]=Світла Breeze, автори — KDE VDG
|
||||
|
|
|
@ -13,10 +13,12 @@ Name[fr]=Breeze
|
|||
Name[he]=בריזה
|
||||
Name[hu]=Breeze
|
||||
Name[ia]=Breeze(Brisa)
|
||||
Name[is]=Breeze
|
||||
Name[ka]=Breeze
|
||||
Name[nl]=Breeze
|
||||
Name[pl]=Bryza
|
||||
Name[sl]=Sapica
|
||||
Name[sv]=Breeze
|
||||
Name[ta]=பிரீஸ்
|
||||
Name[tr]=Esinti
|
||||
Name[uk]=Breeze
|
||||
|
@ -37,10 +39,12 @@ Comment[fr]=Breeze par le groupe de conception graphique de KDE
|
|||
Comment[he]=בריזה מאת צוות העיצוב החזותי של KDE
|
||||
Comment[hu]=Breeze a KDE VDG-től
|
||||
Comment[ia]=Breeze (Brisa) per le KDE VDG
|
||||
Comment[is]=Breeze frá KDE VDG
|
||||
Comment[ka]=Breeze KDE VDG-სგან
|
||||
Comment[nl]=Breeze door de KDE VDG
|
||||
Comment[pl]=Bryza autorstwa KDE VDG
|
||||
Comment[sl]=Sapica od KDE VDG
|
||||
Comment[sv]=Breeze av KDE:s visuella designgrupp
|
||||
Comment[ta]=கே.டீ.யீ. VDG வழங்கும் பிரீஸ்
|
||||
Comment[tr]=KDE VDG tarafından Esinti
|
||||
Comment[uk]=Breeze, автори — KDE VDG
|
||||
|
|
Loading…
Reference in a new issue