Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 1a79a3a8 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 c1525375
......@@ -7,7 +7,7 @@ Comment[cs]=Drobný přehrávač hudby
Comment[de]=Einfache Audio-Wiedergabe
Comment[es]=Reproductor de música mínimo
Comment[et]=Tilluke muusikamängija
Comment[fr]=Lecteur de musique ultra compact
Comment[fr]=Lecteur de musique ultra-léger
Comment[gl]=Reprodutor de música anano
Comment[it]=Piccolo lettore musicale
Comment[ko]=작은 음악 재생기
......@@ -27,6 +27,7 @@ Name[cs]=Babe
Name[de]=Babe
Name[es]=Babe
Name[et]=Babe
Name[fr]=Babe
Name[gl]=Babe
Name[it]=Babe
Name[ko]=Babe
......@@ -48,6 +49,7 @@ Name[cs]=Babe...
Name[de]=Babe...
Name[es]=Babe...
Name[et]=Babe ...
Name[fr]=Babe...
Name[gl]=Babe…
Name[it]=Babe...
Name[ko]=Babe...
......@@ -67,6 +69,7 @@ Comment[cs]=Připojení k zařízení selhalo
Comment[de]=Verbindung zum Gerät fehlgeschlagen
Comment[es]=Falló la conexión al dispositivo
Comment[et]=Ühendumine seadmega nurjus
Comment[fr]=Impossible de se connecter au périphérique
Comment[gl]=A conexión co dispositivo fallou
Comment[it]=Connessione al dispositivo non riuscita
Comment[ko]=장치에 연결할 수 없음
......
......@@ -6,6 +6,7 @@ Name[cs]=Pix
Name[de]=Pix
Name[es]=Pix
Name[et]=Pix
Name[fr]=Pix
Name[gl]=Pix
Name[it]=Pix
Name[ko]=Pix
......@@ -24,6 +25,7 @@ Comment[ca@valencia]=Visor de galeria d'imatges
Comment[de]=Bildergalerieanzeige
Comment[es]=Visor de galería de imágenes
Comment[et]=Pildigalerii näitaja
Comment[fr]=Afficheur de galerie d'images
Comment[gl]=Visor de galerías de imaxes
Comment[it]=Visualizzatore della galleria di immagini
Comment[ko]=그림 갤러리 뷰어
......
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