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 2023-12-11 02:06:41 +00:00
parent 19672bc82f
commit d8c1022049
2 changed files with 4 additions and 0 deletions

View file

@ -14,6 +14,7 @@ Name[is]=KWin drápsaðstoð
Name[it]=Assistente Kill di KWin
Name[ka]=KWin-
Name[nl]=KWin-hulpprogramma voor kill (afbreken)
Name[pl]=Narzędzie pomocnicze kończące KWin
Name[sk]=KWin Kill Helper
Name[sl]=Kwin pomočnik odstranjevalnika
Name[ta]=ி ி ிி
@ -36,6 +37,7 @@ Comment[is]=Spyr hvort drepa eigi glugga sem svarar ekki
Comment[it]=Chiede se chiudere una finestra che non risponde
Comment[ka]=, ,
Comment[nl]=Vraagt of een niet responderend venster afgebroken moet worden
Comment[pl]=Pyta czy zakończyć okno, które nie odpowiada
Comment[sk]=Výzvy na zabitie nereagujúceho okna
Comment[sl]=Pozove, ali naj se odstrani neodzivno okno
Comment[ta]=ிி ி

View file

@ -14,6 +14,7 @@
"Description[it]": "Ingrandisce il cursore quando il puntatore viene spostato rapidamente avanti e indietro",
"Description[ka]": "კურსორის გადიდება, როცა მას წინ და უკან სწრაფად გააქანებთ",
"Description[nl]": "Maakt de cursor groter wanneer de aanwijzer snel heen en weer wordt bewogen",
"Description[pl]": "Powiększ wskaźnik, gdy przemieści się on szybko z jednego miejsca na drugie",
"Description[sk]": "Zväčší kurzor pri rýchlom pohybe ukazovateľa tam a späť",
"Description[sl]": "Poveča kazalec, kadar se kazalec hitro premika naprej in nazaj",
"Description[ta]": "சுட்டியை வேகமாக ஆட்டும்போது சுட்டிக்குறியைப் பெரிதாக்கும்",
@ -37,6 +38,7 @@
"Name[it]": "Scuoti il cursore",
"Name[ka]": "კურსორის ჯანჯღარი",
"Name[nl]": "Cursor schudden",
"Name[pl]": "Trzęsący się wskaźnik",
"Name[sk]": "Zatriasť kurzorom",
"Name[sl]": "Stresaj kazalko",
"Name[ta]": "சுட்டிக்குறியை ஆட்டு",