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-06-27 01:19:12 +00:00
parent 585dd069f7
commit 240af64c82
2 changed files with 44 additions and 0 deletions

View file

@ -1,3 +1,25 @@
[Icon Theme] [Icon Theme]
Name=Breeze Light Name=Breeze Light
Name[ar]=نسيم فاتح
Name[bg]=Breeze Светъл
Name[ca]=Brisa clara
Name[cs]=Breeze Světlé
Name[hu]=Breeze Light
Name[ia]=Breeze Light (Brisa Ligier)
Name[ka]=Breeze ღია
Name[sl]=Sapica svetla
Name[tr]=Esinti Açık
Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx
Comment=Breeze Light by the KDE VDG Comment=Breeze Light by the KDE VDG
Comment[ar]=نسيم فاتح من مجموعة تصميم كِيدِي
Comment[bg]=Breeze Светъл от KDE VDG
Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től
Comment[ia]=Breeze (Brisa) Ligier per KDE VDG
Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან
Comment[sl]=Sapica svetla od KDE VDG
Comment[tr]=KDE VDG tarafından Esinti Açık
Comment[uk]=Світла Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Light by the KDE VDGxx

View file

@ -1,3 +1,25 @@
[Icon Theme] [Icon Theme]
Name=Breeze Name=Breeze
Name[ar]=نسيم
Name[bg]=Breeze
Name[ca]=Brisa
Name[cs]=Breeze
Name[hu]=Breeze
Name[ia]=Breeze(Brisa)
Name[ka]=Breeze
Name[sl]=Sapica
Name[tr]=Esinti
Name[uk]=Breeze
Name[x-test]=xxBreezexx
Comment=Breeze by the KDE VDG Comment=Breeze by the KDE VDG
Comment[ar]=نسيم من مجموعة تصميم كِيدِي
Comment[bg]=Breeze от KDE VDG
Comment[ca]=Brisa, creat pel VDG del KDE
Comment[cs]=Breeze od KDE VDG
Comment[hu]=Breeze a KDE VDG-től
Comment[ia]=Breeze (Brisa) per le KDE VDG
Comment[ka]=Breeze KDE VDG-სგან
Comment[sl]=Sapica od KDE VDG
Comment[tr]=KDE VDG tarafından Esinti
Comment[uk]=Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze by the KDE VDGxx