From aff81afd27e5b5be1bcccea6d9816c2b23f930bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Dec 2015 09:40:57 +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/themes/plastik/package/metadata.desktop | 2 +- effects/cube/cube_config.desktop | 2 +- effects/cube/cubeslide_config.desktop | 2 +- effects/desktopgrid/desktopgrid_config.desktop | 2 +- effects/fadedesktop/package/metadata.desktop | 4 ++-- effects/login/package/metadata.desktop | 2 +- kcmkwin/kwincompositing/kcmkwineffects.desktop | 4 ++-- kcmkwin/kwincompositing/kwincompositing.desktop | 2 +- kcmkwin/kwindesktop/desktop.desktop | 4 ++-- scripts/desktopchangeosd/metadata.desktop | 4 ++-- tabbox/kwindesktopswitcher.desktop | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clients/aurorae/themes/plastik/package/metadata.desktop b/clients/aurorae/themes/plastik/package/metadata.desktop index 1d6f2bbc47..686219c71b 100644 --- a/clients/aurorae/themes/plastik/package/metadata.desktop +++ b/clients/aurorae/themes/plastik/package/metadata.desktop @@ -112,7 +112,7 @@ 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 +Comment[lt]=Klasikinis apipavidalinimas žinoma iš KDE 3 Comment[mr]=केडीई 3 मधील क्लासिक शैली Comment[nb]=Det klassiske temaet kjent fra KDE 3 Comment[nds]=Dat klass'sche Muster ut KDE 3 diff --git a/effects/cube/cube_config.desktop b/effects/cube/cube_config.desktop index 806d70b602..47634f2596 100644 --- a/effects/cube/cube_config.desktop +++ b/effects/cube/cube_config.desktop @@ -45,7 +45,7 @@ Name[km]=គូប​ផ្ទៃតុ​ Name[kn]=ಗಣಕತೆರೆ ಘನಾಕೃತಿ Name[ko]=데스크톱 큐브 Name[ku]=Sermaseya Mîkap -Name[lt]=Darbastalio kubas +Name[lt]=Darbalaukio kubas Name[lv]=Darbvirsmas kubs Name[mai]=डेस्कटाप घन Name[mk]=Работна коцка diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop index f31ec5ad01..41a3245b2c 100644 --- a/effects/cube/cubeslide_config.desktop +++ b/effects/cube/cubeslide_config.desktop @@ -39,7 +39,7 @@ Name[kk]=Үстел текшесін анимациялау Name[km]=ការ​ធ្វើ​ឲ្យ​គូប​ផ្ទៃតុ​មាន​ចលនា​ Name[kn]=ಗಣಕತೆರೆ ಘನಾಕೃತಿಯ ಸಜೀವನ(ಎನಿಮೇಶನ್) Name[ko]=데스크톱 큐브 애니메이션 -Name[lt]=Darbastalio kubo animacija +Name[lt]=Darbalaukio kubo animacija Name[lv]=Darbvirsmas kuba animācija Name[mk]=Анимација „Работна коцка“ Name[ml]=പണിയിടം ക്യൂബ് നീക്കം diff --git a/effects/desktopgrid/desktopgrid_config.desktop b/effects/desktopgrid/desktopgrid_config.desktop index 6b5b543272..5a29dab292 100644 --- a/effects/desktopgrid/desktopgrid_config.desktop +++ b/effects/desktopgrid/desktopgrid_config.desktop @@ -45,7 +45,7 @@ Name[kk]=Үстел торы Name[km]=ក្រឡា​ចត្រង្គ​ផ្ទៃ​តុ​ Name[kn]=ಗಣಕತೆರೆ ಚೌಕಳಿ Name[ko]=데스크톱 모눈 -Name[lt]=Darbastalio tinklelis +Name[lt]=Darbalaukio tinklelis Name[lv]=Darbvirsmas režģis Name[mai]=डेस्कटाप ग्रिड Name[mk]=Мрежа на раб. површина diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop index aea6856f82..919af1f789 100644 --- a/effects/fadedesktop/package/metadata.desktop +++ b/effects/fadedesktop/package/metadata.desktop @@ -33,7 +33,7 @@ Name[kk]=Біртіндеп ауысу Name[km]=ធ្វើ​ឲ្យ​ផ្ទៃតុលេច​បន្តិចម្ដងៗ Name[kn]=ಗಣಕತೆರೆಯನ್ನು ಮಬ್ಬಾಗಿಸು Name[ko]=데스크톱 페이드 -Name[lt]=Išblukinti darbastalį +Name[lt]=Išblukinti darbalaukį Name[lv]=Sapludināt darbvirsmu Name[mai]=Fade Desktop Name[ml]=പണിയിടം മങ്ങി പോകുക @@ -99,7 +99,7 @@ Comment[kk]=Виртуалды үстелді ауыстыруды біртін Comment[km]=ស្រមោល​រវាង​ផ្ទៃតុ​និម្មិត នៅពេល​ប្ដូរ​រវាង​ពួកវា Comment[kn]=ವಾಸ್ತವಪ್ರಾಯ(ವರ್ಚುವಲ್) ಗಣಕತೆರೆಗಳ ನಡುವೆ ಬದಲಾಯಿಸುವಾಗ ಮಬ್ಬಾಗಿಸು Comment[ko]=가상 데스크톱 사이를 전환할 때 페이드 효과를 사용합니다 -Comment[lt]=Perjungiant virtualiuosius darbastalius vartojant išblukinimo efektą +Comment[lt]=Perjungiant virtualiuosius darbalaukius vartojant išblukinimo efektą Comment[lv]=Plūstoši pārslēgties starp vituālajām darbvirsmām Comment[ml]=വെര്‍ച്വല്‍ പണിയിടങ്ങള്‍ക്കിടക്ക് സ്വിച്ച് ചെയ്യുമ്പോള്‍ മങ്ങിപ്പോകുന്നു. Comment[mr]=आभासी डेस्कटॉप बदलताना फीका करा diff --git a/effects/login/package/metadata.desktop b/effects/login/package/metadata.desktop index 7467e18ef7..b3c0da3e93 100644 --- a/effects/login/package/metadata.desktop +++ b/effects/login/package/metadata.desktop @@ -118,7 +118,7 @@ Comment[kk]=Кіргенде үстелге біртіндеп ауысу Comment[km]=លិច​​បន្តិចម្ដងៗ​ទៅ​ផ្ទៃតុ​នៅពេល​ចូល Comment[kn]=ಪ್ರವೇಶಿಸುವಾಗ (ಲಾಗಿಂಗ್ ಇನ್), ನಾಜೂಕಾಗಿ ಗಣಕತೆರೆಗೆ ಮಸುಕುಗೊಳಿಸು Comment[ko]=로그인할 때 부드럽게 데스크톱을 보여줍니다 -Comment[lt]=Sklandžiai išryškina darbastalį prisijungiant +Comment[lt]=Sklandžiai išryškina darbalaukį prisijungiant Comment[lv]=Gludeni parādīt darbvirsmu, piesakoties Comment[ml]=അകത്തേക്ക് കടക്കുംബോള്‍ പണിയിടത്തിലേക്ക് തനിയെ സ്മൂത് ആയി കടക്കുന്നു Comment[mr]=प्रवेश करताना डेस्कटॉप फीका करा diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index b2ed88b408..9cc7439da9 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -32,7 +32,7 @@ Name[id]=Efek Desktop Name[it]=Effetti del desktop Name[ja]=デスクトップ効果 Name[ko]=데스크톱 효과 -Name[lt]=Darbastalio efektai +Name[lt]=Darbalaukio efektai Name[nb]=Skrivebordseffekter Name[nds]=Schriefdischeffekten Name[nl]=Bureaubladeffecten @@ -76,7 +76,7 @@ Comment[id]=Efek Desktop Comment[it]=Effetti del desktop Comment[ja]=デスクトップ効果 Comment[ko]=데스크톱 효과 -Comment[lt]=Darbastalio efektai +Comment[lt]=Darbalaukio efektai Comment[nb]=Skrivebordseffekter Comment[nds]=Schriefdischeffekten Comment[nl]=Bureaubladeffecten diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 50a9fa658a..469fe043e7 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -73,7 +73,7 @@ Comment[ia]=Preferentias de compositor pro le effectos de scriptorio Comment[id]=Pengaturan Kompositor untuk Efek Jendela Comment[it]=Impostazioni del compositore per gli effetti del desktop Comment[ko]=데스크톱 효과에 사용되는 컴포지터 설정 -Comment[lt]=Kompozitoriaus nustatymai skirti darbastalio efektams +Comment[lt]=Kompozitoriaus nustatymai skirti darbalaukio efektams Comment[nb]=Sammensetter-innstillinger for skrivebordseffekter Comment[nds]=Tosamensettoptschonen för de Schriefdischeffekten instellen Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index f07244f94c..d5486b73f4 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -43,7 +43,7 @@ Name[kk]=Виртуалды Үстелдер Name[km]=ផ្ទៃតុ​និម្មិត Name[kn]=ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗಳು Name[ko]=가상 데스크톱 -Name[lt]=Virtualūs darbastaliai +Name[lt]=Virtualūs darbalaukiai Name[lv]=Virtuālās darbvirsmas Name[mr]=आभासी डेस्कटॉप Name[nb]=Virtuelle skrivebord @@ -92,7 +92,7 @@ Comment[hu]=Navigáció, a virtuális asztalok száma és elrendezése Comment[id]=Navigasi, Jumlah dan Tata Letak Desktop Virtual Comment[it]=Navigazione, numero e disposizione dei desktop virtuali Comment[ko]=가상 데스크톱 탐색, 개수, 레이아웃 -Comment[lt]=Naršymas, Skaičius ir išdėstymas virtualių darbastalių +Comment[lt]=Naršymas, Skaičius ir išdėstymas virtualių darbalaukių Comment[nb]=Navigering, antall og utlegg av virtuelle skrivebord Comment[nds]=Tall, Anornen un dat Anstüern vun de virtuellen Schriefdischen fastleggen Comment[nl]=Navigatie door, aantal en indeling van virtuele bureaubladen diff --git a/scripts/desktopchangeosd/metadata.desktop b/scripts/desktopchangeosd/metadata.desktop index 91b28bbadf..0fe2734638 100644 --- a/scripts/desktopchangeosd/metadata.desktop +++ b/scripts/desktopchangeosd/metadata.desktop @@ -23,7 +23,7 @@ Name[ja]=Desktop Change OSD Name[kk]=Үстел ауыстыру панелі Name[km]=ការ​ផ្លាស់ប្ដូ​រផ្ទៃតុ OSD Name[ko]=데스크톱 변경 OSD -Name[lt]=Darbastalio pokyčio OSD +Name[lt]=Darbalaukio pokyčio OSD Name[mr]=डेस्कटॉप बदल OSD Name[nb]=OSD for skrivebordsbytte Name[nds]=Schriefdischwessel-OSD @@ -69,7 +69,7 @@ Comment[it]=Un display sullo schermo che indica il cambio di desktop Comment[kk]=Үстел ауыстыруын көрсететін экран дисплейі Comment[km]=ការ​បង្ហាញ​លើ​អេក្រង់ បង្ហាញ​ថា​អំពី​ការ​ផ្លាស់ប្ដូរ​ផ្ទៃតុ Comment[ko]=데스크톱 변경 상황을 표시하는 OSD -Comment[lt]=Ekrano rodmuo nustatantis darbastalio keitimą +Comment[lt]=Ekrano rodmuo nustatantis darbalaukio keitimą Comment[mr]=डेस्कटॉप बदल संकेत देणारे स्क्रीनवरील डिस्प्ले Comment[nb]=En tekst på skjermen som viser skrivebordsbytte Comment[nds]=En Op-Schirm-Dorstellen för't Wesseln vun den Schriefdisch diff --git a/tabbox/kwindesktopswitcher.desktop b/tabbox/kwindesktopswitcher.desktop index 7db3976956..d697797520 100644 --- a/tabbox/kwindesktopswitcher.desktop +++ b/tabbox/kwindesktopswitcher.desktop @@ -23,7 +23,7 @@ Comment[it]=Disposizione scambiatore desktop KWin Comment[ja]=KWin デスクトップスイッチャーレイアウト Comment[kk]=KWin үстел ауыстырғышының қалыпы Comment[ko]=KWin 데스크톱 전환기 레이아웃 -Comment[lt]=KWin darbastalio perjungimo išdėstymas +Comment[lt]=KWin darbalaukio perjungimo išdėstymas Comment[nb]=Utforming av KWin skrivebordsbytter Comment[nds]=Utsehn vun de KWin-Schriefdischwesseln Comment[nl]=KWin indeling van bureaubladwisselaar