Commit daa4809b 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 3ac558d0
...@@ -62,6 +62,7 @@ Name[zh_CN]=格式 ...@@ -62,6 +62,7 @@ Name[zh_CN]=格式
Name[zh_TW]=格式 Name[zh_TW]=格式
Comment=Numeric, Currency and Time Formats Comment=Numeric, Currency and Time Formats
Comment[ar]=التّنسيقات الرّقميّة، والعملة والوقت Comment[ar]=التّنسيقات الرّقميّة، والعملة والوقت
Comment[ast]=Formatos numbéricos, horarios y de divises
Comment[az]=Numeric, Currency and Time Formats Say, Valyuta və Vaxt formatları Comment[az]=Numeric, Currency and Time Formats Say, Valyuta və Vaxt formatları
Comment[bs]=Brojčani,valutni i vremenski formati Comment[bs]=Brojčani,valutni i vremenski formati
Comment[ca]=Format numèric, monetari i horari Comment[ca]=Format numèric, monetari i horari
......
...@@ -241,7 +241,7 @@ Name[mr]=परत चार्ज करता येण्याजोगे ...@@ -241,7 +241,7 @@ Name[mr]=परत चार्ज करता येण्याजोगे
Name[nb]=Oppladbar Name[nb]=Oppladbar
Name[nds]=Wedderlaadbor Name[nds]=Wedderlaadbor
Name[nl]=Oplaadbaar Name[nl]=Oplaadbaar
Name[nn]=Oppladbar Name[nn]=Oppladbart
Name[pa]=ਮੁੜ-ਚਾਰਜ ਯੋਗ Name[pa]=ਮੁੜ-ਚਾਰਜ ਯੋਗ
Name[pl]=Do wielokrotnego ładowania Name[pl]=Do wielokrotnego ładowania
Name[pt]=Recarregável Name[pt]=Recarregável
......
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