Commit 8aea8d99 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 9bb30370
......@@ -46,6 +46,7 @@ Comment[gl]=Páxina de propiedades que mostra os metadatos de ficheiros, como as
Comment[id]=Properti halaman yang menampilkan meta data file, sepertihalnya dimensi image, 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[ml]=ഇമേജിന്റെ വലുപ്പം, ഇമേജ് അളവുകൾ, ആർട്ടിസ്റ്റ് വിവരം, എന്നിവ പോലെയുള്ള ഫയലുകളുടെ മെറ്റാ ഡാറ്റ കാണിക്കുന്ന സവിശേഷതകൾ പേജ്
Comment[nl]=Eigenschappenpagina toont metagegevens van bestanden, zoals afmeting van afbeelding, informatie over artiest en andere
Comment[nn]=Eigenskapsside som viser metadata til filer, for eksempel biletstorleik og artistinformasjon.
Comment[pl]=Strona właściwości pokazująca metadane plików, takie jak rozmiar obrazu, informacje o artyście i inne
......
......@@ -18,6 +18,7 @@
"Name[id]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
"Name[ko]": "Nicolas Fella",
"Name[ml]": "നിക്കോളാസ് ഫെല്ല",
"Name[nl]": "Nicolas Fella",
"Name[nn]": "Nicolas Fella",
"Name[pl]": "Nicolas Fella",
......@@ -48,6 +49,7 @@
"Description[id]": "Ubah tag-tag file",
"Description[it]": "Modifica etichette dei file",
"Description[ko]": "파일 태그 변경",
"Description[ml]": "രെഖാ മുദ്രകൾ മാറ്റുക",
"Description[nl]": "Tags van bestanden wijzigen",
"Description[nn]": "Endra merkelappar til fil",
"Description[pl]": "Zmień znaczniki pliku",
......@@ -82,6 +84,7 @@
"Name[id]": "Tags",
"Name[it]": "Etichette",
"Name[ko]": "태그",
"Name[ml]": "മുദ്രകള്‍",
"Name[nl]": "Tags",
"Name[nn]": "Merkelappar",
"Name[pl]": "Znaczniki",
......
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