From ec2204fbe183689c8c5d755e2c023dcece231e44 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 29 Jan 2020 09:28:27 +0100 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" --- effects/eyeonscreen/package/metadata.desktop | 2 +- effects/fadedesktop/package/metadata.desktop | 4 ++-- effects/login/package/metadata.desktop | 2 +- effects/windowaperture/package/metadata.desktop | 2 +- kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop | 6 +++--- kcmkwin/kwindesktop/package/metadata.desktop | 4 ++-- kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 +- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 2 +- scripts/desktopchangeosd/metadata.desktop | 4 ++-- tabbox/kwindesktopswitcher.desktop | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 3646fdc35f..4de245e6eb 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -59,7 +59,7 @@ Comment[he]=שואב חלונות לשולחן עבודה כדי להראות א Comment[hu]=Az asztalba szippantja az ablakokat az asztal megjelenítéséhez, hogy ezzel valami fontosra emlékeztesse. Comment[id]=Cucutkan window ke desktop untuk tampil kelak. Ini mungkin mengingatkanmu tentang sesuatu. Comment[it]=Risucchia le finestre nel desktop per mostrare l'ultima. Potrebbe ricordarti qualcosa. -Comment[ko]=창을 데스크톱으로 흡수시켜 데스크톱을 표시합니다. +Comment[ko]=창을 바탕 화면으로 흡수시켜 바탕 화면을 표시합니다. Comment[lt]=Įtraukti langus į darbalaukį, kad jis būtų rodomas. Tai jums gali kai ką priminti. Comment[nb]=Sug vinduer inn i skrivebordet for å vise det. Dette minner deg kanskje om noe. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop index 12ec6cdb79..1008bc73e4 100644 --- a/effects/fadedesktop/package/metadata.desktop +++ b/effects/fadedesktop/package/metadata.desktop @@ -32,7 +32,7 @@ Name[ja]=デスクトップのフェード Name[kk]=Біртіндеп ауысу Name[km]=ធ្វើ​ឲ្យ​ផ្ទៃតុលេច​បន្តិចម្ដងៗ Name[kn]=ಗಣಕತೆರೆಯನ್ನು ಮಬ್ಬಾಗಿಸು -Name[ko]=데스크톱 페이드 +Name[ko]=바탕 화면 페이드 Name[lt]=Pamažu atsirandantis/išnykstantis darbalaukis Name[lv]=Sapludināt darbvirsmu Name[mai]=Fade Desktop @@ -97,7 +97,7 @@ Comment[ja]=仮想デスクトップの切り替えにフェード効果をか Comment[kk]=Виртуалды үстелді ауыстыруды біртіндеп көрсету Comment[km]=ស្រមោល​រវាង​ផ្ទៃតុ​និម្មិត នៅពេល​ប្ដូរ​រវាង​ពួកវា Comment[kn]=ವಾಸ್ತವಪ್ರಾಯ(ವರ್ಚುವಲ್) ಗಣಕತೆರೆಗಳ ನಡುವೆ ಬದಲಾಯಿಸುವಾಗ ಮಬ್ಬಾಗಿಸು -Comment[ko]=가상 데스크톱 사이를 전환할 때 페이드 효과를 사용합니다 +Comment[ko]=가상 바탕 화면 사이를 전환할 때 페이드 효과를 사용합니다 Comment[lt]=Išblukinti, perjungiant virtualiuosius darbalaukius Comment[lv]=Plūstoši pārslēgties starp vituālajām darbvirsmām Comment[ml]=വെര്‍ച്വല്‍ പണിയിടങ്ങള്‍ക്കിടക്ക് സ്വിച്ച് ചെയ്യുമ്പോള്‍ മങ്ങിപ്പോകുന്നു. diff --git a/effects/login/package/metadata.desktop b/effects/login/package/metadata.desktop index d17c0c41b4..24fa6f42f2 100644 --- a/effects/login/package/metadata.desktop +++ b/effects/login/package/metadata.desktop @@ -117,7 +117,7 @@ Comment[ja]=ログイン時に滑らかにデスクトップを表示します Comment[kk]=Кіргенде үстелге біртіндеп ауысу Comment[km]=លិច​​បន្តិចម្ដងៗ​ទៅ​ផ្ទៃតុ​នៅពេល​ចូល Comment[kn]=ಪ್ರವೇಶಿಸುವಾಗ (ಲಾಗಿಂಗ್ ಇನ್), ನಾಜೂಕಾಗಿ ಗಣಕತೆರೆಗೆ ಮಸುಕುಗೊಳಿಸು -Comment[ko]=로그인할 때 부드럽게 데스크톱을 보여줍니다 +Comment[ko]=로그인할 때 부드럽게 바탕 화면을 보여 줍니다 Comment[lt]=Prisijungiant, glotniai pamažu išryškina darbalaukį Comment[lv]=Gludeni parādīt darbvirsmu, piesakoties Comment[ml]=അകത്തേക്ക് കടക്കുംബോള്‍ പണിയിടത്തിലേക്ക് തനിയെ സ്മൂത് ആയി കടക്കുന്നു diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 0c620b5702..00fc5c44f8 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -58,7 +58,7 @@ Comment[ia]=Move fenestra a le angulos quando monstra scriptorio Comment[id]=Window pindah ke sudut ketika menampilkan desktop Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます -Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동 +Comment[ko]=바탕 화면을 표시할 때 창을 모서리로 이동 Comment[lt]=Rodant darbalaukį, perkelti langus į kampus Comment[nb]=Flytt vindu til hjørnene mens skrivebordet vises Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad diff --git a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop index 84a82038df..5725b7dae7 100644 --- a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop +++ b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop @@ -43,7 +43,7 @@ Name[ja]=仮想デスクトップ Name[kk]=Виртуалды Үстелдер Name[km]=ផ្ទៃតុ​និម្មិត Name[kn]=ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗಳು -Name[ko]=가상 데스크톱 +Name[ko]=가상 바탕 화면 Name[lt]=Virtualūs darbalaukiai Name[lv]=Virtuālās darbvirsmas Name[mr]=आभासी डेस्कटॉप @@ -87,7 +87,7 @@ Comment[gl]=Configurar a navegación, cantidade e disposición dos escritorios v Comment[ia]=Configura navigation, numero e disposition de scriptorios virtual Comment[id]=Konfigurasikan navigasi, nomor dan tataletak desktop virtual Comment[it]=Configura navigazione, numero e disposizione dei desktop virtuali -Comment[ko]=가상 데스크톱 탐색, 개수, 레이아웃 설정 +Comment[ko]=가상 바탕 화면 탐색, 개수, 레이아웃 설정 Comment[lt]=Konfigūruoti virtualių darbalaukių naršymą, skaičių ir išdėstymą Comment[nl]=Navigatie, aantal en indeling van virtuele bureaubladen configureren Comment[nn]=Set opp navigering, nummer og vising av virtuelle skrivebord @@ -121,7 +121,7 @@ X-KDE-Keywords[id]=desktop,desktop,jumlah,desktop virtual,banyak desktop,halaman X-KDE-Keywords[it]=desktop,numero,desktop virtuali,desktop multipli,cambiadesktop,oggetto cambiadesktop,applet cambiadesktop,impostazioni del cambiadesktop X-KDE-Keywords[kk]=desktop,desktops,number,virtual desktop,multiple desktops,pager,pager widget,pager applet,pager settings X-KDE-Keywords[km]=desktop,desktops,number,virtual desktop,multiple desktops,pager,pager widget,pager applet,pager settings -X-KDE-Keywords[ko]=desktop,desktops,number,virtual desktop,multiple desktops,pager,pager widget,pager applet,pager settings,데스크톱,가상 데스크톱,다중 데스크톱 +X-KDE-Keywords[ko]=desktop,desktops,number,virtual desktop,multiple desktops,pager,pager widget,pager applet,pager settings,데스크톱,가상 데스크톱,다중 데스크톱,바탕 화면,가상 바탕 화면,다중 바탕 화면 X-KDE-Keywords[lt]=darbalaukis,darbastalis,darbalaukiai,darbastaliai,skaičius,numeris,numeriai,skaičiai,skaicius,skaiciai,virtualus darbalaukis,virtualūs darbalaukiai,virtualus darbalaukiai,keli darbalaukiai,keletas darbalaukių,keletas darbalaukiu,puslapiuotojas,perjungiklis,perjungiklio valdiklis,perjungiklio programėlė,perjungiklio programele,perjungiklio nuostatos,perjungiklio nustatymai X-KDE-Keywords[nb]=skrivebord,antall,virtuelt skrivebord,flere skrivebord,veksler,vekslerelement,veksler-miniprogram,vekslerinnstillinger X-KDE-Keywords[nds]=Schriefdisch,Schriefdischen,virtuell,mehr,Schriefdisch-Översicht,instellen diff --git a/kcmkwin/kwindesktop/package/metadata.desktop b/kcmkwin/kwindesktop/package/metadata.desktop index 2ede187951..1e5a46fff4 100644 --- a/kcmkwin/kwindesktop/package/metadata.desktop +++ b/kcmkwin/kwindesktop/package/metadata.desktop @@ -30,7 +30,7 @@ Name[ja]=仮想デスクトップ Name[kk]=Виртуалды Үстелдер Name[km]=ផ្ទៃតុ​និម្មិត Name[kn]=ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗಳು -Name[ko]=가상 데스크톱 +Name[ko]=가상 바탕 화면 Name[lt]=Virtualūs darbalaukiai Name[lv]=Virtuālās darbvirsmas Name[mr]=आभासी डेस्कटॉप @@ -74,7 +74,7 @@ Comment[gl]=Configurar a navegación, cantidade e disposición dos escritorios v Comment[ia]=Configura navigation, numero e disposition de scriptorios virtual Comment[id]=Konfigurasikan navigasi, nomor dan tataletak desktop virtual Comment[it]=Configura navigazione, numero e disposizione dei desktop virtuali -Comment[ko]=가상 데스크톱 탐색, 개수, 레이아웃 설정 +Comment[ko]=가상 바탕 화면 탐색, 개수, 레이아웃 설정 Comment[lt]=Konfigūruoti virtualių darbalaukių naršymą, skaičių ir išdėstymą Comment[nl]=Navigatie, aantal en indeling van virtuele bureaubladen configureren Comment[nn]=Set opp navigering, nummer og vising av virtuelle skrivebord diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index b02aff9d0e..bc3c50d1ea 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -127,7 +127,7 @@ X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,sarok,szél,szegély,művelet,vá X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio,bordos de schermo de kwin,bordos de scriptorio,bordos de scriptorio,maximisa fenestras,tegula fenestras,parte de schermo, comportamento de schermo,commuta scriptorio,scriptorio virtual,angulos de schermo X-KDE-Keywords[id]=kwin,window,pengelola,efek,sudut,,tepi,bingkai,aksi,alihkan,desktop,tepian layar kwin,tepian desktop,tepian layar,maksimalkan window,ubinkan window,sisi layar,perilaku layar,alihkan desktop,virtualkan desktop,sudut layar X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi schermo kwin,bordi desktop,bordi schermo,massimizza finestre,affianca finestre,lato dello schermo,comportamento schermo,scambia desktop,desktop virtuale,angoli dello schermo -X-KDE-Keywords[ko]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭짓점 +X-KDE-Keywords[ko]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭짓점,바탕 화면 전환,가상 바탕 화면 X-KDE-Keywords[lt]=kwin,langas,langų,lango,langu,tvarkytuvė,tvarkytuve,efektas,efektai,kampas,kampai,kraštas,krastas,veiksmas,veiksmai,perjungti,perjungiklis,darbalaukis,darbalaukio,kwin ekrano kraštai,kwin ekrano kraštas,kwin ekrano krastas,kwin ekrano krastai,darbalaukio kraštai,darbalaukio kraštas,darbalaukio krastas,darbalaukio krastai,ekrano kraštai,ekrano krastai,ekrano kraštas,ekrano krastas,išskleisti langus,isskleisti langus,langų išskleidimas,langu isskleidimas,lango išskleidimas,lango isskleidimas,išskleisti langą,isskleisti langa,iškloti langą,iškloti langus,iskloti langa,iskloti langus,ekrano šonas,ekrano sonas,ekrano pusė,ekrano puse,ekrano šonai,ekrano sonai,ekrano elgsena,ekrano elgesys,perjungti darbalaukį,perjungti darbalauki,darbalaukio perjungimas,virtualus darbalaukis,virtualūs darbalaukiai,virtualus darbalaukiai,ekrano kampas,ekrano kampai X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,hjørne,ramme,handling,bytte,skrivebord,kwin skjermkanter,skrivebordkanter,skjermkanter,maksimere vinduer,flislegge vinduer,skjermside,skjermoppførsel,bytte skrivebord,virtuelt skrivebord,skjermhjørner X-KDE-Keywords[nds]=KWin,Finster,Pleger,Effekt,Hörn,Kant,Rahmen,Akschoon,wesseln,Schriefdisch,maximeren,kacheln,Schirmkant,Schirmbedregen,Schirmhuuk diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 6f7df86f8a..2bd6b797aa 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -94,7 +94,7 @@ X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,effect,efecto,edge,beira,bo X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás,asztal,asztalszél,képernyőszél,képernyőoldal,képernyő működése,érintőképernyő X-KDE-Keywords[id]=kwin,window,pengelola,efek,tepi,bingkai,aksi,alih,desktop,tepian desktop,tepian layar,sisi layar,perilaku layar,layar sentuh X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi desktop,bordi schermo,lato dello schermo,comportamento schermo,schermo a sfioramento -X-KDE-Keywords[ko]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,창,관리자,효과,경계,경계선,동작,액션,데스크톱,화면 경계,경계,터치,터치 스크린,터치스크린 +X-KDE-Keywords[ko]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,창,관리자,효과,경계,경계선,동작,액션,데스크톱,화면 경계,경계,터치,터치 스크린,터치스크린,바탕 화면 X-KDE-Keywords[lt]=kwin,lango,langų,langu,tvarkytuvė,tvarkytuve,efektas,efektai,kraštas,krastas,rėmelis,remelis,rėmas,remas,veiksmas,veiksmai,perjungti,perjugimo,perjungimas,darbalaukis,darbalaukio,darbalaukio kraštai,darbalaukio kraštas,darbalaukio krastai,darbalaukio krastas,ekrano kraštai,ekrano krastai,ekrano kraštas,ekrano krastas,ekrano šonas,ekrano sonas,ekrano pusė,ekrano puse,ekrano elgsena,ekrano elgsesys,jutiklinis ekranas,jutiminis ekranas,jautrusis ekranas,touchscreen,touch screen X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,kant,rand,actie,omschakelen,bureaublad,bureaubladkanten,schermkanten,zijkant van het scherm,schermgedrag,aanraakscherm X-KDE-Keywords[nn]=kwin,vindauge,handsamar,effekt,kant,ramme,handling,byte,skrivebord,skrivebordkantar,skjermkantar,skjermside,skjermåtferd,trykkskjerm diff --git a/scripts/desktopchangeosd/metadata.desktop b/scripts/desktopchangeosd/metadata.desktop index 5f1920de0c..1b4c30fb09 100644 --- a/scripts/desktopchangeosd/metadata.desktop +++ b/scripts/desktopchangeosd/metadata.desktop @@ -22,7 +22,7 @@ Name[it]=Mostra lo scambia desktop Name[ja]=Desktop Change OSD Name[kk]=Үстел ауыстыру панелі Name[km]=ការ​ផ្លាស់ប្ដូ​រផ្ទៃតុ OSD -Name[ko]=데스크톱 변경 OSD +Name[ko]=바탕 화면 변경 OSD Name[lt]=Darbalaukio pakeitimo OSD Name[mr]=डेस्कटॉप बदल OSD Name[nb]=OSD for skrivebordsbytte @@ -68,7 +68,7 @@ Comment[id]=Sebuah on screen display menunjukkan perubahan desktop Comment[it]=Un display sullo schermo che indica il cambio di desktop Comment[kk]=Үстел ауыстыруын көрсететін экран дисплейі Comment[km]=ការ​បង្ហាញ​លើ​អេក្រង់ បង្ហាញ​ថា​អំពី​ការ​ផ្លាស់ប្ដូរ​ផ្ទៃតុ -Comment[ko]=데스크톱 변경 상황을 표시하는 OSD +Comment[ko]=바탕 화면 변경 상황을 표시하는 OSD Comment[lt]=Pavaizdavimas ekrane, nurodantis darbalaukio pakeitimą Comment[mr]=डेस्कटॉप बदल संकेत देणारे स्क्रीनवरील डिस्प्ले Comment[nb]=En tekst på skjermen som viser skrivebordsbytte diff --git a/tabbox/kwindesktopswitcher.desktop b/tabbox/kwindesktopswitcher.desktop index fbe4786bbc..699487d816 100644 --- a/tabbox/kwindesktopswitcher.desktop +++ b/tabbox/kwindesktopswitcher.desktop @@ -24,7 +24,7 @@ Comment[id]=Tataletak Pengalih Desktop KWin Comment[it]=Disposizione scambiatore desktop KWin Comment[ja]=KWin デスクトップスイッチャーレイアウト Comment[kk]=KWin үстел ауыстырғышының қалыпы -Comment[ko]=KWin 데스크톱 전환기 레이아웃 +Comment[ko]=KWin 바탕 화면 전환기 레이아웃 Comment[lt]=KWin darbalaukių perjungiklio išdėstymas Comment[nb]=Utforming av KWin skrivebordsbytter Comment[nds]=Utsehn vun de KWin-Schriefdischwesseln