Commit 1e2f77f8 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 73c53d98
......@@ -16,6 +16,7 @@
"Name[fi]": "Linkitä aktiviteetteihin tiedostoja",
"Name[fr]": "Associer les fichiers à des activités",
"Name[gl]": "Ligar ficheiros con actividades",
"Name[ia]": "Liga files a Activitates",
"Name[it]": "Collega file alle attività",
"Name[ko]": "파일과 활동 연결",
"Name[nl]": "Bestanden koppelen aan activiteiten",
......
......@@ -14,6 +14,7 @@
"Description[fi]": "TODO",
"Description[fr]": "A faire",
"Description[gl]": "PENDENTE",
"Description[ia]": "DE FACER",
"Description[it]": "Da fare",
"Description[ko]": "TODO",
"Description[lt]": "Užduočių sąrašas",
......@@ -43,6 +44,7 @@
"Name[fi]": "KDE:n MTP-palvelu",
"Name[fr]": "Démon « MTP » de KDE",
"Name[gl]": "Servizo de MTP de KDE",
"Name[ia]": "Demone KDE MTP",
"Name[it]": "Demone MTP di KDE",
"Name[ko]": "KDE MTP 데몬",
"Name[lt]": "KDE MTP tarnyba",
......
......@@ -19,6 +19,7 @@ Name[et]=Failide sirvimine failihalduriga
Name[eu]=Arakatu fitxategiak fitxategi kudeatzailearekin
Name[fr]=Parcourir les fichiers avec le gestionnaire de fichiers
Name[gl]=Explorar o ficheiros co xestor de ficheiros
Name[ia]=Navigar Files con le Gerente de Files
Name[it]=Sfoglia file con il gestore dei file
Name[ja]=ファイルマネージャでファイルを閲覧
Name[ko]=파일 관리자로 파일 탐색
......
......@@ -14,6 +14,7 @@ Name[eu]=Karpeta partekatuak (SMB)
Name[fi]=Jaetut kansiot (SMB)
Name[fr]=Dossiers partagés (SMB)
Name[gl]=Cartafoles compartidos (SMB)
Name[ia]=Dossieres compartite (SMB)
Name[id]=Folder-folder Yang Dibagikan (SMB)
Name[it]=Cartelle condivise (SMB)
Name[ja]=共有フォルダ (SMB)
......
......@@ -14,6 +14,7 @@ Name[eu]=AppIrudia
Name[fi]=AppImage
Name[fr]=AppImage
Name[gl]=AppImage
Name[ia]=AppImage
Name[it]=AppImage
Name[ko]=AppImage
Name[lt]=AppImage failai
......
......@@ -14,6 +14,7 @@ Name[eu]=eLiburukiak
Name[fi]=eBooks
Name[fr]=Livres électroniques
Name[gl]=Libros electrónicos
Name[ia]=eLibros (eBooks)
Name[it]=eBook
Name[ko]=전자책
Name[lt]=El. knygos
......
......@@ -14,6 +14,7 @@ Name[eu]=Bulegotika dokumentuak
Name[fi]=Toimistotiedostot
Name[fr]=Documents Office
Name[gl]=Documentos de oficina
Name[ia]=Documentos de Office
Name[it]=Documenti d'ufficio
Name[ja]=Office ドキュメント
Name[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