marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 09:18:07 +00:00
Code Issues 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 2023-07-28 02:22:33 +00:00
parent 0b5e02fcf1
commit 1eee8e5e8f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
View file

@ -64,7 +64,7 @@ Name[hu]=Rögzítve
Name[ia]=Capturate Name[ia]=Capturate
Name[is]=Gripið Name[is]=Gripið
Name[it]=Catturato Name[it]=Catturato
Name[ka]=დაჭერილია Name[ka]=გადაღებულია
Name[ko]=캡처됨 Name[ko]=캡처됨
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[nn]=Opptak Name[nn]=Opptak
@ -101,7 +101,7 @@ Comment[hu]=Rögzítve
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[is]=Gripið Comment[is]=Gripið
Comment[it]=Catturato Comment[it]=Catturato
Comment[ka]=დაჭერილია Comment[ka]=გადაღებულია
Comment[ko]=캡처됨 Comment[ko]=캡처됨
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[nn]=Opptak Comment[nn]=Opptak

4
quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
View file

@ -64,7 +64,7 @@ Name[hu]=Rögzítve
Name[ia]=Capturate Name[ia]=Capturate
Name[is]=Gripið Name[is]=Gripið
Name[it]=Catturato Name[it]=Catturato
Name[ka]=დაჭერილია Name[ka]=გადაღებულია
Name[ko]=캡처됨 Name[ko]=캡처됨
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[nn]=Opptak Name[nn]=Opptak
@ -101,7 +101,7 @@ Comment[hu]=Rögzítve
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[is]=Gripið Comment[is]=Gripið
Comment[it]=Catturato Comment[it]=Catturato
Comment[ka]=დაჭერილია Comment[ka]=გადაღებულია
Comment[ko]=캡처됨 Comment[ko]=캡처됨
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[nn]=Opptak Comment[nn]=Opptak