From ba3d4228f5dc8c0ebb16a73d62208755fcb9d590 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Aug 2015 10:22:49 +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" --- effects/windowaperture/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 4d7c0c4d78..f69de99bfc 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -11,6 +11,7 @@ Name[gl]=Apertura das xanelas Name[it]=Apertura delle finestre Name[ko]=조리개 모양 배치 Name[lt]=Lango anga +Name[nb]=Vindusåpning Name[nl]=Vensteropening Name[pl]=Przesłona okna Name[pt]=Aperto das Janelas @@ -41,6 +42,7 @@ 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[ko]=데스크톱을 보일 때 창을 모서리로 이동 +Comment[nb]=Flytt vindu til hjørnene mens skrivebordet vises 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ã