yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 2015-08-26 10:22:10 +00:00
parent f0f8421cef
commit 3c96b23c17
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/eyeonscreen/package/metadata.desktop
View file

@ -9,6 +9,7 @@ Name[gl]=Ollo na pantalla
Name[it]=eye On Screen
Name[ja]=eye On Screen
Name[ko]=화면 위의 눈
Name[nb]=øye på Skjerm
Name[nl]=eye On Screen
Name[pl]=Oko na ekranie
Name[pt]=Olho no Ecrã
@ -37,6 +38,7 @@ Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muis
Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo.
Comment[it]=Risucchia le finestre nel desktop per mostrare l'ultima. Potrebbe ricordarti qualcosa.
Comment[ko]=창을 데스크톱으로 흡수시켜 데스크톱을 표시합니다.
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.
Comment[pl]=Zasysa okna na pulpicie, aby go pokazać. Powinno nasuwać pewne skojarzenia.
Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo.

1
effects/windowaperture/package/metadata.desktop
View file

@ -10,6 +10,7 @@ Name[fi]=Ikkunoiden siirto näytön kulmiin
Name[gl]=Apertura das xanelas
Name[it]=Apertura delle finestre
Name[ko]=조리개 모양 배치
Name[lt]=Lango anga
Name[nl]=Vensteropening
Name[pl]=Przesłona okna
Name[pt]=Aperto das Janelas

3
scripts/minimizeall/metadata.desktop
View file

@ -11,6 +11,8 @@ Name[gl]=Minimizalo todo
Name[it]=Minimizza tutto
Name[ja]=すべて最小化
Name[ko]=모두최소화
Name[lt]=SumažintiVisus
Name[nb]=Minimer alt
Name[nl]=Alles-minimaliseren
Name[pl]=MinimalizujWszystko
Name[pt]=Maximização Total
@ -38,6 +40,7 @@ Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palautt
Comment[gl]=Engade un atallo para minimizar todas as xanelas e restauralas de novo.
Comment[it]=Aggiunge una scorciatoia per minimizzare tutte le finestre o ripristinare le finestre così minimizzate
Comment[ko]=모든 창을 최소화하고 복원하는 단축키 추가
Comment[nb]=Legger til en snarvei for å minimere alle vinduer, eller oppheve slik minimering
Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren of maakt de minimalisatie van deze ongedaan
Comment[pl]=Dodaje skrót do zminimalizowania wszystkich okien lub działania odwrotnego dla wszystkich w ten sposób zminimalizowanych okien
Comment[pt]=Adiciona um atalho para minimizar todas as janelas ou retirá-las desse estado