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 2022-05-30 01:44:23 +00:00
parent 55eadf0377
commit 3b6a392380

View file

@ -3,6 +3,28 @@
[Desktop Entry]
Name=Screenshot
Name[az]=Ekran şəkli
Name[ca]=Captura de pantalla
Name[ca@valencia]=Captura de pantalla
Name[cs]=Snímek obrazovky
Name[en_GB]=Screenshot
Name[es]=Captura de pantalla
Name[fi]=Ruutukaappaus
Name[fr]=Copie d'écran
Name[it]=Schermata
Name[ka]=
Name[ko]=
Name[nl]=Schermafdruk
Name[pt]=Captura
Name[pt_BR]=Captura de tela
Name[ro]=Captură de ecran
Name[sk]=Snímka obrazovky
Name[sl]=Slika zaslona
Name[sv]= Skärmbild
Name[tr]=Ekran görüntüsü
Name[uk]=Знімок вікна
Name[x-test]=xxScreenshotxx
Name[zh_CN]=
Icon=spectacle
Type=Service