From 99237c9b3f498aeb528c28cd09722ac04644d173 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Jun 2015 10:08:03 +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" --- clients/aurorae/src/kwindecoration.desktop | 1 + clients/aurorae/themes/plastik/package/metadata.desktop | 1 + effects/eyeonscreen/package/metadata.desktop | 1 + effects/maximize/package/metadata.desktop | 1 + effects/mouseclick/mouseclick_config.desktop | 1 + effects/windowaperture/package/metadata.desktop | 1 + kcmkwin/kwincompositing/kcmkwineffects.desktop | 1 + kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinadvanced.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 1 + kcmkwin/kwinrules/kwinrules.desktop | 1 + kcmkwin/kwinscripts/kwinscripts.desktop | 2 ++ scripting/kwinscript.desktop | 1 + scripts/desktopchangeosd/metadata.desktop | 1 + scripts/enforcedeco/metadata.desktop | 1 + scripts/minimizeall/metadata.desktop | 1 + tabbox/kwindesktopswitcher.desktop | 1 + tabbox/kwinwindowswitcher.desktop | 1 + 19 files changed, 20 insertions(+) diff --git a/clients/aurorae/src/kwindecoration.desktop b/clients/aurorae/src/kwindecoration.desktop index 8d22db4d9e..00b5c16c69 100644 --- a/clients/aurorae/src/kwindecoration.desktop +++ b/clients/aurorae/src/kwindecoration.desktop @@ -25,6 +25,7 @@ Comment[ia]=Decorationes de fenestra de KWin Comment[id]=Dekorasi Jendela KWin Comment[is]=KWin gluggaskreytingar Comment[it]=Decorazione delle finestre di KWin +Comment[ja]=KWin ウィンドウの飾り Comment[kk]=KWin терезе безендіруі Comment[ko]=KWin 창 장식 Comment[lt]=KWin lango dekoracija diff --git a/clients/aurorae/themes/plastik/package/metadata.desktop b/clients/aurorae/themes/plastik/package/metadata.desktop index 0222cc11dc..05a38a43a6 100644 --- a/clients/aurorae/themes/plastik/package/metadata.desktop +++ b/clients/aurorae/themes/plastik/package/metadata.desktop @@ -108,6 +108,7 @@ Comment[hu]=A KDE 3-ból ismert klasszikus téma Comment[ia]=Le thema classic cognoscite ex KDE 3 Comment[id]=Tema klasik yang dikenal dari KDE 3 Comment[it]=Il tema classico conosciuto da KDE 3 +Comment[ja]=KDE 3 からのクラシックテーマ Comment[kk]=KDE3-тің классикалық нақышы Comment[ko]=KDE 3의 고전 테마 Comment[lt]=Klasikinė tema žinoma iš KDE 3 diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 971cc848c4..34813af676 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -6,6 +6,7 @@ Name[es]=Ojo a la pantalla Name[fi]=eye On Screen Name[gl]=Ollo na pantalla Name[it]=eye On Screen +Name[ja]=eye On Screen Name[nl]=eye On Screen Name[pl]=Oko na ekranie Name[pt]=Olho no Ecrã diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index b379fa4b69..252df44f2b 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -68,6 +68,7 @@ Name[ia]=Maximiza Name[id]=Maksimalkan Name[is]=Hámarka Name[it]=Massimizzazione +Name[ja]=最大化 Name[kk]=Кең жаю Name[ko]=최대화 Name[lt]=Išdidinti diff --git a/effects/mouseclick/mouseclick_config.desktop b/effects/mouseclick/mouseclick_config.desktop index 78643535a9..fa7bd0e66b 100644 --- a/effects/mouseclick/mouseclick_config.desktop +++ b/effects/mouseclick/mouseclick_config.desktop @@ -26,6 +26,7 @@ Name[ia]=Animation de click de mus Name[id]=Animasi Klik Tetikus Name[is]=Hreyfingar við músarsmell Name[it]=Animazione del clic del mouse +Name[ja]=マウスクリックアニメーション Name[kk]=Тышқанды түрту анимациясы Name[ko]=마우스 클릭 애니메이션 Name[lt]=Spragtelėjimo pele animacija diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 6368f3384e..dc47b8fef5 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -33,6 +33,7 @@ Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. Comment[it]=Sposta la finestra negli angoli quando mostri il desktop +Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad Comment[pl]=Rozsuwa okna w narożniki, podczas pokazywania pulpitu Comment[pt]=Mover a janela para os cantos, enquanto mostra o ecrã diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index d3f004f62e..39afe97190 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -71,6 +71,7 @@ Comment[hu]=Asztali effektusok Comment[ia]=Effectos de scriptorio Comment[id]=Efek Desktop Comment[it]=Effetti del desktop +Comment[ja]=デスクトップ効果 Comment[ko]=데스크톱 효과 Comment[lt]=Darbastalio efektai Comment[nb]=Skrivebordseffekter diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index ed010b20b1..995fbabba2 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -88,6 +88,7 @@ Comment[hu]=Az ablakok címsorának megjelenése Comment[ia]=Semblantia de titulos de fenestra Comment[id]=Tampilan dan Rasa dari Judul Jendela Comment[it]=Aspetto dei titoli delle finestre +Comment[ja]=ウィンドウタイトルの外観を設定 Comment[ko]=창 제목 표시줄의 모습과 느낌 설정 Comment[lt]=Langų antraščių išvaizda ir elgsena Comment[nb]=Utseende og virkemåte for vindustitlene diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 482f5d74f4..ce5978861a 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -115,6 +115,7 @@ Comment[hu]=Egérműveletek az ablakokon Comment[ia]=Actiones de mus sur fenestras Comment[id]=Aksi Tetikus di Jendela Comment[it]=Azioni del mouse sulle finestre +Comment[ja]=ウインドウ上でのマウスアクション Comment[ko]=창 마우스 동작 설정 Comment[lt]=Pelės veiksmai ant langų Comment[nb]=Musehandlinger på vinduer diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 8026e4ba26..9d864bcc20 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -114,6 +114,7 @@ Comment[hu]=Speciális ablakkezelési szolgáltatások Comment[ia]=Characteristicas avantiate de gestion de fenestra Comment[id]=Fitur Manajemen Jendela Lanjutan Comment[it]=Funzionalità avanzate della gestione delle finestre +Comment[ja]=高度なウインドウ管理機能 Comment[ko]=고급 창 관리자 기능 설정 Comment[lt]=Išsamesnės langų tvarkymo savybės Comment[nb]=Funksjoner for avansert vindusbehandling diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index e60199b59b..ebd4c6fdc3 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -116,6 +116,7 @@ Comment[hu]=Ablakműveletek és működés Comment[ia]=Comportamento e actiones de fenestra Comment[id]=Aksi dan Perilaku Jendela Comment[it]=Azioni e comportamento delle finestre +Comment[ja]=ウィンドウのアクションと挙動 Comment[ko]=창 동작과 행동 Comment[lt]=Lango veiksmai ir elgsena Comment[nb]=Vindusoppførsel og handlinger diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 5a108f76f4..135f1ed33a 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -89,6 +89,7 @@ Comment[hu]=Egyéni ablakműveletek Comment[ia]=Comportamento de fenestra individual Comment[id]=Perilaku Jendela Individu Comment[it]=Comportamento della singola finestra +Comment[ja]=個別のウィンドウの挙動 Comment[ko]=개별 창 동작 Comment[lt]=Individuali lango elgsena Comment[nb]=Oppførsel for individuelle vinduer diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index 1718f4d688..ef5b0ed12c 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -29,6 +29,7 @@ X-KDE-Keywords[hu]=kwin szkript X-KDE-Keywords[ia]=Script de kwin X-KDE-Keywords[id]=skrip kwin X-KDE-Keywords[it]=Script kwin +X-KDE-Keywords[ja]=kwin スクリプト X-KDE-Keywords[kk]=kwin скрипті X-KDE-Keywords[km]=ស្គ្រីប kwin X-KDE-Keywords[ko]=kwin 스크립트 @@ -79,6 +80,7 @@ Name[hu]=KWin szkriptek Name[ia]=Scripts de KWin Name[id]=Skrip KWin Name[it]=Script kwin +Name[ja]=KWin Scripts Name[kk]=KWin скрипттері Name[km]=ស្គ្រីប KWin Name[ko]=KWin 스크립트 diff --git a/scripting/kwinscript.desktop b/scripting/kwinscript.desktop index 4b49514d65..2c115c6cf8 100644 --- a/scripting/kwinscript.desktop +++ b/scripting/kwinscript.desktop @@ -23,6 +23,7 @@ Comment[hu]=KWin parancsfájl Comment[ia]=Script de kwin Comment[id]=Skrip KWin Comment[it]=Script kwin +Comment[ja]=KWin Script Comment[kk]=KWin скрипті Comment[km]=ស្គ្រីប KWin Comment[ko]=KWin 스크립트 diff --git a/scripts/desktopchangeosd/metadata.desktop b/scripts/desktopchangeosd/metadata.desktop index d28084e5f7..a1eed2a26c 100644 --- a/scripts/desktopchangeosd/metadata.desktop +++ b/scripts/desktopchangeosd/metadata.desktop @@ -19,6 +19,7 @@ Name[hu]=Asztal változtatás OSD Name[ia]=Modifica OSD de scriptorio Name[id]=OSD Ubah Desktop Name[it]=Mostra lo scambia desktop +Name[ja]=Desktop Change OSD Name[kk]=Үстел ауыстыру панелі Name[km]=ការ​ផ្លាស់ប្ដូ​រផ្ទៃតុ OSD Name[ko]=데스크톱 변경 OSD diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index c9cba09c5e..0f665f22ae 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -15,6 +15,7 @@ Name[hu]=Ablakdekorációk kényszerítése GTK+ ablakokra Name[ia]=Applica Decorationes de fenestra sur fenestra GTK+ Name[id]=Memaksa Dekorasi Jendela pada jendela GTK+ Name[it]=Forza le decorazioni delle finestre GTK+ +Name[ja]=GTK+ ウインドウのウィンドウの飾りを強制する Name[ko]=GTK+ 창 장식 강제 사용 Name[lt]=Forsuoja lango dekoracijas GTK+ lange Name[nb]=Påtvinger vinduspynt på GTK+-vindu diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index dad2870e67..3d0ec1d12e 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -8,6 +8,7 @@ Name[es]=Maximizar todo Name[fi]=Pienennä kaikki Name[gl]=Minimizalo todo Name[it]=Minimizza tutto +Name[ja]=すべて最小化 Name[nl]=Alles-minimaliseren Name[pl]=MinimalizujWszystko Name[pt]=Maximização Total diff --git a/tabbox/kwindesktopswitcher.desktop b/tabbox/kwindesktopswitcher.desktop index 9cf308c34b..8c05df40e3 100644 --- a/tabbox/kwindesktopswitcher.desktop +++ b/tabbox/kwindesktopswitcher.desktop @@ -20,6 +20,7 @@ Comment[hu]=KWin asztalváltó elrendezés Comment[ia]=Disposition de commutator de scriptorio de KWin Comment[id]=Tata Letak Pengganti Desktop KWin Comment[it]=Disposizione scambiatore desktop KWin +Comment[ja]=KWin デスクトップスイッチャーレイアウト Comment[kk]=KWin үстел ауыстырғышының қалыпы Comment[ko]=KWin 데스크톱 전환기 레이아웃 Comment[lt]=KWin darbastalio perjungimo išdėstymas diff --git a/tabbox/kwinwindowswitcher.desktop b/tabbox/kwinwindowswitcher.desktop index 0038693129..8b61add3d4 100644 --- a/tabbox/kwinwindowswitcher.desktop +++ b/tabbox/kwinwindowswitcher.desktop @@ -21,6 +21,7 @@ Comment[hu]=KWin ablakváltó elrendezés Comment[ia]=Disposition de commutator de fenestra de KWin Comment[id]=Tata Letak Pengganti Jendela KWin Comment[it]=Disposizione scambiafinestre KWin +Comment[ja]=KWin ウィンドウスイッチャーレイアウト Comment[kk]=KWin терезе ауыстырғышының қалыпы Comment[km]=ប្លង់​នៃ​កម្មវិធី​ប្ដូរ​បង្អួច KWin Comment[ko]=KWin 창 전환기 레이아웃