Commit 2cbb7906 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 93656cf3
Pipeline #29589 skipped
......@@ -4,6 +4,36 @@
"EnabledByDefault": "true",
"Id": "kaddressbookimportexportwindowscontact",
"Name": "Import/Export CSV",
"Name[ar]": "استيراد/تصدير CSV",
"Name[ca@valencia]": "Importa/exporta el CSV",
"Name[ca]": "Importa/exporta el CSV",
"Name[cs]": "Importovat/Exportovat CSV",
"Name[de]": "CSV importieren/exportieren",
"Name[en_GB]": "Import/Export CSV",
"Name[es]": "Importar/Exportar CSV",
"Name[et]": "CSV import/eksport",
"Name[fi]": "Tuo/vie CSV",
"Name[fr]": "Import / export CSV",
"Name[gl]": "Importa e exportar CSV",
"Name[ia]": "Importa/Exporta CSV",
"Name[it]": "Importa/esporta CSV",
"Name[ko]": "CSV 가져오기/내보내기",
"Name[nl]": "CSV importeren/exporteren",
"Name[pl]": "Importuj/Eksportuj CSV",
"Name[pt]": "Importação/Exportação de CSV",
"Name[pt_BR]": "Importação/Exportação de CSV",
"Name[ru]": "Импорт и экспорт CSV",
"Name[sk]": "Import/Export CSV",
"Name[sl]": "Uvozi/izvozi CSV",
"Name[sr@ijekavian]": "Увоз/извоз ЦСВ‑а",
"Name[sr@ijekavianlatin]": "Uvoz/izvoz CSV‑a",
"Name[sr@latin]": "Uvoz/izvoz CSV‑a",
"Name[sr]": "Увоз/извоз ЦСВ‑а",
"Name[sv]": "Importera och exportera CSV",
"Name[tr]": "CSV İçe/Dışa Aktar",
"Name[uk]": "Імпортування та експортування CSV",
"Name[x-test]": "xxImport/Export CSVxx",
"Name[zh_CN]": "导入/导出 CSV 表格",
"ServiceTypes": [
"KAddressBook/ImportExportPlugin"
],
......
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