From a41a0033047e1f619fd83d626c840f5588a486dc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 9 Feb 2024 01:13:54 +0000 Subject: [PATCH] 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" --- krfb/krfb.notifyrc | 2 +- krfb/org.kde.krfb.desktop | 3 ++- krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/krfb/krfb.notifyrc b/krfb/krfb.notifyrc index d40b7f8b..d62b31d6 100644 --- a/krfb/krfb.notifyrc +++ b/krfb/krfb.notifyrc @@ -37,7 +37,7 @@ Comment[ka]=სამუშაო მაგიდის გაზიარებ Comment[kk]=Үстелді ортақтастыру Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ Comment[ko]=데스크톱 공유 -Comment[lt]=Dalinimasis darbalaukiu +Comment[lt]=Darbalaukio bendrinimas Comment[lv]=Darbvirsmas koplietošana Comment[mk]=Делење на работната површина Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍ diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop index 8f5e6054..2721f8cc 100755 --- a/krfb/org.kde.krfb.desktop +++ b/krfb/org.kde.krfb.desktop @@ -96,6 +96,7 @@ GenericName[ia]=Compartir de scriptorio (VNC) GenericName[it]=Condivisione del desktop (VNC) GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC). GenericName[ko]=데스크톱 공유(VNC) +GenericName[lt]=Darbalaukio bendrinimas (VNC) GenericName[nl]=Bureaublad delen (VNC) GenericName[nn]=Skrivebordsdeling (VNC) GenericName[pl]=Współdzielenie pulpitu (VNC) @@ -148,7 +149,7 @@ Comment[ka]=სამუშაო მაგიდის გაზიარებ Comment[kk]=Үстелді ортақтастыру Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ Comment[ko]=데스크톱 공유 -Comment[lt]=Dalinimasis darbalaukiu +Comment[lt]=Darbalaukio bendrinimas Comment[lv]=Darbvirsmas koplietošana Comment[mk]=Делење на работната површина Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍ diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake index 1c752c32..32087c86 100644 --- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake +++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake @@ -22,6 +22,7 @@ Name[ia]=Virtual Monitor de KRFB Name[it]=Monitor virtuale di KRFB Name[ka]=KRFB-ის ვირტუალური ეკრანი Name[ko]=KRFBs 가상 모니터 +Name[lt]=KRFBs virtualus monitorius Name[nl]=Virtuele monitor van KRFB Name[nn]=KRFBs virtuell skjerm Name[pl]=Monitor wirtualny KRFB @@ -55,6 +56,7 @@ Comment[ia]=Monitor Virtual Remote Comment[it]=Monitor virtuale remoto Comment[ka]=დაშორებული ვირტუალური ეკრანი Comment[ko]=원격 가상 모니터 +Comment[lt]=Nuotolinis virtualus monitorius Comment[nl]=Virtual Monitor op afstand Comment[nn]=Virtuell skjerm for ekstern ressurs Comment[pl]=Zdalny monitor wirtualny