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"
icc-effect-5.14.5
l10n daemon script 2015-08-28 10:22:49 +00:00
parent f477480237
commit ba3d4228f5
1 changed files with 2 additions and 0 deletions

View File

@ -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ã