1
0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00

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-01-10 02:08:11 +00:00
parent b08d0387e0
commit 1160a4ae0b
2 changed files with 3 additions and 0 deletions

View File

@@ -90,6 +90,7 @@ GenericName[eu]=Mahaigaina partekatzea (VNC)
GenericName[fi]=Työpöydän jakaminen (VNC)
GenericName[fr]=Partage de bureaux (VNC)
GenericName[gl]=Compartir o escritorio (VNC)
GenericName[hu]=Munkaasztal-megosztás (VNC)
GenericName[ia]=Compartir de scriptorio (VNC)
GenericName[it]=Condivisione del desktop (VNC)
GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC).

View File

@@ -16,6 +16,7 @@ Name[eu]=KRFBren alegiazko monitorea
Name[fi]=KRFB:n virtuaalinäyttö
Name[fr]=Moniteur virtuel « Krfb »
Name[gl]=Monitor virtual de KRFB
Name[hu]=KRFB virtuális monitor
Name[ia]=Virtual Monitor de KRFB
Name[it]=Monitor virtuale di KRFB
Name[ka]=KRFB-
@@ -46,6 +47,7 @@ Comment[eu]=Urruneko alegiazko monitorea
Comment[fi]=Virtuaalinen etänäyttö
Comment[fr]=Moniteur virtuel distant
Comment[gl]=Monitor virtual remoto
Comment[hu]=Távoli virtuális monitor
Comment[ia]=Monitor Virtual Remote
Comment[it]=Monitor virtuale remoto
Comment[ka]=