Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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 2019-06-24 05:03:22 +02:00
parent d6c4cfeb74
commit c89de7f463
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/middleclickloader/metadata.desktop
View File

@ -33,7 +33,7 @@ Comment[es]=Cargar texto seleccionado en el portapapeles como URL
Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi
Comment[fr]=Charger l'URL sélectionnée dans le presse-papier
Comment[gl]=Cargar texto no portapapeis de selección como URL
Comment[id]=Muat teks dalam seleksi clipboard sebagai URL
Comment[id]=Muat teks dalam seleksi papan-klip sebagai URL
Comment[it]=Carica come URL il testo negli appunti della selezione
Comment[ko]=선택 클립보드에 있는 텍스트를 URL로 불러오기
Comment[nl]=Tekst laden in selectieklembord als URL