Commit 33b99317 authored by Script Kiddy's avatar Script Kiddy

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"
parent 7d4be6ec
......@@ -26,6 +26,7 @@ Comment[mr]=के-डि-एनलाइव्ह
Comment[nb]=Kdenlive
Comment[nds]=Kdenlive
Comment[nl]=Kdenlive
Comment[nn]=Kdenlive
Comment[pl]=Kdenlive
Comment[pt]=Kdenlive
Comment[pt_BR]=Kdenlive
......@@ -67,6 +68,7 @@ Name[lv]=Renderēšana pabeigta
Name[mr]=रेंडरींग पूर्ण झाले
Name[nb]=Opptegning avsluttet
Name[nl]=Weergave uitwerken beëindigd
Name[nn]=Videorendering ferdig
Name[pl]=Ukończono renderowanie
Name[pt]=A geração terminou
Name[pt_BR]=A renderização terminou
......@@ -104,6 +106,7 @@ Comment[lv]=Renderēšana ir beigusies
Comment[mr]=रेंडरींग पूर्ण झाले आहे
Comment[nb]=Ferdig med opptegning
Comment[nl]=Weergave uitwerken is gereed
Comment[nn]=Videorendering er ferdig
Comment[pl]=Ukończono zostało zakończone
Comment[pt]=A geração terminou
Comment[pt_BR]=A renderização foi terminada
......@@ -144,6 +147,7 @@ Name[lv]=Renderēšana sākta
Name[mr]=रेंडरींग सुरु झाले
Name[nb]=Opptegning påbegynt
Name[nl]=Weergave uitwerken begonnen
Name[nn]=Videorendering starta
Name[pl]=Rozpoczęto renderowanie
Name[pt]=A geração foi iniciada
Name[pt_BR]=A renderização iniciou
......@@ -181,6 +185,7 @@ Comment[lv]=Renderēšana tika palaista
Comment[mr]=रेंडरींग सुरु झाले होते
Comment[nb]=Startet opptegning
Comment[nl]=Weergave uitwerken is begonnen
Comment[nn]=Videorenderinga vart starta
Comment[pl]=Renderowanie zostało rozpoczęte
Comment[pt]=A geração foi iniciada
Comment[pt_BR]=A renderização foi iniciada
......@@ -220,6 +225,7 @@ Name[lv]=Kadrs notverts
Name[mr]=फ्रेम पकडली
Name[nb]=Stillbilde tatt
Name[nl]=Frame opgenomen
Name[nn]=Stillbilete teke
Name[pl]=Przechwycono klatkę
Name[pt]=Imagem capturada
Name[pt_BR]=Imagem capturada
......@@ -256,6 +262,7 @@ Comment[lv]=Kadrs tika notverts diskā
Comment[mr]=फ्रेम डिस्कवर पकडली
Comment[nb]=Et stillbilde ble lagret
Comment[nl]=Een frame is op schijf opgenomen
Comment[nn]=Eit stillbilete vart lagra til disk
Comment[pl]=Klatka została przechwycona na dysk
Comment[pt]=Foi capturada uma imagem para o disco
Comment[pt_BR]=Foi capturada uma imagem para o disco
......@@ -296,6 +303,7 @@ Name[lv]=Gatavs notveršanai
Name[mr]=पकडण्याकरिता तयार
Name[nb]=Klar til å ta stillbilde
Name[nl]=Gereed om op te nemen
Name[nn]=Klar til opptak
Name[pl]=Gotowy do przechwycenia
Name[pt]=Pronto para capturar
Name[pt_BR]=Pronto para capturar
......@@ -339,6 +347,7 @@ Name[mr]=त्रुटी
Name[nb]=Feil
Name[nds]=Fehler
Name[nl]=Fout
Name[nn]=Feil
Name[pl]=Błąd
Name[pt]=Erro
Name[pt_BR]=Erro
......@@ -378,6 +387,7 @@ Comment[lv]=Programmā Kdenlive radās kļūda
Comment[mr]=के-डि-एनलाइव्ह मध्ये त्रुटी निर्माण झाली
Comment[nb]=En feil oppsto i Kdenlive
Comment[nl]=Er is een fout opgetreden in Kdenlive
Comment[nn]=Det oppstod ein feil i Kdenlive
Comment[pl]=Wystąpił błąd w Kdenlive
Comment[pt]=Ocorreu um erro no Kdenlive
Comment[pt_BR]=Ocorreu um erro no Kdenlive
......
......@@ -26,6 +26,7 @@ Name[mr]=के-डि-एनलाइव्ह
Name[nb]=Kdenlive
Name[nds]=Kdenlive
Name[nl]=Kdenlive
Name[nn]=Kdenlive
Name[pl]=Kdenlive
Name[pt]=Kdenlive
Name[pt_BR]=Kdenlive
......@@ -66,6 +67,7 @@ GenericName[lv]=Video redaktors
GenericName[mr]=व्हिडीओ संपादक
GenericName[nb]=Videoredigeringsprogram
GenericName[nl]=Video-bewerker
GenericName[nn]=Videoredigering
GenericName[pl]=Edytor wideo
GenericName[pt]=Editor de Vídeo
GenericName[pt_BR]=Editor de Vídeo
......@@ -104,6 +106,7 @@ Comment[lv]=Nelineārais video redaktors KDE videi
Comment[mr]=केडीई करिता अरेषीय व्हिडीओ संपादक
Comment[nb]=Videoredigeringsprogram for KDE med dataklipping
Comment[nl]=Niet-lineaire video-bewerker voor KDE
Comment[nn]=Program for ikkje-lineær videoredigering
Comment[pl]=Nieliniowy edytor wideo dla KDE
Comment[pt]=Editor de vídeo não-linear para o KDE
Comment[pt_BR]=Editor de vídeo não-linear para o KDE
......@@ -139,6 +142,7 @@ Keywords[fr]=montage;vidéo;audio;mlt;kde;
Keywords[gl]=editing;edición;video;vídeo;audio;son;mlt;kde;
Keywords[it]=editing;video;audio;mlt;kde;
Keywords[nl]=bewerken;video;audio;mlt;kde;
Keywords[nn]=redigering;video;lyd;mlt;kde;
Keywords[pl]=edytowanie;video;wideo;filmy;audio;dźwięk;mlt;kde;
Keywords[pt]=edição;vídeo;áudio;MLT;kde;
Keywords[pt_BR]=edição;vídeo;áudio;mlt;kde;
......
......@@ -24,6 +24,7 @@ Name[lv]=MLT repertuārs
Name[mr]=MLT प्लेलिस्ट
Name[nb]=MLT-spilleliste
Name[nl]=MLT-afspeellijst
Name[nn]=MLT-speleliste
Name[pl]=Lista odtwarzania MLT
Name[pt]=Lista de Reprodução MLT
Name[pt_BR]=Lista de Reprodução MLT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment