Commit 94574f97 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 b64cb08e
......@@ -51,7 +51,7 @@ Comment[gl]=Páxina de propiedades que mostra os metadatos de ficheiros, como as
Comment[ia]=Pagina de propeietates monstrante meta dtos de file, tal como grandr de image, information de artista e altere cosas
Comment[id]=Properti halaman yang menampilkan meta data file, sepertihalnya dimensi citra, informasi seniman, dan lainnya
Comment[it]=Pagina delle proprietà che mostra i metadati dei file, come le dimensioni dell'immagine, le informazioni sull'artista e altre
Comment[ko]=그림 크기, 음악가 정보 등 파일 메타데이터를 표시하는 속성 페이지
Comment[ko]=그림 크기, 아티스트 정보 등 파일 메타데이터를 표시하는 속성 페이지
Comment[lt]=Savybių puslapis, rodantis failų metaduomenis, tokius kaip paveiksliukų matmenys, atlikėjo informacija ir kita
Comment[ml]=ഇമേജിന്റെ വലുപ്പം, ഇമേജ് അളവുകൾ, ആർട്ടിസ്റ്റ് വിവരം, എന്നിവ പോലെയുള്ള ഫയലുകളുടെ മെറ്റാ ഡാറ്റ കാണിക്കുന്ന സവിശേഷതകൾ പേജ്
Comment[nl]=Eigenschappenpagina toont metagegevens van bestanden, zoals afmeting van afbeelding, informatie over artiest en andere
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