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:
parent
f9b054d131
commit
8752e67f83
7 changed files with 54 additions and 39 deletions
|
@ -21,6 +21,7 @@
|
|||
"Description[hu]": "Fájl küldése egy másik eszközre a KDE Connecttel",
|
||||
"Description[ia]": "Invia file a altere dispositivo usante KDE Connect",
|
||||
"Description[id]": "Kirim file ke perangkat lain menggunakan KDE Connect",
|
||||
"Description[is]": "Senda skrár á annað tæki með KDE Connect",
|
||||
"Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
|
||||
"Description[ko]": "KDE Connect로 다른 장치에 파일 보내기",
|
||||
"Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect",
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
"Description[hu]": "A vágólap megosztása az eszközök között",
|
||||
"Description[ia]": "Comparti le area de transferentia inter dispositivos",
|
||||
"Description[id]": "Berbagi clipboard antara perangkat",
|
||||
"Description[is]": "Deildu klippispjaldinu milli tækja",
|
||||
"Description[it]": "Condividi gli appunti tra i dispositivi",
|
||||
"Description[ja]": "デバイス間でクリップボードを共有",
|
||||
"Description[ko]": "장치간 클립보드 공유",
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
"Description[hu]": "Rendszer zárolása",
|
||||
"Description[ia]": "Bloca tu systemas",
|
||||
"Description[id]": "Menguncikan sistemmu",
|
||||
"Description[is]": "Læsir kerfunum þínum",
|
||||
"Description[it]": "Blocca i tuoi sistemi",
|
||||
"Description[ko]": "내 시스템 잠그기",
|
||||
"Description[lt]": "Užrakina jūsų sistemą",
|
||||
|
|
|
@ -117,6 +117,7 @@
|
|||
"Name[hu]": "Médialejátszás felfüggesztése",
|
||||
"Name[ia]": "Pausa medios durante telephonatas",
|
||||
"Name[id]": "Pause media during calls",
|
||||
"Name[is]": "Setja efni í bið á meðan símtölum stendur",
|
||||
"Name[it]": "Sospendi i contenuti multimediali durante le chiamate",
|
||||
"Name[ja]": "通話中はメディアを一時停止",
|
||||
"Name[ko]": "통화 중 미디어 일시 정지",
|
||||
|
|
|
@ -108,6 +108,7 @@
|
|||
"Name[hu]": "Távoli rendszerhangerő",
|
||||
"Name[ia]": "Volumine de systema remote",
|
||||
"Name[id]": "Remote system volume",
|
||||
"Name[is]": "Hljóðstyrkur fjartengds kerfis",
|
||||
"Name[it]": "Volume del sistema remoto",
|
||||
"Name[ja]": "リモートシステムの音量",
|
||||
"Name[ko]": "원격 시스템 음량",
|
||||
|
|
|
@ -86,6 +86,7 @@
|
|||
"Name[fr]": "Écran virtuel",
|
||||
"Name[ia]": "Monitor virtual",
|
||||
"Name[id]": "Monitor Virtual",
|
||||
"Name[is]": "Sýndarskjár",
|
||||
"Name[it]": "Schermo virtuale",
|
||||
"Name[ko]": "가상 모니터",
|
||||
"Name[nl]": "Virtuele monitor",
|
||||
|
|
|
@ -1,44 +1,53 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=معالج عناوين «كدي المتّصل»
|
||||
Name[ast]=Remanador d'URLs de KDE Connect
|
||||
Name[az]=KDE Connect URL işləyicisi
|
||||
Name[bg]=KDE Connect URL манипулатор
|
||||
Name[ca]=Gestor d'URL del KDE Connect
|
||||
Name[ca@valencia]=Gestor d'URL de KDE Connect
|
||||
Name[cs]=Nástroj pro práci s URL v KDE Connect
|
||||
Name[da]=URL-håndtering til KDE Connect
|
||||
Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
|
||||
Name[el]=Χειριστής URL του KDE Connect
|
||||
Name[en_GB]=KDE Connect URL Handler
|
||||
Name[es]=Controlador de URL de KDE Connect
|
||||
Name[et]=KDE Connecti URL-ide käitleja
|
||||
Name[eu]=KDE Connect-en URL maneiatzailea
|
||||
Name[fi]=KDE Connectin verkko-osoitekäsittelijä
|
||||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||
Name[hu]=KDE Connect URL kezelő
|
||||
Name[ia]=Gerente de URL de KDE Connect
|
||||
Name[id]=Penanganan URL KDE Connect
|
||||
Name[it]=Gestore URL di KDE Connect
|
||||
Name[ja]=KDE Connect URL ハンドラ
|
||||
Name[ko]=KDE Connect URL 처리기
|
||||
Name[lt]=KDE Connect URL doroklė
|
||||
Name[nl]=URL behandelaar van KDE-Connect
|
||||
Name[nn]=KDE Connect adressehandsamar
|
||||
Name[pl]=Obsługa adresów URL dla KDE Connect
|
||||
Name[pt]=Tratamento de URL's do KDE Connect
|
||||
Name[pt_BR]=Tratamento de URLs do KDE Connect
|
||||
Name[ro]=Manipulant de URL KDE Connect
|
||||
Name[ru]=Обработчик адресов URL в KDE Connect
|
||||
Name[sk]=KDE Connect URL Handler
|
||||
Name[sl]=Upravitelj naslovov KDE Connect
|
||||
Name[sv]=KDE-anslut webbadresshanterare
|
||||
Name[ta]=கே.டீ.யீ. கனெக்ட் முகவரி கையாளி
|
||||
Name[tr]=KDE Connect URL İşleyicisi
|
||||
Name[uk]=Обробник адрес KDE Connect
|
||||
Name[x-test]=xxKDE Connect URL Handlerxx
|
||||
Name[zh_CN]=KDE Connect URL 处理程序
|
||||
Name[zh_TW]=KDE 連線網址處理器
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[az]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
Name[ca@valencia]=KDE Connect
|
||||
Name[cs]=KDE Connect
|
||||
Name[da]=KDE Connect
|
||||
Name[de]=KDE Connect
|
||||
Name[el]=KDE Connect
|
||||
Name[en_GB]=KDE Connect
|
||||
Name[es]=KDE Connect
|
||||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE Connect
|
||||
Name[ia]=KDE Connect
|
||||
Name[id]=KDE Connect
|
||||
Name[is]=KDE Connect
|
||||
Name[it]=KDE Connect
|
||||
Name[ja]=KDE Connect
|
||||
Name[ko]=KDE Connect
|
||||
Name[lt]=KDE Connect
|
||||
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
|
||||
Name[nl]=KDE Connect
|
||||
Name[nn]=KDE Connect
|
||||
Name[pl]=KDE Connect
|
||||
Name[pt]=KDE Connect
|
||||
Name[pt_BR]=KDE Connect
|
||||
Name[ro]=KDE Connect
|
||||
Name[ru]=KDE Connect
|
||||
Name[sk]=KDE Connect
|
||||
Name[sl]=KDE Connect
|
||||
Name[sr]=КДЕ‑конекција
|
||||
Name[sr@ijekavian]=КДЕ‑конекција
|
||||
Name[sr@ijekavianlatin]=KDE‑konekcija
|
||||
Name[sr@latin]=KDE‑konekcija
|
||||
Name[sv]=KDE-anslut
|
||||
Name[ta]=கே.டீ.யீ. கனெக்ட்
|
||||
Name[tr]=KDE Connect
|
||||
Name[uk]=З’єднання KDE
|
||||
Name[x-test]=xxKDE Connectxx
|
||||
Name[zh_CN]=KDE Connect
|
||||
Name[zh_TW]=KDE 連線
|
||||
Exec=kdeconnect-handler %U
|
||||
Icon=kdeconnect
|
||||
Type=Application
|
||||
|
|
Loading…
Reference in a new issue