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
2025-11-09 03:31:47 +00:00
parent eed2fe43ca
commit 041029d865
3 changed files with 4 additions and 0 deletions

View File

@@ -26,6 +26,7 @@
"Description[it]": "Accesso alla riga di comando",
"Description[ka]": "ბრძანების სტრიქონთან წვდომა",
"Description[ko]": "명령행 접근",
"Description[lt]": "Prieiga prie komandų eilutės",
"Description[lv]": "Komandrindas piekļuve",
"Description[nl]": "Toegang tot de opdrachtregel",
"Description[nn]": "Kommandolinjetilgang",
@@ -70,6 +71,7 @@
"Name[it]": "Emulatore di terminale",
"Name[ka]": "ტერმინალის ემულატორი",
"Name[ko]": "터미널 에뮬레이터",
"Name[lt]": "Terminalo emuliatorius",
"Name[lv]": "Termināļa emulators",
"Name[nl]": "Terminalprogramma",
"Name[nn]": "Terminalemulator",

View File

@@ -27,6 +27,7 @@
"Name[it]": "Comandi rapidi",
"Name[ka]": "სწრაფი ბრძანებები",
"Name[ko]": "빠른 명령",
"Name[lt]": "Greitosios komandos",
"Name[lv]": "Ātrās komandas",
"Name[nl]": "Snelle commando's",
"Name[nn]": "Snøggkommandoar",

View File

@@ -26,6 +26,7 @@
"Name[it]": "Gestore SSH",
"Name[ka]": "SSH-ის მმართველი",
"Name[ko]": "SSH 관리자",
"Name[lt]": "SSH tvarkytuvė",
"Name[lv]": "SSH pārvaldnieks",
"Name[nl]": "SSH-beheerder",
"Name[nn]": "SSH-handsamar",