Commit 20d635f2 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 688603ae
......@@ -35,7 +35,7 @@ Name[sv]=Google Drive
Name[tr]=Google Drive
Name[uk]=Google Диск
Name[x-test]=xxGoogle Drivexx
Name[zh_CN]=Google 云端硬盘
Name[zh_CN]=Google Drive
Name[zh_TW]=Google 雲端硬碟
Type=Link
URL=gdrive:/
......@@ -110,6 +110,6 @@ Comment[sv]= Genväg för att bläddra i Google Drive-filer så snart ett nytt G
Comment[tr]=Yeni bir Google hesabı eklendiğinde Google Drive dosyalarına göz atma kısayolu.
Comment[uk]=Кнопка для перегляду файлів Google Диск після додавання нового облікового запису Google.
Comment[x-test]=xx Shortcut to browse Google Drive files as soon as a new Google account has been added.xx
Comment[zh_CN]= 浏览 Google 云端硬盘的文件的快捷方式,只要 Google 账号被添加即可使用。
Comment[zh_CN]= 浏览 Google Drive 文件的快捷方式,添加 Google 账号之后即可使用。
Comment[zh_TW]=只要新增 Google 帳號即可以快速瀏覽 Google 雲端硬碟上的檔案。
Action=Popup
......@@ -25,7 +25,8 @@
"Name[sl]": "Nicolas Fella",
"Name[sv]": "Nicolas Fella",
"Name[uk]": "Nicolas Fella",
"Name[x-test]": "xxNicolas Fellaxx"
"Name[x-test]": "xxNicolas Fellaxx",
"Name[zh_CN]": "Nicolas Fella"
}
],
"Category": "Utilities",
......@@ -53,6 +54,7 @@
"Description[sv]": "Ladda upp filer till Google Drive",
"Description[uk]": "Вивантаження файлів на Google Диск",
"Description[x-test]": "xxUpload files to Google Drivexx",
"Description[zh_CN]": "将文件上传到 Google Drive",
"Icon": "folder-gdrive",
"License": "GPL",
"Name": "Google Drive",
......@@ -80,6 +82,7 @@
"Name[sv]": "Google Drive",
"Name[uk]": "Google Диск",
"Name[x-test]": "xxGoogle Drivexx",
"Name[zh_CN]": "Google Drive",
"X-Purpose-ActionDisplay": "Google Drive..."
},
"X-Purpose-Configuration": [
......
......@@ -33,6 +33,7 @@
"Name[sv]": "'Google Drive' åtgärdsmeny",
"Name[uk]": "Меню дій «Диска Google»",
"Name[x-test]": "xx'Google Drive' actions menuxx",
"Name[zh_CN]": "“Google Drive”操作菜单",
"ServiceTypes": [
"KFileItemAction/Plugin"
]
......
......@@ -27,6 +27,7 @@
"Description[sv]": "Egenskapssida som visar ytterligare information om ett objekt på Google Drive",
"Description[uk]": "На сторінці властивостей показано додаткові відомості щодо запису Диска Google",
"Description[x-test]": "xxProperties page showing additional information regarding a Google Drive itemxx",
"Description[zh_CN]": "显示 Google Drive 项目额外信息的属性页面",
"Icon": "folder-gdrive",
"MimeTypes": [
"inode/directory",
......@@ -60,6 +61,7 @@
"Name[sv]": "Google Drive egenskapssida",
"Name[uk]": "Сторінка властивостей Диска Google",
"Name[x-test]": "xxGoogle Drive Properties Pagexx",
"Name[zh_CN]": "Google Drive 属性页面",
"ServiceTypes": [
"KPropertiesDialog/Plugin"
]
......
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