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-09-14 01:22:41 +00:00
parent 3c6c1c4be8
commit 3541a2c702
2 changed files with 3 additions and 3 deletions

View file

@ -94,7 +94,7 @@ Description[ka]=Kigo -ის ნაგულისხმევი თემა K
Description[kk]=Kigo-ның KDE 4-тегі нақышы Description[kk]=Kigo-ның KDE 4-тегі нақышы
Description[km]= Kigo KDE 4 Description[km]= Kigo KDE 4
Description[ko]=KDE 4 Kigo Description[ko]=KDE 4 Kigo
Description[lv]=Kigo noklusējuma tēma priekš KDE4 Description[lv]=Kigo KDE4 noklusējuma motīvs
Description[mr]= ि ि Description[mr]= ि ि
Description[nb]=Standard Kigo-tema for KDE4 Description[nb]=Standard Kigo-tema for KDE4
Description[nds]=Kigo-Standardmuster för KDE 4 Description[nds]=Kigo-Standardmuster för KDE 4

View file

@ -28,7 +28,7 @@ Name[ka]=უბრალო
Name[kk]=Жәй Name[kk]=Жәй
Name[km]= Name[km]=
Name[ko]= Name[ko]=
Name[lv]=Vienkārša Name[lv]=Vienkāršs
Name[mr]= Name[mr]=
Name[nb]=Enkelt Name[nb]=Enkelt
Name[nds]=Eenfach Name[nds]=Eenfach
@ -79,7 +79,7 @@ Description[ka]=Kigo-ის ნაგულისხმევ თემაზე
Description[kk]=Kigo-ның Artturo Silvia әдеттінің негізінде келтірген жәй нақышы Description[kk]=Kigo-ның Artturo Silvia әдеттінің негізінде келтірген жәй нақышы
Description[km]= Kigo Arturo Silva Description[km]= Kigo Arturo Silva
Description[ko]=Arturo Silva Description[ko]=Arturo Silva
Description[lv]=Vienkārša Kigo tēma, kas balstīta uz noklusētās tēmas, kuras autors ir Arturo Silva Description[lv]=Vienkāršs Kigo motīvs, kas balstīts Arturo Silva veidotajā noklusējuma motīvā
Description[mr]= ि ि ि Description[mr]= ि ि ि
Description[nb]=Enkelt Kigo-tena basert på Standard-temaet av Arturo Silva Description[nb]=Enkelt Kigo-tena basert på Standard-temaet av Arturo Silva
Description[nds]=Eenfach Kigo-Muster, buut op Arturo Silva sien Standard-Muster Description[nds]=Eenfach Kigo-Muster, buut op Arturo Silva sien Standard-Muster