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:
l10n daemon script 2024-07-23 01:20:56 +00:00
parent abc6dae6df
commit 0af007b462
3 changed files with 5 additions and 1 deletions

View file

@ -33,7 +33,7 @@
"Description[hu]": "Finom elhalványulás a kijelentkező képernyőre",
"Description[ia]": "Dulcemente pallidi al schermo de abandono (logout)",
"Description[is]": "Láta skjáborð hverfa og útskráningarskjá birtast mjúklega",
"Description[it]": "Dissolvenza graduale alla schermata di uscita",
"Description[it]": "Dissolvenza graduale alla schermata di chiusura della sessione",
"Description[ja]": "ログアウト画面を滑らかに表示します",
"Description[ka]": "გასვლის ფანჯარაზე რბილად გადასვლა",
"Description[ko]": "로그아웃 화면으로 부드럽게 전환합니다",

View file

@ -14,6 +14,7 @@ Name[he]=בריזה בהירה
Name[hu]=Breeze Light
Name[ia]=Breeze Light (Brisa Ligier)
Name[is]=Breeze Light
Name[it]=Brezza chiaro
Name[ka]=Breeze ღია
Name[lt]=Breeze šviesus
Name[nl]=Breeze Light
@ -42,6 +43,7 @@ Comment[he]=בריזה בהירה מאת צוות העיצוב החזותי של
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[it]=Brezza chiaro a cura del VDG di KDE
Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან
Comment[lt]=Breeze šviesus pagal KDE VDG
Comment[nl]=Breeze Light door de KDE VDG

View file

@ -14,6 +14,7 @@ Name[he]=בריזה
Name[hu]=Breeze
Name[ia]=Breeze(Brisa)
Name[is]=Breeze
Name[it]=Brezza
Name[ka]=Breeze
Name[lt]=Breeze
Name[nl]=Breeze
@ -42,6 +43,7 @@ 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[it]=Brezza a cura del KDE VDG
Comment[ka]=Breeze KDE VDG-სგან
Comment[lt]=Breeze pagal KDE VDG
Comment[nl]=Breeze door de KDE VDG