yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 2024-07-06 01:18:59 +00:00
parent f20ccabe80
commit ce93b00285
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/shakecursor/cursors/Breeze_Light/index.theme
View file

@ -15,6 +15,7 @@ Name[hu]=Breeze Light
Name[ia]=Breeze Light (Brisa Ligier) Name[ia]=Breeze Light (Brisa Ligier)
Name[is]=Breeze Light Name[is]=Breeze Light
Name[ka]=Breeze ღია Name[ka]=Breeze ღია
Name[lt]=Breeze šviesus
Name[nl]=Breeze Light Name[nl]=Breeze Light
Name[pl]=Jasna Bryza Name[pl]=Jasna Bryza
Name[sl]=Sapica svetla Name[sl]=Sapica svetla
@ -41,6 +42,7 @@ Comment[hu]=Breeze Light a KDE VDG-től
Comment[ia]=Breeze (Brisa) Ligier per KDE VDG Comment[ia]=Breeze (Brisa) Ligier per KDE VDG
Comment[is]=Breeze Light frá KDE VDG Comment[is]=Breeze Light frá KDE VDG
Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან
Comment[lt]=Breeze šviesus pagal KDE VDG
Comment[nl]=Breeze Light door de KDE VDG Comment[nl]=Breeze Light door de KDE VDG
Comment[pl]=Jasna Bryza autorstwa KDE VDG Comment[pl]=Jasna Bryza autorstwa KDE VDG
Comment[sl]=Sapica svetla od KDE VDG Comment[sl]=Sapica svetla od KDE VDG

2
src/plugins/shakecursor/cursors/breeze_cursors/index.theme
View file

@ -15,6 +15,7 @@ Name[hu]=Breeze
Name[ia]=Breeze(Brisa) Name[ia]=Breeze(Brisa)
Name[is]=Breeze Name[is]=Breeze
Name[ka]=Breeze Name[ka]=Breeze
Name[lt]=Breeze
Name[nl]=Breeze Name[nl]=Breeze
Name[pl]=Bryza Name[pl]=Bryza
Name[sl]=Sapica Name[sl]=Sapica
@ -41,6 +42,7 @@ Comment[hu]=Breeze a KDE VDG-től
Comment[ia]=Breeze (Brisa) per le KDE VDG Comment[ia]=Breeze (Brisa) per le KDE VDG
Comment[is]=Breeze frá KDE VDG Comment[is]=Breeze frá KDE VDG
Comment[ka]=Breeze KDE VDG-სგან Comment[ka]=Breeze KDE VDG-სგან
Comment[lt]=Breeze pagal KDE VDG
Comment[nl]=Breeze door de KDE VDG Comment[nl]=Breeze door de KDE VDG
Comment[pl]=Bryza autorstwa KDE VDG Comment[pl]=Bryza autorstwa KDE VDG
Comment[sl]=Sapica od KDE VDG Comment[sl]=Sapica od KDE VDG